[maven-scm] copy for tag tobago-1.0.7
diff --git a/contrib/facelets/pom.xml b/contrib/facelets/pom.xml
index 2dcf22d..17ba596 100644
--- a/contrib/facelets/pom.xml
+++ b/contrib/facelets/pom.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
     <artifactId>tobago-contrib</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.7</version>
   </parent>
   <groupId>org.apache.myfaces.tobago</groupId>
   <artifactId>tobago-facelets</artifactId>
@@ -12,9 +11,9 @@
   <name>Tobago Facelets</name>
   <description>Tobago Faclets</description>
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/contrib/facelets</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/contrib/facelets</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/contrib/facelets</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
   </scm>
 
   <build>
@@ -147,7 +146,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jsp-api</artifactId>
@@ -166,4 +165,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 88b2906..da3a5d5 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -1,28 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Copyright 2002-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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
     <artifactId>tobago</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.7</version>
   </parent>
   <packaging>pom</packaging>
   <name>Tobago Contrib</name>
@@ -30,11 +11,11 @@
   <artifactId>tobago-contrib</artifactId>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/contrib</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/contrib</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/contrib</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
   </scm>
   <modules>
     <module>facelets</module>
   </modules>
-</project>
+</project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 6d9c089..6134926 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,401 +1,381 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>tobago-core</artifactId>

-  <packaging>jar</packaging>

-  <name>Tobago Core</name>

-  <description>Tobago Core</description>

-  

-  <build>

-    <resources>

-      <resource>

-        <directory>src/main/resources</directory>

-      </resource>

-      <resource>

-        <targetPath>META-INF</targetPath>

-        <directory>target/generated-tld</directory>

-      </resource>

-    </resources>

-

-    <plugins>

-      <plugin>

-        <groupId>org.apache.myfaces.tobago</groupId>

-        <artifactId>maven-apt-plugin</artifactId>

-        <version>${version}</version>

-        <configuration>

-          <targetFiles>

-            <targetFile>org/apache/myfaces/tobago/taglib/component/tobago.tld</targetFile>

-            <targetFile>org/apache/myfaces/tobago/taglib/extension/tobago-extension.tld</targetFile>

-          </targetFiles>

-          <resourceTargetPath>META-INF</resourceTargetPath>

-          <generated>target/generated-tld</generated>

-          <factory>org.apache.myfaces.tobago.apt.TaglibAnnotationProcessorFactory</factory>

-          <nocompile>true</nocompile>

-          <encoding>UTF-8</encoding>

-        </configuration>

-        <executions>

-          <execution>

-            <id>tobago-tlds</id>

-            <goals><goal>execute</goal></goals>

-          </execution>

-        </executions>

-      </plugin>

-    </plugins>

-  </build>

-

-  <reporting>

-    <plugins>

-

-      <plugin>

-        <groupId>net.sourceforge.maven-taglib</groupId>

-        <artifactId>maven-taglib-plugin</artifactId>

-        <configuration>

-          <taglib.src.dir>${basedir}/target/classes/META-INF/</taglib.src.dir>

-          <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>

-          </configuration>

-      </plugin>

-

-    </plugins>

-  </reporting>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/core</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/core</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/core</url>

-  </scm>

-

-  <dependencies>

-

-    <dependency>

-      <groupId>commons-beanutils</groupId>

-      <artifactId>commons-beanutils</artifactId>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>commons-collections</groupId>

-      <artifactId>commons-collections</artifactId>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>commons-digester</groupId>

-      <artifactId>commons-digester</artifactId>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>xml-apis</groupId>

-          <artifactId>xml-apis</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-

-    <dependency>

-      <groupId>commons-fileupload</groupId>

-      <artifactId>commons-fileupload</artifactId>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>commons-io</groupId>

-      <artifactId>commons-io</artifactId>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>commons-lang</groupId>

-      <artifactId>commons-lang</artifactId>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>commons-logging</groupId>

-      <artifactId>commons-logging</artifactId>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>fop</groupId>

-      <artifactId>fop</artifactId>

-      <version>0.20.5</version>

-      <scope>provided</scope>

-    </dependency>

-

-    <!-- XXX not transitive from fop -->

-    <dependency>

-      <groupId>avalon-framework</groupId>

-      <artifactId>avalon-framework</artifactId>

-      <version>20020627</version>

-      <!-- XXX wrong date -->

-      <scope>provided</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>jstl</artifactId>

-      <version>1.1.0</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>javax.servlet</groupId>

-          <artifactId>jsp-api</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-

-    <dependency>

-      <groupId>taglibs</groupId>

-      <artifactId>standard</artifactId>

-      <version>1.1.2</version>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-tool-apt</artifactId>

-      <version>${version}</version>

-      <scope>provided</scope>

-    </dependency>

-

-

-   <!-- <dependency>

-      <groupId>javax.faces</groupId>

-      <artifactId>jsf-api</artifactId>

-      <version>1.1</version>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>javax.faces</groupId>

-      <artifactId>jsf-impl</artifactId>

-      <version>1.1</version>

-      <scope>compile</scope>

-    </dependency>-->

-

-    <dependency>

-      <groupId>org.apache.myfaces.core</groupId>

-      <artifactId>myfaces-api</artifactId>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>org.apache.myfaces.core</groupId>

-      <artifactId>myfaces-impl</artifactId>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>jsp-api</artifactId>

-      <scope>provided</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <scope>provided</scope>

-    </dependency>

-

-  </dependencies>

-

-  <profiles>

-    <!-- Mac OS X has not a tools.jar! -->

-    <profile>

-      <id>tools.jar</id>

-      <activation>

-        <!-- needs maven 2.0.3 or higher under Mac OS X -->

-        <os><family>!mac</family></os>

-      </activation>

-      <dependencies>

-        <dependency>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-          <version>1.5.0</version>

-          <scope>system</scope>

-          <systemPath>${java.home}/../lib/tools.jar</systemPath>

-        </dependency>

-      </dependencies>

-    </profile>

-    <profile>

-      <id>generate-tag-reference</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.apache.myfaces.tobago</groupId>

-            <artifactId>maven-apt-plugin</artifactId>

-            <version>${version}</version>

-            <configuration>

-              <targetFiles>

-                <targetFile>org/apache/myfaces/tobago/taglib/component/tobago.xml</targetFile>

-                <targetFile>org/apache/myfaces/tobago/taglib/extension/tobago-extension.xml</targetFile>

-              </targetFiles>

-              <generated>target/doc</generated>

-              <factory>org.apache.myfaces.tobago.apt.TobagoAnnotationProcessorFactory</factory>

-              <nocompile>true</nocompile>

-              <encoding>UTF-8</encoding>

-            </configuration>

-            <executions>

-              <execution>

-                <id>tobago-doc</id>

-                <goals><goal>execute</goal></goals>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-    </profile>

-

-    <profile>

-      <id>generate-assembly</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.apache.maven.plugins</groupId>

-            <artifactId>maven-javadoc-plugin</artifactId>

-            <executions>

-              <execution>

-                <id>attach-javadoc</id>

-                <goals><goal>jar</goal></goals>

-              </execution>

-            </executions>

-          </plugin>

-          <plugin>

-            <groupId>net.sourceforge.maven-taglib</groupId>

-            <artifactId>maven-taglib-plugin</artifactId>

-            <configuration>

-              <taglib.src.dir>${basedir}/target/generated-tld</taglib.src.dir>

-              <tldDocDir>${basedir}/target/tlddoc</tldDocDir>

-            </configuration>

-            <executions>

-              <execution>

-                <id>attach-tlddoc</id>

-                <goals><goal>taglibdocjar</goal></goals>

-               </execution>

-            </executions>

-          </plugin>

-          <plugin>

-            <groupId>org.apache.maven.plugins</groupId>

-            <artifactId>maven-source-plugin</artifactId>

-            <executions>

-              <execution>

-                <id>attach-source</id>

-                <goals><goal>jar</goal></goals>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-    </profile>

-     <profile>

-      <id>all-modules</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.apache.maven.plugins</groupId>

-            <artifactId>maven-source-plugin</artifactId>

-            <executions>

-              <execution>

-                <id>attach-source</id>

-                <goals><goal>jar</goal></goals>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-    </profile>

-    <profile>

-      <id>attach-source</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.apache.maven.plugins</groupId>

-            <artifactId>maven-source-plugin</artifactId>

-            <executions>

-              <execution>

-                <id>attach-source</id>

-                <goals><goal>jar</goal></goals>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-    </profile>

-    <profile>

-      <!--

-mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar

-mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar

-      -->

-      <id>jdk14retro</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.codehaus.mojo</groupId>

-            <artifactId>retrotranslator-maven-plugin</artifactId>

-            <executions>

-              <execution>

-                <goals>

-                  <goal>translate</goal>

-                </goals>

-                <configuration>

-                  <verify>true</verify>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-          <plugin>

-            <artifactId>maven-jar-plugin</artifactId>

-            <executions>

-              <execution>

-                <goals>

-                  <goal>jar</goal>

-                </goals>

-                <configuration>

-                <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>

-                  <classifier>jdk14retro</classifier>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-       <dependencies>

-        <dependency>

-          <groupId>sun.jdk</groupId>

-          <artifactId>rt</artifactId>

-          <version>1.4.0</version>

-          <scope>system</scope>

-          <systemPath>${java14.home}/lib/rt.jar</systemPath>

-        </dependency>

-        <dependency>

-          <groupId>net.sf.retrotranslator</groupId>

-          <artifactId>retrotranslator-runtime</artifactId>

-          <version>1.0.3</version>

-        </dependency>

-      </dependencies>

-    </profile>

-  </profiles>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>tobago-core</artifactId>
+  <packaging>jar</packaging>
+  <name>Tobago Core</name>
+  <description>Tobago Core</description>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <targetPath>META-INF</targetPath>
+        <directory>target/generated-tld</directory>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.myfaces.tobago</groupId>
+        <artifactId>maven-apt-plugin</artifactId>
+        <version>${version}</version>
+        <configuration>
+          <targetFiles>
+            <targetFile>org/apache/myfaces/tobago/taglib/component/tobago.tld</targetFile>
+            <targetFile>org/apache/myfaces/tobago/taglib/extension/tobago-extension.tld</targetFile>
+          </targetFiles>
+          <resourceTargetPath>META-INF</resourceTargetPath>
+          <generated>target/generated-tld</generated>
+          <factory>org.apache.myfaces.tobago.apt.TaglibAnnotationProcessorFactory</factory>
+          <nocompile>true</nocompile>
+          <encoding>UTF-8</encoding>
+        </configuration>
+        <executions>
+          <execution>
+            <id>tobago-tlds</id>
+            <goals><goal>execute</goal></goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+
+      <plugin>
+        <groupId>net.sourceforge.maven-taglib</groupId>
+        <artifactId>maven-taglib-plugin</artifactId>
+        <configuration>
+          <taglib.src.dir>${basedir}/target/classes/META-INF/</taglib.src.dir>
+          <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
+          </configuration>
+      </plugin>
+
+    </plugins>
+  </reporting>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>fop</groupId>
+      <artifactId>fop</artifactId>
+      <version>0.20.5</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- XXX not transitive from fop -->
+    <dependency>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework</artifactId>
+      <version>20020627</version>
+      <!-- XXX wrong date -->
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.1.0</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.1.2</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-tool-apt</artifactId>
+      <version>${version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+
+   <!-- <dependency>
+      <groupId>javax.faces</groupId>
+      <artifactId>jsf-api</artifactId>
+      <version>1.1</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.faces</groupId>
+      <artifactId>jsf-impl</artifactId>
+      <version>1.1</version>
+      <scope>compile</scope>
+    </dependency>-->
+
+    <dependency>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-impl</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+  </dependencies>
+
+  <profiles>
+    <!-- Mac OS X has not a tools.jar! -->
+    <profile>
+      <id>tools.jar</id>
+      <activation>
+        <!-- needs maven 2.0.3 or higher under Mac OS X -->
+        <os><family>!mac</family></os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+          <version>1.5.0</version>
+          <scope>system</scope>
+          <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>generate-tag-reference</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.myfaces.tobago</groupId>
+            <artifactId>maven-apt-plugin</artifactId>
+            <version>${version}</version>
+            <configuration>
+              <targetFiles>
+                <targetFile>org/apache/myfaces/tobago/taglib/component/tobago.xml</targetFile>
+                <targetFile>org/apache/myfaces/tobago/taglib/extension/tobago-extension.xml</targetFile>
+              </targetFiles>
+              <generated>target/doc</generated>
+              <factory>org.apache.myfaces.tobago.apt.TobagoAnnotationProcessorFactory</factory>
+              <nocompile>true</nocompile>
+              <encoding>UTF-8</encoding>
+            </configuration>
+            <executions>
+              <execution>
+                <id>tobago-doc</id>
+                <goals><goal>execute</goal></goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>generate-assembly</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadoc</id>
+                <goals><goal>jar</goal></goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>net.sourceforge.maven-taglib</groupId>
+            <artifactId>maven-taglib-plugin</artifactId>
+            <configuration>
+              <taglib.src.dir>${basedir}/target/generated-tld</taglib.src.dir>
+              <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
+            </configuration>
+            <executions>
+              <execution>
+                <id>attach-tlddoc</id>
+                <goals><goal>taglibdocjar</goal></goals>
+               </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-source</id>
+                <goals><goal>jar</goal></goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+     <profile>
+      <id>all-modules</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-source</id>
+                <goals><goal>jar</goal></goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>attach-source</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-source</id>
+                <goals><goal>jar</goal></goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!--<profile>-->
+
+<!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
+<!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
+
+      <!--<id>jdk14retro</id>-->
+      <!--<build>-->
+        <!--<plugins>-->
+          <!--<plugin>-->
+            <!--<groupId>org.codehaus.mojo</groupId>-->
+            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>translate</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                  <!--<verify>true</verify>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+          <!--<plugin>-->
+            <!--<artifactId>maven-jar-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>jar</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
+                  <!--<classifier>jdk14retro</classifier>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+        <!--</plugins>-->
+      <!--</build>-->
+       <!--<dependencies>-->
+        <!--<dependency>-->
+          <!--<groupId>sun.jdk</groupId>-->
+          <!--<artifactId>rt</artifactId>-->
+          <!--<version>1.4.0</version>-->
+          <!--<scope>system</scope>-->
+          <!--<systemPath>${java14.home}/lib/rt.jar</systemPath>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+          <!--<groupId>net.sf.retrotranslator</groupId>-->
+          <!--<artifactId>retrotranslator-runtime</artifactId>-->
+          <!--<version>1.0.3</version>-->
+        <!--</dependency>-->
+      <!--</dependencies>-->
+    <!--</profile>-->
+  </profiles>
+</project>
\ No newline at end of file
diff --git a/example/addressbook/pom.xml b/example/addressbook/pom.xml
index bc6130f..9a49325 100644
--- a/example/addressbook/pom.xml
+++ b/example/addressbook/pom.xml
@@ -1,161 +1,141 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-example</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>tobago-example-addressbook</artifactId>

-  <packaging>war</packaging>

-  <name>Tobago Example Addressbook</name>

-  <build>

-    <finalName>tobago-example-addressbook</finalName>

-    <plugins>

-      <plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>tomcat-maven-plugin</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <configuration>

-          <server>tomcat</server>

-          <update>true</update>

-          <!--url>change if not http://localhost:8080/manager</url-->

-        </configuration>

-      </plugin>

-    </plugins>

-  </build>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/addressbook</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/addressbook</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/example/addressbook</url>

-  </scm>

-

-  <dependencies>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-richmond</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-core</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-    <dependency>

-      <groupId>log4j</groupId>

-      <artifactId>log4j</artifactId>

-      <version>1.2.11</version>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <version>2.3</version>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>jsp-api</artifactId>

-      <version>2.0</version>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.springframework</groupId>

-      <artifactId>spring-core</artifactId>

-      <version>1.2.5</version>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.springframework</groupId>

-      <artifactId>spring-context</artifactId>

-      <version>1.2.5</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>xerces</groupId>

-          <artifactId>xerces</artifactId>

-        </exclusion>

-        <exclusion>

-          <groupId>xml-apis</groupId>

-          <artifactId>xml-apis</artifactId>

-        </exclusion>

-        <exclusion>

-          <groupId>java</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-    <dependency>

-      <groupId>org.springframework</groupId>

-      <artifactId>spring-beans</artifactId>

-      <version>1.2.5</version>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.springframework</groupId>

-      <artifactId>spring-web</artifactId>

-      <version>1.2.5</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>javax.faces</groupId>

-          <artifactId>jsf-api</artifactId>

-        </exclusion>

-        <exclusion>

-          <groupId>javax.servlet</groupId>

-          <artifactId>servlet-api</artifactId>

-        </exclusion>

-        <exclusion>

-          <groupId>servletapi</groupId>

-          <artifactId>servletapi</artifactId>

-        </exclusion>

-        <exclusion>

-          <groupId>javax.servlet</groupId>

-          <artifactId>jsp-api</artifactId>

-        </exclusion>

-        <exclusion>

-          <groupId>myfaces</groupId>

-          <artifactId>myfaces-jsf-api</artifactId>

-        </exclusion>

-        <exclusion>

-          <groupId>javax.servlet</groupId>

-          <artifactId>jstl</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-    <dependency>

-      <groupId>xstream</groupId>

-      <artifactId>xstream</artifactId>

-      <version>1.1.2</version>

-      <scope>compile</scope>

-    </dependency>

-  </dependencies>

-

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-example</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>tobago-example-addressbook</artifactId>
+  <packaging>war</packaging>
+  <name>Tobago Example Addressbook</name>
+  <build>
+    <finalName>tobago-example-addressbook</finalName>
+    <!--<plugins>-->
+      <!--<plugin>-->
+        <!--<groupId>org.codehaus.mojo</groupId>-->
+        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
+        <!--<version>1.0-SNAPSHOT</version>-->
+        <!--<configuration>-->
+          <!--<server>tomcat</server>-->
+          <!--<update>true</update>-->
+          <!--<url>change if not http://localhost:8080/manager</url>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
+    <!--</plugins>-->
+  </build>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-richmond</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.11</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>1.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>1.2.5</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xerces</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>java</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>1.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>1.2.5</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>servletapi</groupId>
+          <artifactId>servletapi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>myfaces</groupId>
+          <artifactId>myfaces-jsf-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jstl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <version>1.1.2</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/example/blank/pom.xml b/example/blank/pom.xml
index 7951262..3306c2f 100644
--- a/example/blank/pom.xml
+++ b/example/blank/pom.xml
@@ -1,106 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-example</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>tobago-example-blank</artifactId>

-  <packaging>war</packaging>

-  <name>Tobago Example Blank</name>

-  <build>

-    <finalName>tobago-example-blank</finalName>

-    <plugins>

-

-      <plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>tomcat-maven-plugin</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <configuration>

-          <server>tomcat</server>

-          <update>true</update>

-          <url>http://localhost:8080/manager</url>

-        </configuration>

-      </plugin>

-

-    </plugins>

-  </build>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/blank</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/blank</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/example/blank</url>

-  </scm>

-  

-  <dependencies>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-scarborough</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-speyside</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-richmond</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-standard</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-core</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-    <dependency>

-      <groupId>log4j</groupId>

-      <artifactId>log4j</artifactId>

-      <version>1.2.11</version>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <version>2.3</version>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>jsp-api</artifactId>

-      <version>2.0</version>

-      <scope>provided</scope>

-    </dependency>

-  </dependencies>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-example</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>tobago-example-blank</artifactId>
+  <packaging>war</packaging>
+  <name>Tobago Example Blank</name>
+  <build>
+    <finalName>tobago-example-blank</finalName>
+    <plugins>
+
+      <!--<plugin>-->
+        <!--<groupId>org.codehaus.mojo</groupId>-->
+        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
+        <!--<version>1.0-SNAPSHOT</version>-->
+        <!--<configuration>-->
+          <!--<server>tomcat</server>-->
+          <!--<update>true</update>-->
+          <!--<url>http://localhost:8080/manager</url>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
+
+    </plugins>
+  </build>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-scarborough</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-speyside</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-richmond</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-standard</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.11</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/example/demo/pom.xml b/example/demo/pom.xml
index 9da546f..3b7b3cf 100644
--- a/example/demo/pom.xml
+++ b/example/demo/pom.xml
@@ -1,134 +1,114 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-example</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>tobago-example-demo</artifactId>

-  <packaging>war</packaging>

-  <name>Tobago Example Demo</name>

-  <build>

-    <finalName>tobago-example-demo</finalName>

-    <plugins>

-

-      <plugin>

-        <groupId>org.apache.myfaces.tobago</groupId>

-        <artifactId>maven-theme-plugin</artifactId>

-        <version>${version}</version>

-        <executions>

-          <execution>

-            <goals>

-              <goal>resources</goal>

-            </goals>

-          </execution>

-        </executions>

-      </plugin>

-

-      <plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>tomcat-maven-plugin</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <configuration>

-          <server>tomcat</server>

-          <update>true</update>

-          <!--url>http://mononoke:8080/manager</url-->

-        </configuration>

-      </plugin>

-

-    </plugins>

-  </build>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/demo</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/demo</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/example/demo</url>

-  </scm>

-

-  <dependencies>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-scarborough</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-speyside</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-richmond</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-standard</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-core</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-

-    </dependency>

-    <dependency>

-      <groupId>log4j</groupId>

-      <artifactId>log4j</artifactId>

-      <version>1.2.11</version>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>oro</groupId>

-      <artifactId>oro</artifactId>

-      <version>2.0.8</version>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <version>2.3</version>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>jsp-api</artifactId>

-      <version>2.0</version>

-      <scope>provided</scope>

-    </dependency>

-    <!--<dependency>-->

-      <!--<groupId>myfaces</groupId>-->

-      <!--<artifactId>tomahawk</artifactId>-->

-      <!--<version>1.1.0</version>-->

-      <!--<purpose>jar</purpose>-->

-    <!--</dependency>-->

-

-  </dependencies>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-example</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>tobago-example-demo</artifactId>
+  <packaging>war</packaging>
+  <name>Tobago Example Demo</name>
+  <build>
+    <finalName>tobago-example-demo</finalName>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.myfaces.tobago</groupId>
+        <artifactId>maven-theme-plugin</artifactId>
+        <version>${version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--<plugin>-->
+        <!--<groupId>org.codehaus.mojo</groupId>-->
+        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
+        <!--<version>1.0-SNAPSHOT</version>-->
+        <!--<configuration>-->
+          <!--<server>tomcat</server>-->
+          <!--<update>true</update>-->
+          <!--<url>http://mononoke:8080/manager</url>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
+
+    </plugins>
+  </build>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-scarborough</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-speyside</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-richmond</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-standard</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.11</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <!--<dependency>-->
+      <!--<groupId>myfaces</groupId>-->
+      <!--<artifactId>tomahawk</artifactId>-->
+      <!--<version>1.1.0</version>-->
+      <!--<purpose>jar</purpose>-->
+    <!--</dependency>-->
+
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/example/facelets/pom.xml b/example/facelets/pom.xml
index 439ea9f..ba127f8 100644
--- a/example/facelets/pom.xml
+++ b/example/facelets/pom.xml
@@ -1,119 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-example</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>tobago-example-facelets</artifactId>

-  <packaging>war</packaging>

-  <name>Tobago Example Facelets</name>

-  <build>

-    <finalName>tobago-example-facelets</finalName>

-    <plugins>

-      <plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>tomcat-maven-plugin</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <configuration>

-          <server>tomcat</server>

-          <update>true</update>

-          <url>http://localhost:8080/manager</url>

-        </configuration>

-      </plugin>

-    </plugins>

-  </build>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/facelets</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/facelets</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/example/facelets</url>

-  </scm>

-

-  <dependencies>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-scarborough</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-speyside</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-richmond</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-standard</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-facelets</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-    <dependency>

-      <groupId>javax.el</groupId>

-      <artifactId>el-api</artifactId>

-      <version>1.0</version>

-    </dependency>

-    <dependency>

-      <groupId>com.sun.el</groupId>

-      <artifactId>el-ri</artifactId>

-      <version>1.0</version>

-    </dependency><dependency>

-      <groupId>com.sun.facelets</groupId>

-      <artifactId>jsf-facelets</artifactId>

-      <version>1.0.14</version>

-    </dependency>

-    <dependency>

-      <groupId>log4j</groupId>

-      <artifactId>log4j</artifactId>

-      <version>1.2.11</version>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <version>2.3</version>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>jsp-api</artifactId>

-      <version>2.0</version>

-      <scope>provided</scope>

-    </dependency>

-  </dependencies>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-example</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>tobago-example-facelets</artifactId>
+  <packaging>war</packaging>
+  <name>Tobago Example Facelets</name>
+  <build>
+    <finalName>tobago-example-facelets</finalName>
+    <!--<plugins>-->
+      <!--<plugin>-->
+        <!--<groupId>org.codehaus.mojo</groupId>-->
+        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
+        <!--<version>1.0-SNAPSHOT</version>-->
+        <!--<configuration>-->
+          <!--<server>tomcat</server>-->
+          <!--<update>true</update>-->
+          <!--<url>http://localhost:8080/manager</url>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
+    <!--</plugins>-->
+  </build>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-scarborough</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-speyside</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-richmond</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-standard</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-facelets</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>javax.el</groupId>
+      <artifactId>el-api</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.el</groupId>
+      <artifactId>el-ri</artifactId>
+      <version>1.0</version>
+    </dependency><dependency>
+      <groupId>com.sun.facelets</groupId>
+      <artifactId>jsf-facelets</artifactId>
+      <version>1.0.14</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.11</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/example/foreach/pom.xml b/example/foreach/pom.xml
index 9127a19..8ca4d1b 100644
--- a/example/foreach/pom.xml
+++ b/example/foreach/pom.xml
@@ -1,54 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Copyright 2002-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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
     <artifactId>tobago-example</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.7</version>
   </parent>
   <artifactId>tobago-example-foreach</artifactId>
   <packaging>war</packaging>
   <name>Tobago Example Foreach</name>
   <build>
     <finalName>tobago-example-foreach</finalName>
-    <plugins>
+    <!--<plugins>-->
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>tomcat-maven-plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <configuration>
-          <server>tomcat</server>
-          <update>true</update>
-          <!--url>change if not http://localhost:8080/manager</url-->
-        </configuration>
-      </plugin>
+      <!--<plugin>-->
+        <!--<groupId>org.codehaus.mojo</groupId>-->
+        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
+        <!--<version>1.0-SNAPSHOT</version>-->
+        <!--<configuration>-->
+          <!--<server>tomcat</server>-->
+          <!--<update>true</update>-->
+          <!--<url>change if not http://localhost:8080/manager</url>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
 
-    </plugins>
+    <!--</plugins>-->
   </build>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/foreach</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/foreach</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/example/foreach</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
   </scm>
 
   <dependencies>
@@ -103,4 +84,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/example/nonfacesrequest/pom.xml b/example/nonfacesrequest/pom.xml
index e0f9c5e..ee796e2 100644
--- a/example/nonfacesrequest/pom.xml
+++ b/example/nonfacesrequest/pom.xml
@@ -1,54 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Copyright 2002-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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
     <artifactId>tobago-example</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.7</version>
   </parent>
   <artifactId>tobago-example-nonfacesrequest</artifactId>
   <packaging>war</packaging>
   <name>Tobago Example Non-Faces-Request</name>
   <build>
     <finalName>tobago-example-nonfacesrequest</finalName>
-    <plugins>
+    <!--<plugins>-->
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>tomcat-maven-plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <configuration>
-          <server>tomcat</server>
-          <update>true</update>
-          <!--url>change if not http://localhost:8080/manager</url-->
-        </configuration>
-      </plugin>
+      <!--<plugin>-->
+        <!--<groupId>org.codehaus.mojo</groupId>-->
+        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
+        <!--<version>1.0-SNAPSHOT</version>-->
+        <!--<configuration>-->
+          <!--<server>tomcat</server>-->
+          <!--<update>true</update>-->
+          <!--<url>change if not http://localhost:8080/manager</url>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
       
-    </plugins>
+    <!--</plugins>-->
   </build>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/nonfacesrequest</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/nonfacesrequest</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/example/nonfacesrequest</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
   </scm>
   
   <dependencies>
@@ -98,4 +79,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/example/pom.xml b/example/pom.xml
index f9c216c..40f8462 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -1,76 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <packaging>pom</packaging>

-  <name>Tobago Examples</name>

-  <groupId>org.apache.myfaces.tobago</groupId>

-  <artifactId>tobago-example</artifactId>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/example</url>

-  </scm>

-

-  <repositories>

-    <repository>

-      <id>atanion</id>

-      <url>http://www.atanion.com/maven2</url>

-    </repository>

-  </repositories>

-

-  <pluginRepositories>

-    <pluginRepository>

-      <releases>

-        <enabled>false</enabled>

-      </releases>

-      <snapshots>

-        <enabled>true</enabled>

-      </snapshots>

-      <id>atanion</id>

-      <url>http://www.atanion.com/maven2</url>

-    </pluginRepository>

-  </pluginRepositories>

-

-  <modules>

-    <module>addressbook</module>

-    <module>blank</module>

-    <module>demo</module>

-    <module>foreach</module>

-    <module>nonfacesrequest</module>

-    <module>test</module>

-  </modules>

-

-  <profiles>

-    <profile>

-      <id>all-modules</id>

-      <modules>

-        <module>facelets</module>

-      </modules>

-    </profile>

-  </profiles>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <packaging>pom</packaging>
+  <name>Tobago Examples</name>
+  <groupId>org.apache.myfaces.tobago</groupId>
+  <artifactId>tobago-example</artifactId>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <repositories>
+    <repository>
+      <id>atanion</id>
+      <url>http://www.atanion.com/maven2</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>atanion</id>
+      <url>http://www.atanion.com/maven2</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <modules>
+    <module>addressbook</module>
+    <module>blank</module>
+    <module>demo</module>
+    <module>foreach</module>
+    <module>nonfacesrequest</module>
+    <module>test</module>
+  </modules>
+
+  <profiles>
+    <profile>
+      <id>all-modules</id>
+      <modules>
+        <module>facelets</module>
+      </modules>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file
diff --git a/example/test/pom.xml b/example/test/pom.xml
index 3747262..0a37d14 100644
--- a/example/test/pom.xml
+++ b/example/test/pom.xml
@@ -1,127 +1,108 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-example</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>tobago-example-test</artifactId>

-  <packaging>war</packaging>

-  <name>Tobago Example Test</name>

-  <build>

-    <finalName>tobago-example-test</finalName>

-    <plugins>

-

-      <plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>tomcat-maven-plugin</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <configuration>

-          <server>tomcat</server>

-          <update>true</update>

-          <url>http://localhost:8080/manager</url>

-        </configuration>

-      </plugin>

-

-      <plugin>

-        <groupId>org.mortbay.jetty</groupId>

-        <artifactId>maven-jetty6-plugin</artifactId>

-        <configuration>

-          <scanIntervalSeconds>10</scanIntervalSeconds>

-        </configuration>

-      </plugin>

-      

-    </plugins>

-  </build>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/test</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/test</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/example/test</url>

-  </scm>

-

-  <dependencies>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-scarborough</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-speyside</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-richmond</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-standard</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-core</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-    <dependency>

-      <groupId>log4j</groupId>

-      <artifactId>log4j</artifactId>

-      <version>1.2.11</version>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <version>2.3</version>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>jsp-api</artifactId>

-      <version>2.0</version>

-      <scope>provided</scope>

-    </dependency>

-    <!--dependency>

-      <groupId>org.apache.derby</groupId>

-      <artifactId>derby</artifactId>

-      <version>10.1.1.0</version>

-      <scope>runtime</scope>

-    </dependency-->

-    <dependency>

-      <groupId>hsqldb</groupId>

-      <artifactId>hsqldb</artifactId>

-      <version>1.8.0.1</version>

-      <scope>runtime</scope>

-    </dependency>

-

-  </dependencies>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-example</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>tobago-example-test</artifactId>
+  <packaging>war</packaging>
+  <name>Tobago Example Test</name>
+  <build>
+    <finalName>tobago-example-test</finalName>
+    <plugins>
+
+      <!--<plugin>-->
+        <!--<groupId>org.codehaus.mojo</groupId>-->
+        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
+        <!--<version>1.0-SNAPSHOT</version>-->
+        <!--<configuration>-->
+          <!--<server>tomcat</server>-->
+          <!--<update>true</update>-->
+          <!--<url>http://localhost:8080/manager</url>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
+
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty6-plugin</artifactId>
+        <configuration>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+        </configuration>
+      </plugin>
+      
+    </plugins>
+  </build>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-scarborough</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-speyside</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-richmond</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-standard</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.11</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <!--dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.1.1.0</version>
+      <scope>runtime</scope>
+    </dependency-->
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.8.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 698a102..08eea9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,452 +1,432 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <groupId>org.apache.myfaces.tobago</groupId>

-  <artifactId>tobago</artifactId>

-  <packaging>pom</packaging>

-  <name>Tobago</name>

-  <version>1.0.7-SNAPSHOT</version>

-  <description>Tobago</description>

-  <prerequisites>

-    <maven>2.0.3</maven>

-  </prerequisites>

-  <url>http://myfaces.apache.org/tobago</url>

-  <inceptionYear>2002</inceptionYear>

-  <issueManagement>

-    <system>jira</system>

-    <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=12310273</url>

-  </issueManagement>

-  <ciManagement>

-    <system>continuum</system>

-    <url>http://myfaces.zones.apache.org:8080/continuum</url>

-    <notifiers>

-      <notifier>

-        <configuration>

-          <address>commits@myfaces.apache.org</address>

-        </configuration>

-      </notifier>

-    </notifiers>

-  </ciManagement>

-  <mailingLists>

-    <mailingList>

-      <name>Myfaces User List</name>

-      <subscribe>users-subscribe@myfaces.apache.org</subscribe>

-      <unsubscribe>users-unsubscribe@myfaces.apache.org</unsubscribe>

-      <post>do not post to users@myfaces.apache.org unless subscribed</post>

-      <archive>http://mail-archives.apache.org/mod_mbox/myfaces-users</archive>

-      <otherArchives>

-        <otherArchive>http://www.mail-archive.com/users@myfaces.apache.org/</otherArchive>

-        <otherArchive>http://www.nabble.com/MyFaces---Users-f181.html</otherArchive>

-      </otherArchives>

-    </mailingList>

-    <mailingList>

-      <name>Myfaces Developer List</name>

-      <subscribe>dev-subscribe@myfaces.apache.org</subscribe>

-      <unsubscribe>dev-unsubscribe@myfaces.apache.org</unsubscribe>

-      <post>do not post to dev@myfaces.apache.org unless subscribed</post>

-      <archive>http://mail-archives.apache.org/mod_mbox/myfaces-dev</archive>

-      <otherArchives>

-        <otherArchive>http://www.mail-archive.com/dev@myfaces.apache.org/</otherArchive>

-        <otherArchive>http://www.nabble.com/My-Faces---Dev-f182.html</otherArchive>

-      </otherArchives>

-    </mailingList>

-    <mailingList>

-      <name>Myfaces Commits List</name>

-      <subscribe>commits-subscribe@myfaces.apache.org</subscribe>

-      <unsubscribe>commits-unsubscribe@myfaces.apache.org</unsubscribe>

-      <post>do not post</post>

-      <archive>http://mail-archives.apache.org/mod_mbox/myfaces-commits</archive>

-    </mailingList>

-    <mailingList>

-      <name>Myfaces Announcements List</name>

-      <subscribe>announce-subscribe@myfaces.apache.org</subscribe>

-      <unsubscribe>announce-unsubscribe@myfaces.apache.org</unsubscribe>

-      <post>do not post</post>

-      <archive>http://mail-archives.apache.org/mod_mbox/myfaces-announce</archive>

-    </mailingList>

-  </mailingLists>

-  <developers>

-    <developer>

-      <id>idus</id>

-      <name>Arvid H&#x00fc;lsebus</name>

-      <email>idus@krelon.com</email>

-      <organization>atanion GmbH, Germany</organization>

-      <roles>

-        <role>Developer</role>

-      </roles>

-      <timezone>+1</timezone>

-    </developer>

-    <developer>

-      <id>bommel</id>

-      <name>Bernd Bohmann</name>

-      <email>bernd.bohmann@atanion.com</email>

-      <organization>atanion GmbH, Germany</organization>

-      <roles>

-        <role>Developer</role>

-      </roles>

-      <timezone>+1</timezone>

-    </developer>

-    <developer>

-      <id>pleff</id>

-      <name>Detlef Bartetzko</name>

-      <email>detlef.bartetzko@atanion.com</email>

-      <organization>atanion GmbH, Germany</organization>

-      <roles>

-        <role>Developer</role>

-      </roles>

-      <timezone>+1</timezone>

-    </developer>

-    <developer>

-      <id>mmarinschek</id>

-      <name>Martin Marinschek</name>

-      <organization>Irian, Austria</organization>

-      <email>martin.marinschek@gmail.com</email>

-      <roles>

-        <role>Developer</role>

-      </roles>

-      <timezone>+1</timezone>

-    </developer>

-    <developer>

-      <id>matzew</id>

-      <name>Matthias We&#x00df;endorf</name>

-      <organization>Pironet NDH AG, Germany</organization>

-      <email>mwessendorf@gmail.com</email>

-      <roles>

-        <role>Developer</role>

-      </roles>

-      <timezone>+1</timezone>

-    </developer>

-    <developer>

-      <id>hennes</id>

-      <name>Philippe Hennes</name>

-      <email>philippe.hennes@philstar.de</email>

-      <organization>atanion GmbH, Germany</organization>

-      <roles>

-        <role>Developer</role>

-      </roles>

-      <timezone>+1</timezone>

-    </developer>

-    <developer>

-      <id>lofwyr</id>

-      <name>Udo Schnurpfeil</name>

-      <email>udo@schnurpfeil.de</email>

-      <organization>atanion GmbH, Germany</organization>

-      <roles>

-        <role>Lead</role>

-      </roles>

-      <timezone>+1</timezone>

-    </developer>

-    <developer>

-      <id>weber</id>

-      <name>Volker Weber</name>

-      <email>asf@weber-oldenburg.de</email>

-      <organization>atanion GmbH, Germany</organization>

-      <roles>

-        <role>Developer</role>

-      </roles>

-      <timezone>+1</timezone>

-    </developer>

-  </developers>

-

-  <reporting>

-    <excludeDefaults>true</excludeDefaults>

-    <plugins>

-

-      <plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>taglist-maven-plugin</artifactId>

-        <configuration>

-          <tags>TODO, FIXME, XXX, @deprecated</tags>

-        </configuration>

-      </plugin>

-

-      <plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>jxr-maven-plugin</artifactId>

-      </plugin>

-

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-checkstyle-plugin</artifactId>

-        <configuration>

-          <configLocation>org/apache/myfaces/tobago/checkstyle.xml</configLocation>

-          <xrefLocation>xref</xrefLocation>

-          <excludes>**/package-info.java</excludes>

-        </configuration>

-      </plugin>

-

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-javadoc-plugin</artifactId>

-        <configuration>

-          <links>

-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>

-            <link>http://java.sun.com/j2ee/1.4/docs/api</link>

-            <link>http://java.sun.com/javaee/javaserverfaces/1.1_01/docs/api</link>

-            <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>

-            <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>

-            <link>http://jakarta.apache.org/commons/logging/apidocs/</link>

-            <link>http://www.junit.org/junit/javadoc/</link>

-            <link>http://logging.apache.org/log4j/docs/api/</link>

-          </links>

-        </configuration>

-      </plugin>

-

-      <plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>surefire-report-maven-plugin</artifactId>

-      </plugin>

-

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-project-info-reports-plugin</artifactId>

-       </plugin>

-

-      <plugin>

-        <inherited>false</inherited>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>changes-maven-plugin</artifactId>

-      </plugin>

-

-      <plugin>

-        <inherited>false</inherited>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>changelog-maven-plugin</artifactId>

-        <configuration><basedir>${basedir}</basedir></configuration>

-      </plugin>

-

-      <!-- pmd has problems with annotations -->

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-pmd-plugin</artifactId>

-        <configuration>

-          <excludes>

-            <exclude>**/package-info.java</exclude>

-            <exclude>org/apache/myfaces/tobago/apt/annotation/*.java</exclude>

-          </excludes>

-          <encoding>UTF-8</encoding>

-          <linkXref>true</linkXref>

-          <targetJdk>1.5</targetJdk>

-        </configuration>

-      </plugin>

-

-

-      <!--plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>findbugs-maven-plugin</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <configuration>

-          <threshold>Low</threshold>

-        </configuration>

-      </plugin-->

-      

-    </plugins>

-

-  </reporting>

-  <dependencyManagement>

-    <dependencies>

-      <dependency>

-        <groupId>commons-io</groupId>

-        <artifactId>commons-io</artifactId>

-        <version>1.1</version>

-      </dependency>

-      <dependency>

-        <groupId>commons-lang</groupId>

-        <artifactId>commons-lang</artifactId>

-        <version>2.1</version>

-      </dependency>

-      <dependency>

-        <groupId>commons-beanutils</groupId>

-        <artifactId>commons-beanutils</artifactId>

-        <version>1.7.0</version>

-      </dependency>

-      <dependency>

-        <groupId>commons-collections</groupId>

-        <artifactId>commons-collections</artifactId>

-        <version>3.1</version>

-      </dependency>

-      <dependency>

-        <groupId>commons-logging</groupId>

-        <artifactId>commons-logging</artifactId>

-        <version>1.0.4</version>

-      </dependency>

-      <dependency>

-        <groupId>commons-digester</groupId>

-        <artifactId>commons-digester</artifactId>

-        <version>1.6</version>

-      </dependency>

-      <dependency>

-        <groupId>commons-fileupload</groupId>

-        <artifactId>commons-fileupload</artifactId>

-        <version>1.0</version>

-      </dependency>

-      <dependency>

-        <groupId>log4j</groupId>

-        <artifactId>log4j</artifactId>

-        <version>1.2.11</version>

-      </dependency>

-      <dependency>

-        <groupId>junit</groupId>

-        <artifactId>junit</artifactId>

-        <version>3.8.1</version>

-      </dependency>

-      <dependency>

-        <groupId>org.apache.myfaces.core</groupId>

-        <artifactId>myfaces-api</artifactId>

-        <version>1.1.2</version>

-      </dependency>

-      <dependency>

-        <groupId>org.apache.myfaces.core</groupId>

-        <artifactId>myfaces-impl</artifactId>

-        <version>1.1.2</version>

-      </dependency>

-      <dependency>

-        <groupId>javax.servlet</groupId>

-        <artifactId>jsp-api</artifactId>

-        <version>2.0</version>

-      </dependency>

-      <dependency>

-        <groupId>javax.servlet</groupId>

-        <artifactId>servlet-api</artifactId>

-        <version>2.3</version>

-      </dependency>

-    </dependencies>

-  </dependencyManagement>

-

-  <dependencies>

-

-    <dependency>

-      <groupId>junit</groupId>

-      <artifactId>junit</artifactId>

-      <scope>test</scope>

-    </dependency>

-

-  </dependencies>

-

-  <scm>

-

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/</url>

-

-  </scm>

-

-  <organization>

-    <name>Apache Software Foundation</name>

-    <url>http://www.apache.org/</url>

-  </organization>

-

-  <repositories>

-    <repository>

-      <releases>

-        <enabled>false</enabled>

-      </releases>

-      <snapshots>

-        <enabled>true</enabled>

-      </snapshots>

-      <id>apache-maven-snapshots</id>

-      <url>http://cvs.apache.org/maven-snapshot-repository</url>

-    </repository>

-  </repositories>

-

-  <build>

-    <defaultGoal>install</defaultGoal>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-compiler-plugin</artifactId>

-        <configuration>

-          <source>1.5</source>

-          <target>1.5</target>

-          <encoding>UTF-8</encoding>

-        </configuration>

-      </plugin>

-    </plugins>

-    <extensions>

-      <extension>

-        <groupId>org.apache.maven.wagon</groupId>

-         <artifactId>wagon-ssh-external</artifactId>

-         <version>1.0-alpha-6</version>

-      </extension>

-      <extension>

-        <groupId>org.apache.maven.wagon</groupId>

-        <artifactId>wagon-ftp</artifactId>

-        <version>1.0-alpha-6</version>

-      </extension>

-      <extension>

-        <groupId>org.apache.myfaces.maven</groupId>

-        <artifactId>build-tools</artifactId>

-        <version>1.0.0-SNAPSHOT</version>

-      </extension>

-    </extensions>

-  </build>

-

-  <licenses>

-    <license>

-      <name>The Apache Software License, Version 2.0</name>

-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>

-      <distribution>repo</distribution>

-    </license>

-  </licenses>

-

-  <modules>

-    <module>tobago-tool</module>

-    <module>core</module>

-    <module>theme</module>

-  </modules>

-

-  <distributionManagement>

-    <repository>

-      <id>apache-maven</id>

-      <name>Apache Maven Repository</name>

-      <url>scpexe://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url>

-    </repository>

-    <snapshotRepository>

-      <uniqueVersion>false</uniqueVersion>

-      <id>apache-maven-snapshots</id>

-      <name>Apache Maven Snapshot Repository</name>

-      <url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>

-    </snapshotRepository>

-    <site>

-      <id>website</id>

-      <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/tobago/</url>

-    </site>

-  </distributionManagement>

-

-  <profiles>

-    <profile>

-      <id>all-modules</id>

-      <modules>

-        <module>example</module>

-        <module>contrib</module>

-      </modules>

-    </profile>

-    <profile>

-      <id>generate-assembly</id>

-      <modules>

-        <module>contrib</module>

-        <module>tobago-assembly</module>

-      </modules>

-    </profile>

-  </profiles>

-

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.myfaces.tobago</groupId>
+  <artifactId>tobago</artifactId>
+  <packaging>pom</packaging>
+  <name>Tobago</name>
+  <version>1.0.7</version>
+  <description>Tobago</description>
+  <prerequisites>
+    <maven>2.0.3</maven>
+  </prerequisites>
+  <url>http://myfaces.apache.org/tobago</url>
+  <inceptionYear>2002</inceptionYear>
+  <issueManagement>
+    <system>jira</system>
+    <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=12310273</url>
+  </issueManagement>
+  <ciManagement>
+    <system>continuum</system>
+    <url>http://myfaces.zones.apache.org:8080/continuum</url>
+    <notifiers>
+      <notifier>
+        <configuration>
+          <address>commits@myfaces.apache.org</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <mailingLists>
+    <mailingList>
+      <name>Myfaces User List</name>
+      <subscribe>users-subscribe@myfaces.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@myfaces.apache.org</unsubscribe>
+      <post>do not post to users@myfaces.apache.org unless subscribed</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/myfaces-users</archive>
+      <otherArchives>
+        <otherArchive>http://www.mail-archive.com/users@myfaces.apache.org/</otherArchive>
+        <otherArchive>http://www.nabble.com/MyFaces---Users-f181.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>Myfaces Developer List</name>
+      <subscribe>dev-subscribe@myfaces.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@myfaces.apache.org</unsubscribe>
+      <post>do not post to dev@myfaces.apache.org unless subscribed</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/myfaces-dev</archive>
+      <otherArchives>
+        <otherArchive>http://www.mail-archive.com/dev@myfaces.apache.org/</otherArchive>
+        <otherArchive>http://www.nabble.com/My-Faces---Dev-f182.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>Myfaces Commits List</name>
+      <subscribe>commits-subscribe@myfaces.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@myfaces.apache.org</unsubscribe>
+      <post>do not post</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/myfaces-commits</archive>
+    </mailingList>
+    <mailingList>
+      <name>Myfaces Announcements List</name>
+      <subscribe>announce-subscribe@myfaces.apache.org</subscribe>
+      <unsubscribe>announce-unsubscribe@myfaces.apache.org</unsubscribe>
+      <post>do not post</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/myfaces-announce</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <id>idus</id>
+      <name>Arvid Hülsebus</name>
+      <email>idus@krelon.com</email>
+      <organization>atanion GmbH, Germany</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>bommel</id>
+      <name>Bernd Bohmann</name>
+      <email>bernd.bohmann@atanion.com</email>
+      <organization>atanion GmbH, Germany</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>pleff</id>
+      <name>Detlef Bartetzko</name>
+      <email>detlef.bartetzko@atanion.com</email>
+      <organization>atanion GmbH, Germany</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>mmarinschek</id>
+      <name>Martin Marinschek</name>
+      <organization>Irian, Austria</organization>
+      <email>martin.marinschek@gmail.com</email>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>matzew</id>
+      <name>Matthias Weßendorf</name>
+      <organization>Pironet NDH AG, Germany</organization>
+      <email>mwessendorf@gmail.com</email>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>hennes</id>
+      <name>Philippe Hennes</name>
+      <email>philippe.hennes@philstar.de</email>
+      <organization>atanion GmbH, Germany</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>lofwyr</id>
+      <name>Udo Schnurpfeil</name>
+      <email>udo@schnurpfeil.de</email>
+      <organization>atanion GmbH, Germany</organization>
+      <roles>
+        <role>Lead</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>weber</id>
+      <name>Volker Weber</name>
+      <email>asf@weber-oldenburg.de</email>
+      <organization>atanion GmbH, Germany</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+  </developers>
+
+  <reporting>
+    <excludeDefaults>true</excludeDefaults>
+    <plugins>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+        <configuration>
+          <tags>TODO, FIXME, XXX, @deprecated</tags>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jxr-maven-plugin</artifactId>
+      </plugin>
+
+      <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-checkstyle-plugin</artifactId>-->
+        <!--<configuration>-->
+          <!--<configLocation>org/apache/myfaces/tobago/checkstyle.xml</configLocation>-->
+          <!--<xrefLocation>xref</xrefLocation>-->
+          <!--<excludes>**/package-info.java</excludes>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <links>
+            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+            <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+            <link>http://java.sun.com/javaee/javaserverfaces/1.1_01/docs/api</link>
+            <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+            <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+            <link>http://www.junit.org/junit/javadoc/</link>
+            <link>http://logging.apache.org/log4j/docs/api/</link>
+          </links>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>surefire-report-maven-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+       </plugin>
+
+      <plugin>
+        <inherited>false</inherited>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>changes-maven-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <inherited>false</inherited>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>changelog-maven-plugin</artifactId>
+        <configuration><basedir>${basedir}</basedir></configuration>
+      </plugin>
+
+      <!-- pmd has problems with annotations -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/package-info.java</exclude>
+            <exclude>org/apache/myfaces/tobago/apt/annotation/*.java</exclude>
+          </excludes>
+          <encoding>UTF-8</encoding>
+          <linkXref>true</linkXref>
+          <targetJdk>1.5</targetJdk>
+        </configuration>
+      </plugin>
+
+
+      <!--plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <threshold>Low</threshold>
+        </configuration>
+      </plugin-->
+
+    </plugins>
+
+  </reporting>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.7.0</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.0.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <version>1.6</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.11</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>3.8.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.myfaces.core</groupId>
+        <artifactId>myfaces-api</artifactId>
+        <version>1.1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.myfaces.core</groupId>
+        <artifactId>myfaces-impl</artifactId>
+        <version>1.1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>jsp-api</artifactId>
+        <version>2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>2.3</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+
+  </scm>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>apache-maven-snapshots</id>
+      <url>http://cvs.apache.org/maven-snapshot-repository</url>
+    </repository>
+  </repositories>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+    </plugins>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+         <artifactId>wagon-ssh-external</artifactId>
+         <version>1.0-alpha-6</version>
+      </extension>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ftp</artifactId>
+        <version>1.0-alpha-6</version>
+      </extension>
+      <!--<extension>-->
+        <!--<groupId>org.apache.myfaces.maven</groupId>-->
+        <!--<artifactId>build-tools</artifactId>-->
+        <!--<version>1.0.0-SNAPSHOT</version>-->
+      <!--</extension>-->
+    </extensions>
+  </build>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <modules>
+    <module>tobago-tool</module>
+    <module>core</module>
+    <module>theme</module>
+  </modules>
+
+  <distributionManagement>
+    <repository>
+      <id>apache-maven</id>
+      <name>Apache Maven Repository</name>
+      <url>scpexe://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url>
+    </repository>
+    <snapshotRepository>
+      <uniqueVersion>false</uniqueVersion>
+      <id>apache-maven-snapshots</id>
+      <name>Apache Maven Snapshot Repository</name>
+      <url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+    </snapshotRepository>
+    <site>
+      <id>website</id>
+      <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/tobago/</url>
+    </site>
+  </distributionManagement>
+
+  <profiles>
+    <profile>
+      <id>all-modules</id>
+      <modules>
+        <module>example</module>
+        <module>contrib</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>generate-assembly</id>
+      <modules>
+        <module>contrib</module>
+        <module>tobago-assembly</module>
+      </modules>
+    </profile>
+  </profiles>
+
+</project>
\ No newline at end of file
diff --git a/theme/charlotteville/pom.xml b/theme/charlotteville/pom.xml
index 06f8a1c..2d1adc8 100644
--- a/theme/charlotteville/pom.xml
+++ b/theme/charlotteville/pom.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Copyright 2002-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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
     <artifactId>tobago-theme</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.7</version>
   </parent>
   <artifactId>tobago-theme-charlotteville</artifactId>
   <name>Tobago Theme Charlotteville</name>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/charlotteville</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/charlotteville</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/theme/charlotteville</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
   </scm>
 
   <dependencies>
@@ -61,60 +42,60 @@
 
   </dependencies>
 
-  <profiles>
-    <profile>
-      <!--
-  mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
-  mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar
-      -->
-      <id>jdk14retro</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>retrotranslator-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>translate</goal>
-                </goals>
-                <configuration>
-                  <verify>true</verify>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-jar-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-                <configuration>
-                <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
-                  <classifier>jdk14retro</classifier>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-       <dependencies>
-        <dependency>
-          <groupId>sun.jdk</groupId>
-          <artifactId>rt</artifactId>
-          <version>1.4.0</version>
-          <scope>system</scope>
-          <systemPath>${java14.home}/lib/rt.jar</systemPath>
-        </dependency>
-        <dependency>
-          <groupId>net.sf.retrotranslator</groupId>
-          <artifactId>retrotranslator-runtime</artifactId>
-          <version>1.0.3</version>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-  
-</project>
+  <!--<profiles>-->
+    <!--<profile>-->
+
+  <!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
+  <!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
+
+      <!--<id>jdk14retro</id>-->
+      <!--<build>-->
+        <!--<plugins>-->
+          <!--<plugin>-->
+            <!--<groupId>org.codehaus.mojo</groupId>-->
+            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>translate</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                  <!--<verify>true</verify>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+          <!--<plugin>-->
+            <!--<artifactId>maven-jar-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>jar</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
+                  <!--<classifier>jdk14retro</classifier>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+        <!--</plugins>-->
+      <!--</build>-->
+       <!--<dependencies>-->
+        <!--<dependency>-->
+          <!--<groupId>sun.jdk</groupId>-->
+          <!--<artifactId>rt</artifactId>-->
+          <!--<version>1.4.0</version>-->
+          <!--<scope>system</scope>-->
+          <!--<systemPath>${java14.home}/lib/rt.jar</systemPath>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+          <!--<groupId>net.sf.retrotranslator</groupId>-->
+          <!--<artifactId>retrotranslator-runtime</artifactId>-->
+          <!--<version>1.0.3</version>-->
+        <!--</dependency>-->
+      <!--</dependencies>-->
+    <!--</profile>-->
+  <!--</profiles>-->
+
+</project>
\ No newline at end of file
diff --git a/theme/pom.xml b/theme/pom.xml
index 529df5e..7849860 100644
--- a/theme/pom.xml
+++ b/theme/pom.xml
@@ -1,83 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <packaging>pom</packaging>

-  <name>Tobago Themes</name>

-  <groupId>org.apache.myfaces.tobago</groupId>

-  <artifactId>tobago-theme</artifactId>

-

-  <reporting>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-project-info-reports-plugin</artifactId>

-        <reportSets>

-          <reportSet>

-            <reports>

-              <report>dependencies</report>

-            </reports>

-          </reportSet>

-        </reportSets>

-      </plugin>

-    </plugins>

-  </reporting>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/theme</url>

-  </scm>

-

-  <modules>

-    <module>standard</module>

-    <module>scarborough</module>

-    <module>speyside</module>

-    <module>richmond</module>

-    <module>charlotteville</module>

-<!--    <module>tobago-theme-boccoo</module>-->

-  </modules>

-  <profiles>

-    <profile>

-      <id>generate-assembly</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.apache.maven.plugins</groupId>

-            <artifactId>maven-source-plugin</artifactId>

-            <executions>

-              <execution>

-                <id>attach-source</id>

-                <goals>

-                  <goal>jar</goal>

-                </goals>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-    </profile>

-  </profiles>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <packaging>pom</packaging>
+  <name>Tobago Themes</name>
+  <groupId>org.apache.myfaces.tobago</groupId>
+  <artifactId>tobago-theme</artifactId>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>dependencies</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <modules>
+    <module>standard</module>
+    <module>scarborough</module>
+    <module>speyside</module>
+    <module>richmond</module>
+    <module>charlotteville</module>
+<!--    <module>tobago-theme-boccoo</module>-->
+  </modules>
+  <profiles>
+    <profile>
+      <id>generate-assembly</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-source</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file
diff --git a/theme/richmond/pom.xml b/theme/richmond/pom.xml
index 2ee6ee2..e489138 100644
--- a/theme/richmond/pom.xml
+++ b/theme/richmond/pom.xml
@@ -1,37 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Copyright 2002-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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
     <artifactId>tobago-theme</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.7</version>
   </parent>
   <artifactId>tobago-theme-richmond</artifactId>
   <packaging>jar</packaging>
   <name>Tobago Theme Richmond</name>
-  
+
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/richmond</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/richmond</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/theme/richmond</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
   </scm>
 
   <dependencies>
@@ -55,64 +36,63 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <profiles>
-      <profile>
-        <!--
-  mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
-  mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar
-        -->
-        <id>jdk14retro</id>
-        <build>
-          <plugins>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>retrotranslator-maven-plugin</artifactId>
-              <executions>
-                <execution>
-                  <goals>
-                    <goal>translate</goal>
-                  </goals>
-                  <configuration>
-                    <verify>true</verify>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-              <artifactId>maven-jar-plugin</artifactId>
-              <executions>
-                <execution>
-                  <goals>
-                    <goal>jar</goal>
-                  </goals>
-                  <configuration>
-                  <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
-                    <classifier>jdk14retro</classifier>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-          </plugins>
-        </build>
-         <dependencies>
-          <dependency>
-            <groupId>sun.jdk</groupId>
-            <artifactId>rt</artifactId>
-            <version>1.4.0</version>
-            <scope>system</scope>
-            <systemPath>${java14.home}/lib/rt.jar</systemPath>
-          </dependency>
-          <dependency>
-            <groupId>net.sf.retrotranslator</groupId>
-            <artifactId>retrotranslator-runtime</artifactId>
-            <version>1.0.3</version>
-          </dependency>
-        </dependencies>
-      </profile>
-    </profiles>
-  
-</project>
+  <!--<profiles>-->
+      <!--<profile>-->
+
+  <!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
+  <!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
+
+        <!--<id>jdk14retro</id>-->
+        <!--<build>-->
+          <!--<plugins>-->
+            <!--<plugin>-->
+              <!--<groupId>org.codehaus.mojo</groupId>-->
+              <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
+              <!--<executions>-->
+                <!--<execution>-->
+                  <!--<goals>-->
+                    <!--<goal>translate</goal>-->
+                  <!--</goals>-->
+                  <!--<configuration>-->
+                    <!--<verify>true</verify>-->
+                  <!--</configuration>-->
+                <!--</execution>-->
+              <!--</executions>-->
+            <!--</plugin>-->
+            <!--<plugin>-->
+              <!--<artifactId>maven-jar-plugin</artifactId>-->
+              <!--<executions>-->
+                <!--<execution>-->
+                  <!--<goals>-->
+                    <!--<goal>jar</goal>-->
+                  <!--</goals>-->
+                  <!--<configuration>-->
+                  <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
+                    <!--<classifier>jdk14retro</classifier>-->
+                  <!--</configuration>-->
+                <!--</execution>-->
+              <!--</executions>-->
+            <!--</plugin>-->
+          <!--</plugins>-->
+        <!--</build>-->
+         <!--<dependencies>-->
+          <!--<dependency>-->
+            <!--<groupId>sun.jdk</groupId>-->
+            <!--<artifactId>rt</artifactId>-->
+            <!--<version>1.4.0</version>-->
+            <!--<scope>system</scope>-->
+            <!--<systemPath>${java14.home}/lib/rt.jar</systemPath>-->
+          <!--</dependency>-->
+          <!--<dependency>-->
+            <!--<groupId>net.sf.retrotranslator</groupId>-->
+            <!--<artifactId>retrotranslator-runtime</artifactId>-->
+            <!--<version>1.0.3</version>-->
+          <!--</dependency>-->
+        <!--</dependencies>-->
+      <!--</profile>-->
+    <!--</profiles>-->
+
+</project>
\ No newline at end of file
diff --git a/theme/scarborough/pom.xml b/theme/scarborough/pom.xml
index 7400b32..799a7d6 100644
--- a/theme/scarborough/pom.xml
+++ b/theme/scarborough/pom.xml
@@ -1,144 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-theme</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>tobago-theme-scarborough</artifactId>

-  <packaging>jar</packaging>

-  <name>Tobago Theme Scarborough</name>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/scarborough</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/scarborough</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/theme/scarborough</url>

-  </scm>

-

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-surefire-plugin</artifactId>

-        <configuration>

-          <excludes>

-            <exclude>**/DateUnitTest*</exclude>

-          </excludes>

-        </configuration>

-      </plugin>

-    </plugins>

-  </build>

-

-  <dependencies>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-standard</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-core</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <version>2.3</version>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>junit</groupId>

-      <artifactId>junit</artifactId>

-      <version>3.8.1</version>

-      <scope>test</scope>

-    </dependency>

-    <dependency>

-      <groupId>rhino</groupId>

-      <artifactId>js</artifactId>

-      <version>1.6R2</version>

-      <scope>test</scope>

-    </dependency>

-  </dependencies>

-  <profiles>

-    <profile>

-      <!--

-  mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar

-  mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar

-      -->

-      <id>jdk14retro</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.codehaus.mojo</groupId>

-            <artifactId>retrotranslator-maven-plugin</artifactId>

-            <executions>

-              <execution>

-                <goals>

-                  <goal>translate</goal>

-                </goals>

-                <configuration>

-                  <verify>true</verify>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-          <plugin>

-            <artifactId>maven-jar-plugin</artifactId>

-            <executions>

-              <execution>

-                <goals>

-                  <goal>jar</goal>

-                </goals>

-                <configuration>

-                <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>

-                  <classifier>jdk14retro</classifier>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-       <dependencies>

-        <dependency>

-          <groupId>sun.jdk</groupId>

-          <artifactId>rt</artifactId>

-          <version>1.4.0</version>

-          <scope>system</scope>

-          <systemPath>${java14.home}/lib/rt.jar</systemPath>

-        </dependency>

-        <dependency>

-          <groupId>net.sf.retrotranslator</groupId>

-          <artifactId>retrotranslator-runtime</artifactId>

-          <version>1.0.3</version>

-        </dependency>

-      </dependencies>

-    </profile>

-  </profiles>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-theme</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>tobago-theme-scarborough</artifactId>
+  <packaging>jar</packaging>
+  <name>Tobago Theme Scarborough</name>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/DateUnitTest*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-standard</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>rhino</groupId>
+      <artifactId>js</artifactId>
+      <version>1.6R2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <!--<profiles>-->
+    <!--<profile>-->
+
+  <!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
+  <!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
+
+      <!--<id>jdk14retro</id>-->
+      <!--<build>-->
+        <!--<plugins>-->
+          <!--<plugin>-->
+            <!--<groupId>org.codehaus.mojo</groupId>-->
+            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>translate</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                  <!--<verify>true</verify>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+          <!--<plugin>-->
+            <!--<artifactId>maven-jar-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>jar</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
+                  <!--<classifier>jdk14retro</classifier>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+        <!--</plugins>-->
+      <!--</build>-->
+       <!--<dependencies>-->
+        <!--<dependency>-->
+          <!--<groupId>sun.jdk</groupId>-->
+          <!--<artifactId>rt</artifactId>-->
+          <!--<version>1.4.0</version>-->
+          <!--<scope>system</scope>-->
+          <!--<systemPath>${java14.home}/lib/rt.jar</systemPath>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+          <!--<groupId>net.sf.retrotranslator</groupId>-->
+          <!--<artifactId>retrotranslator-runtime</artifactId>-->
+          <!--<version>1.0.3</version>-->
+        <!--</dependency>-->
+      <!--</dependencies>-->
+    <!--</profile>-->
+  <!--</profiles>-->
+</project>
\ No newline at end of file
diff --git a/theme/speyside/pom.xml b/theme/speyside/pom.xml
index 1a2107b..67a4e4e 100644
--- a/theme/speyside/pom.xml
+++ b/theme/speyside/pom.xml
@@ -1,122 +1,100 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-theme</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>tobago-theme-speyside</artifactId>

-  <packaging>jar</packaging>

-  <name>Tobago Theme Speyside</name>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/speyside</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/speyside</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/theme/speyside</url>

-  </scm>

-

-  <dependencies>

-

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-scarborough</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-core</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-    <dependency>

-       <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <version>2.3</version>

-      <scope>provided</scope>

-    </dependency>

-

-  </dependencies>

-

-  <profiles>

-    <profile>

-      <!--

-  mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar

-  mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar

-      -->

-      <id>jdk14retro</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.codehaus.mojo</groupId>

-            <artifactId>retrotranslator-maven-plugin</artifactId>

-            <executions>

-              <execution>

-                <goals>

-                  <goal>translate</goal>

-                </goals>

-                <configuration>

-                  <verify>true</verify>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-          <plugin>

-            <artifactId>maven-jar-plugin</artifactId>

-            <executions>

-              <execution>

-                <goals>

-                  <goal>jar</goal>

-                </goals>

-                <configuration>

-                <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>

-                  <classifier>jdk14retro</classifier>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-       <dependencies>

-        <dependency>

-          <groupId>sun.jdk</groupId>

-          <artifactId>rt</artifactId>

-          <version>1.4.0</version>

-          <scope>system</scope>

-          <systemPath>${java14.home}/lib/rt.jar</systemPath>

-        </dependency>

-        <dependency>

-          <groupId>net.sf.retrotranslator</groupId>

-          <artifactId>retrotranslator-runtime</artifactId>

-          <version>1.0.3</version>

-        </dependency>

-      </dependencies>

-    </profile>

-  </profiles>

-

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-theme</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>tobago-theme-speyside</artifactId>
+  <packaging>jar</packaging>
+  <name>Tobago Theme Speyside</name>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-scarborough</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+       <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+  </dependencies>
+
+  <!--<profiles>-->
+    <!--<profile>-->
+  <!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
+  <!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
+      <!--<id>jdk14retro</id>-->
+      <!--<build>-->
+        <!--<plugins>-->
+          <!--<plugin>-->
+            <!--<groupId>org.codehaus.mojo</groupId>-->
+            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>translate</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                  <!--<verify>true</verify>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+          <!--<plugin>-->
+            <!--<artifactId>maven-jar-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>jar</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
+                  <!--<classifier>jdk14retro</classifier>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+        <!--</plugins>-->
+      <!--</build>-->
+       <!--<dependencies>-->
+        <!--<dependency>-->
+          <!--<groupId>sun.jdk</groupId>-->
+          <!--<artifactId>rt</artifactId>-->
+          <!--<version>1.4.0</version>-->
+          <!--<scope>system</scope>-->
+          <!--<systemPath>${java14.home}/lib/rt.jar</systemPath>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+          <!--<groupId>net.sf.retrotranslator</groupId>-->
+          <!--<artifactId>retrotranslator-runtime</artifactId>-->
+          <!--<version>1.0.3</version>-->
+        <!--</dependency>-->
+      <!--</dependencies>-->
+    <!--</profile>-->
+  <!--</profiles>-->
+
+</project>
\ No newline at end of file
diff --git a/theme/standard/pom.xml b/theme/standard/pom.xml
index 772abfe..4ee876a 100644
--- a/theme/standard/pom.xml
+++ b/theme/standard/pom.xml
@@ -1,117 +1,97 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-   <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-theme</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>tobago-theme-standard</artifactId>

-  <packaging>jar</packaging>

-  <name>Tobago Theme Standard</name>

-

-  <scm>

-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/standard</connection>

-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/standard</developerConnection>

-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/theme/standard</url>

-  </scm>

-  

-  <dependencies>

-

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-core</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-       <exclusions>

-        <exclusion>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <version>2.3</version>

-      <scope>provided</scope>

-    </dependency>

-

-  </dependencies>

-

-  <profiles>

-    <profile>

-      <!--

-mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar

-mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar

-      -->

-      <id>jdk14retro</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.codehaus.mojo</groupId>

-            <artifactId>retrotranslator-maven-plugin</artifactId>

-            <executions>

-              <execution>

-                <goals>

-                  <goal>translate</goal>

-                </goals>

-                <configuration>

-                  <verify>true</verify>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-          <plugin>

-            <artifactId>maven-jar-plugin</artifactId>

-            <executions>

-              <execution>

-                <goals>

-                  <goal>jar</goal>

-                </goals>

-                <configuration>

-                <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>

-                  <classifier>jdk14retro</classifier>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-       <dependencies>

-        <dependency>

-          <groupId>sun.jdk</groupId>

-          <artifactId>rt</artifactId>

-          <version>1.4.0</version>

-          <scope>system</scope>

-          <systemPath>${java14.home}/lib/rt.jar</systemPath>

-        </dependency>

-        <dependency>

-          <groupId>net.sf.retrotranslator</groupId>

-          <artifactId>retrotranslator-runtime</artifactId>

-          <version>1.0.3</version>

-        </dependency>

-      </dependencies>

-    </profile>

-  </profiles>

-

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+   <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-theme</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>tobago-theme-standard</artifactId>
+  <packaging>jar</packaging>
+  <name>Tobago Theme Standard</name>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/tags/tobago-1.0.7</url>
+  </scm>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+       <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+  </dependencies>
+
+  <!--<profiles>-->
+    <!--<profile>-->
+
+<!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
+<!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
+
+      <!--<id>jdk14retro</id>-->
+      <!--<build>-->
+        <!--<plugins>-->
+          <!--<plugin>-->
+            <!--<groupId>org.codehaus.mojo</groupId>-->
+            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>translate</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                  <!--<verify>true</verify>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+          <!--<plugin>-->
+            <!--<artifactId>maven-jar-plugin</artifactId>-->
+            <!--<executions>-->
+              <!--<execution>-->
+                <!--<goals>-->
+                  <!--<goal>jar</goal>-->
+                <!--</goals>-->
+                <!--<configuration>-->
+                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
+                  <!--<classifier>jdk14retro</classifier>-->
+                <!--</configuration>-->
+              <!--</execution>-->
+            <!--</executions>-->
+          <!--</plugin>-->
+        <!--</plugins>-->
+      <!--</build>-->
+       <!--<dependencies>-->
+        <!--<dependency>-->
+          <!--<groupId>sun.jdk</groupId>-->
+          <!--<artifactId>rt</artifactId>-->
+          <!--<version>1.4.0</version>-->
+          <!--<scope>system</scope>-->
+          <!--<systemPath>${java14.home}/lib/rt.jar</systemPath>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+          <!--<groupId>net.sf.retrotranslator</groupId>-->
+          <!--<artifactId>retrotranslator-runtime</artifactId>-->
+          <!--<version>1.0.3</version>-->
+        <!--</dependency>-->
+      <!--</dependencies>-->
+    <!--</profile>-->
+  <!--</profiles>-->
+
+</project>
\ No newline at end of file
diff --git a/tobago-assembly/pom.xml b/tobago-assembly/pom.xml
index 6c189a5..cf58952 100644
--- a/tobago-assembly/pom.xml
+++ b/tobago-assembly/pom.xml
@@ -1,24 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Copyright 2002-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.
--->
-    
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tobago-assembly</artifactId>
   <packaging>pom</packaging>
@@ -28,7 +8,7 @@
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
     <artifactId>tobago</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.7</version>
   </parent>
 
 
@@ -195,4 +175,4 @@
       </exclusions>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/tobago-tool/gendoc/pom.xml b/tobago-tool/gendoc/pom.xml
index 7e0d3ff..dba76d8 100644
--- a/tobago-tool/gendoc/pom.xml
+++ b/tobago-tool/gendoc/pom.xml
@@ -1,106 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-tool</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <artifactId>gendoc</artifactId>

-  <packaging>war</packaging>

-  <name>Tobago gendoc</name>

-  <build>

-    <finalName>gendoc</finalName>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.myfaces.tobago</groupId>

-        <artifactId>maven-theme-plugin</artifactId>

-        <version>${version}</version>

-        <executions>

-          <execution>

-            <goals>

-              <goal>resources</goal>

-            </goals>

-          </execution>

-        </executions>

-      </plugin>

-      <plugin>

-        <groupId>org.codehaus.mojo</groupId>

-        <artifactId>tomcat-maven-plugin</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <configuration>

-          <server>tomcat</server>

-          <update>true</update>

-          <url>http://localhost:8080/manager</url>

-        </configuration>

-      </plugin>

-    </plugins>

-  </build>

-  <dependencies>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-scarborough</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-speyside</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-richmond</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-theme-standard</artifactId>

-      <version>${version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.tobago</groupId>

-      <artifactId>tobago-core</artifactId>

-      <version>${version}</version>

-      <scope>compile</scope>

-      <exclusions>

-        <exclusion>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-        </exclusion>

-      </exclusions>

-    </dependency>

-    <dependency>

-      <groupId>log4j</groupId>

-      <artifactId>log4j</artifactId>

-      <scope>provided</scope>

-    </dependency>

-   <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>jsp-api</artifactId>

-      <scope>provided</scope>

-    </dependency>

-  </dependencies>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-tool</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <artifactId>gendoc</artifactId>
+  <packaging>war</packaging>
+  <name>Tobago gendoc</name>
+  <build>
+    <finalName>gendoc</finalName>
+    <!--<plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>
+        </configuration>
+      </plugin>
+    </plugins>-->
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-scarborough</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-speyside</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-richmond</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-standard</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+   <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
\ No newline at end of file
diff --git a/tobago-tool/gendoc/src/main/webapp/WEB-INF/tobago-config.xml b/tobago-tool/gendoc/src/main/webapp/WEB-INF/tobago-config.xml
index 02ea5d3..94de9fe 100644
--- a/tobago-tool/gendoc/src/main/webapp/WEB-INF/tobago-config.xml
+++ b/tobago-tool/gendoc/src/main/webapp/WEB-INF/tobago-config.xml
@@ -23,10 +23,9 @@
 

   <theme-config>

     <default-theme>speyside</default-theme>

-    <supported-theme>scarborough</supported-theme>

   </theme-config>

 

   <resource-dir>tobago-resource</resource-dir>

-  <resource-dir>tobago</resource-dir>

+  <resource-dir>org/apache/myfaces/tobago/renderkit</resource-dir>

 

 </tobago-config>

diff --git a/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml b/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml
index dd4d20c..148d843 100644
--- a/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml
+++ b/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml
@@ -28,6 +28,7 @@
     <filter-name>multipartFormdataFilter</filter-name>
     <filter-class>org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataFilter</filter-class>
   </filter>
+
   <filter-mapping>
     <filter-name>multipartFormdataFilter</filter-name>
     <url-pattern>/faces/*</url-pattern>
@@ -39,6 +40,11 @@
     <load-on-startup>3</load-on-startup>
   </servlet>
 
+  <servlet>
+    <servlet-name>ResourceServlet</servlet-name>
+    <servlet-class>org.apache.myfaces.tobago.servlet.ResourceServlet</servlet-class>
+  </servlet>
+
   <!-- servlet-mapping -->
 
   <servlet-mapping>
@@ -46,4 +52,9 @@
     <url-pattern>/faces/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>ResourceServlet</servlet-name>
+    <url-pattern>/org/apache/myfaces/tobago/renderkit/*</url-pattern>
+  </servlet-mapping>
+  
 </web-app>
diff --git a/tobago-tool/gendoc/src/main/webapp/screenshot/menuBar.jsp b/tobago-tool/gendoc/src/main/webapp/screenshot/menuBar.jsp
index 3ec5cce..2c7a22e 100644
--- a/tobago-tool/gendoc/src/main/webapp/screenshot/menuBar.jsp
+++ b/tobago-tool/gendoc/src/main/webapp/screenshot/menuBar.jsp
@@ -33,7 +33,7 @@
             <tc:menuItem label="Print"/>

             <tc:menuSeparator/>

             <tc:menuItem label="Exit"/>

-            <tc:menuCheckbox label="Administration Mode"/>

+            <%--<tc:menuCheckbox action="none" label="Administration Mode"/>--%>

           </tc:menu>

 

           <%-- code-sniplet-start id="menu" --%>

diff --git a/tobago-tool/maven-apt-plugin/pom.xml b/tobago-tool/maven-apt-plugin/pom.xml
index a065644..9e42768 100644
--- a/tobago-tool/maven-apt-plugin/pom.xml
+++ b/tobago-tool/maven-apt-plugin/pom.xml
@@ -1,47 +1,45 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-tool</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <groupId>org.apache.myfaces.tobago</groupId>

-	<artifactId>maven-apt-plugin</artifactId>

-	<packaging>maven-plugin</packaging>

-	<name>Maven Apt Plugin</name>

-

-  <reporting>

-    <plugins>

-

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-checkstyle-plugin</artifactId>

-        <configuration>

-          <configLocation>config/maven_checks.xml</configLocation>

-          <xrefLocation>xref</xrefLocation>

-        </configuration>

-      </plugin>

-

-    </plugins>

-  </reporting>

-

-  <dependencies>

-		<dependency>

-			<groupId>org.codehaus.plexus</groupId>

-			<artifactId>plexus-compiler-api</artifactId>

-			<version>1.5.2</version>

-		</dependency>

-    <dependency>

-      <groupId>org.apache.maven</groupId>

-      <artifactId>maven-plugin-api</artifactId>

-      <version>2.0</version>

-    </dependency>

-    <dependency>

-			<groupId>org.apache.maven</groupId>

-			<artifactId>maven-project</artifactId>

-      <version>2.0</version>

-    </dependency>

-	</dependencies>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-tool</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <groupId>org.apache.myfaces.tobago</groupId>
+	<artifactId>maven-apt-plugin</artifactId>
+	<packaging>maven-plugin</packaging>
+	<name>Maven Apt Plugin</name>
+
+  <reporting>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>config/maven_checks.xml</configLocation>
+          <xrefLocation>xref</xrefLocation>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </reporting>
+
+  <dependencies>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-compiler-api</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-project</artifactId>
+      <version>2.0</version>
+    </dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/tobago-tool/maven-theme-plugin/pom.xml b/tobago-tool/maven-theme-plugin/pom.xml
index abfd6ed..f9161d5 100644
--- a/tobago-tool/maven-theme-plugin/pom.xml
+++ b/tobago-tool/maven-theme-plugin/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
     <artifactId>tobago-tool</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.7</version>
   </parent>
   <groupId>org.apache.myfaces.tobago</groupId>
   <artifactId>maven-theme-plugin</artifactId>
@@ -54,4 +53,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/tobago-tool/pom.xml b/tobago-tool/pom.xml
index 7764087..8014594 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/pom.xml
@@ -1,37 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!--

- * Copyright 2002-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.

--->

-

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion> 

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <packaging>pom</packaging>

-  <name>Tobago Tool</name>

-  <groupId>org.apache.myfaces.tobago</groupId>

-  <artifactId>tobago-tool</artifactId>

-  <modules>

-    <module>maven-apt-plugin</module>

-    <module>maven-theme-plugin</module>

-    <module>tobago-tool-apt</module>

-  </modules>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <packaging>pom</packaging>
+  <name>Tobago Tool</name>
+  <groupId>org.apache.myfaces.tobago</groupId>
+  <artifactId>tobago-tool</artifactId>
+  <modules>
+    <module>maven-apt-plugin</module>
+    <module>maven-theme-plugin</module>
+    <module>tobago-tool-apt</module>
+  </modules>
+  <profiles>
+    <profile>
+      <id>all-modules</id>
+      <modules>
+        <module>gendoc</module>
+      </modules>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file
diff --git a/tobago-tool/tobago-tool-apt/pom.xml b/tobago-tool/tobago-tool-apt/pom.xml
index a5b47ec..10f4475 100644
--- a/tobago-tool/tobago-tool-apt/pom.xml
+++ b/tobago-tool/tobago-tool-apt/pom.xml
@@ -1,89 +1,72 @@
-<?xml version="1.0" encoding="iso-8859-1"?>

-<project>

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.apache.myfaces.tobago</groupId>

-    <artifactId>tobago-tool</artifactId>

-    <version>1.0.7-SNAPSHOT</version>

-  </parent>

-  <groupId>org.apache.myfaces.tobago</groupId>

-  <artifactId>tobago-tool-apt</artifactId>

-  <packaging>jar</packaging>

-  <name>Tobago Apt</name>

-  <description>Tobago Apt</description>

-

-  <reporting>

-    <plugins>

-

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-checkstyle-plugin</artifactId>

-        <configuration>

-          <configLocation>org/apache/myfaces/tobago/checkstyle.xml</configLocation>

-          <xrefLocation>xref</xrefLocation>

-          <excludes>**/package-info.java</excludes>

-        </configuration>

-      </plugin>

-

-    </plugins>

-  </reporting>

-

-  <dependencies>

-

-    <dependency>

-      <groupId>ant</groupId>

-      <artifactId>ant</artifactId>

-      <version>1.6.2</version>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>commons-io</groupId>

-      <artifactId>commons-io</artifactId>

-      <scope>compile</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>commons-lang</groupId>

-      <artifactId>commons-lang</artifactId>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>jsp-api</artifactId>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.apache.myfaces.core</groupId>

-      <artifactId>myfaces-api</artifactId>

-      <scope>provided</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>org.codehaus.modello</groupId>

-      <artifactId>modello-core</artifactId>

-      <version>1.0-alpha-8</version>

-    </dependency>

-

-  </dependencies>

-

-  <profiles>

-    <!-- Mac OS X has not a tools.jar! -->

-    <profile>

-      <id>tools.jar</id>

-      <activation>

-        <!-- needs maven 2.0.3 or higher under Mac OS X -->

-        <os><family>!mac</family></os>

-      </activation>

-      <dependencies>

-        <dependency>

-          <groupId>sun.jdk</groupId>

-          <artifactId>tools</artifactId>

-          <version>1.5.0</version>

-          <scope>system</scope>

-          <systemPath>${java.home}/../lib/tools.jar</systemPath>

-        </dependency>

-      </dependencies>

-    </profile>

-  </profiles>

-</project>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-tool</artifactId>
+    <version>1.0.7</version>
+  </parent>
+  <groupId>org.apache.myfaces.tobago</groupId>
+  <artifactId>tobago-tool-apt</artifactId>
+  <packaging>jar</packaging>
+  <name>Tobago Apt</name>
+  <description>Tobago Apt</description>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.6.2</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-core</artifactId>
+      <version>1.0-alpha-8</version>
+    </dependency>
+
+  </dependencies>
+
+  <profiles>
+    <!-- Mac OS X has not a tools.jar! -->
+    <profile>
+      <id>tools.jar</id>
+      <activation>
+        <!-- needs maven 2.0.3 or higher under Mac OS X -->
+        <os><family>!mac</family></os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+          <version>1.5.0</version>
+          <scope>system</scope>
+          <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file