[maven-scm] copy for tag tobago-1.0.7
diff --git a/contrib/facelets/pom.xml b/contrib/facelets/pom.xml
index 617a92f..17ba596 100644
--- a/contrib/facelets/pom.xml
+++ b/contrib/facelets/pom.xml
@@ -146,7 +146,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 5889f99..6134926 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<name>Tobago Core</name>
<description>Tobago Core</description>
-
+
<build>
<resources>
<resource>
@@ -325,10 +325,10 @@
</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>-->
diff --git a/example/addressbook/pom.xml b/example/addressbook/pom.xml
index 3d469e1..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 53916d7..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 a9839b6..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 1f46586..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 1767316..8ca4d1b 100644
--- a/example/foreach/pom.xml
+++ b/example/foreach/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-example</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<artifactId>tobago-example-foreach</artifactId>
<packaging>war</packaging>
@@ -30,7 +11,7 @@
<build>
<finalName>tobago-example-foreach</finalName>
<!--<plugins>-->
-<!---->
+
<!--<plugin>-->
<!--<groupId>org.codehaus.mojo</groupId>-->
<!--<artifactId>tomcat-maven-plugin</artifactId>-->
@@ -41,14 +22,14 @@
<!--<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/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 acd3a3a..ee796e2 100644
--- a/example/nonfacesrequest/pom.xml
+++ b/example/nonfacesrequest/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-example</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
</parent>
<artifactId>tobago-example-nonfacesrequest</artifactId>
<packaging>war</packaging>
@@ -30,7 +11,7 @@
<build>
<finalName>tobago-example-nonfacesrequest</finalName>
<!--<plugins>-->
-<!---->
+
<!--<plugin>-->
<!--<groupId>org.codehaus.mojo</groupId>-->
<!--<artifactId>tomcat-maven-plugin</artifactId>-->
@@ -41,14 +22,14 @@
<!--<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/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 56ebeed..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 e5bc404..08eea9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,7 +238,7 @@
<threshold>Low</threshold>
</configuration>
</plugin-->
-
+
</plugins>
</reporting>
diff --git a/theme/charlotteville/pom.xml b/theme/charlotteville/pom.xml
index 857f49f..2d1adc8 100644
--- a/theme/charlotteville/pom.xml
+++ b/theme/charlotteville/pom.xml
@@ -97,5 +97,5 @@
<!--</dependencies>-->
<!--</profile>-->
<!--</profiles>-->
-
+
</project>
\ No newline at end of file
diff --git a/theme/richmond/pom.xml b/theme/richmond/pom.xml
index 688345b..e489138 100644
--- a/theme/richmond/pom.xml
+++ b/theme/richmond/pom.xml
@@ -8,7 +8,7 @@
<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/tags/tobago-1.0.7</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.7</developerConnection>
@@ -44,7 +44,7 @@
<!--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>-->
@@ -94,5 +94,5 @@
<!--</dependencies>-->
<!--</profile>-->
<!--</profiles>-->
-
+
</project>
\ No newline at end of file
diff --git a/theme/scarborough/pom.xml b/theme/scarborough/pom.xml
index 557777a..799a7d6 100644
--- a/theme/scarborough/pom.xml
+++ b/theme/scarborough/pom.xml
@@ -70,7 +70,7 @@
<!--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>-->
diff --git a/theme/standard/pom.xml b/theme/standard/pom.xml
index a58f598..4ee876a 100644
--- a/theme/standard/pom.xml
+++ b/theme/standard/pom.xml
@@ -14,7 +14,7 @@
<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>
diff --git a/tobago-tool/gendoc/pom.xml b/tobago-tool/gendoc/pom.xml
index 6a453c3..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/pom.xml b/tobago-tool/pom.xml
index f3d98f8..8014594 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/pom.xml
@@ -1,5 +1,5 @@
<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>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
@@ -14,4 +14,12 @@
<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 27c700d..10f4475 100644
--- a/tobago-tool/tobago-tool-apt/pom.xml
+++ b/tobago-tool/tobago-tool-apt/pom.xml
@@ -11,22 +11,6 @@
<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>
