You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/06/18 22:20:49 UTC
svn commit: r415193 - in /myfaces/tobago/trunk: ./ core/
core/src/main/java/org/apache/myfaces/tobago/renderkit/
example/addressbook/ example/addressbook/src/main/webapp/WEB-INF/
example/blank/ example/demo/ example/facelets/ example/foreach/ example/n...
Author: bommel
Date: Sun Jun 18 13:20:48 2006
New Revision: 415193
URL: http://svn.apache.org/viewvc?rev=415193&view=rev
Log:
extend the examples to switch between myfaces and ri
Modified:
myfaces/tobago/trunk/core/pom.xml
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java
myfaces/tobago/trunk/example/addressbook/pom.xml
myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/trunk/example/blank/pom.xml
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/facelets/pom.xml
myfaces/tobago/trunk/example/foreach/pom.xml
myfaces/tobago/trunk/example/nonfacesrequest/pom.xml
myfaces/tobago/trunk/example/test/pom.xml
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/theme/scarborough/pom.xml
myfaces/tobago/trunk/theme/speyside/pom.xml
myfaces/tobago/trunk/theme/standard/pom.xml
Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Sun Jun 18 13:20:48 2006
@@ -74,12 +74,10 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
-
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
-
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
@@ -90,34 +88,29 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
-
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
<dependency>
<groupId>fop</groupId>
<artifactId>fop</artifactId>
<version>0.20.5</version>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
-
<!-- XXX not transitive from fop -->
<dependency>
<groupId>avalon-framework</groupId>
@@ -125,62 +118,23 @@
<version>20020627</version>
<!-- XXX wrong date -->
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tobago-tool-apt</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
-
- <!--<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.1_02</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.1_02</version>
- <scope>compile</scope>
- </dependency>-->
-
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- </dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -188,15 +142,6 @@
</dependencies>
- <!--<repositories>
- <repository>
- <id>java-net</id>
- <name>java.net Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
--->
<profiles>
<!-- Mac OS X has not a tools.jar! -->
<profile>
@@ -320,12 +265,6 @@
</build>
</profile>
<profile>
-
-<!--
-
- mvn install:install-file -Dfile=retrotranslator-runtime-1.0.4.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
- mvn install:install-file -Dfile=retrotranslator-transformer-1.0.4.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
-
<id>jdk14retro</id>
<build>
<plugins>
@@ -338,7 +277,8 @@
<goal>translate</goal>
</goals>
<configuration>
- <verify>true</verify>
+ <verbose>true</verbose>
+ <stripsign>true</stripsign>
</configuration>
</execution>
</executions>
@@ -351,7 +291,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+ <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
</configuration>
</execution>
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java Sun Jun 18 13:20:48 2006
@@ -61,7 +61,6 @@
StateManager.SerializedView serializedview) throws IOException {
ResponseWriter responseWriter = facescontext.getResponseWriter();
Object treeStruct = serializedview.getStructure();
- System.err.print("State " + treeStruct);
Object compStates = serializedview.getState();
if (treeStruct != null) {
Modified: myfaces/tobago/trunk/example/addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/pom.xml Sun Jun 18 13:20:48 2006
@@ -69,13 +69,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -95,20 +95,16 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</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>
@@ -124,10 +120,6 @@
<groupId>myfaces</groupId>
<artifactId>myfaces-jsf-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -136,6 +128,71 @@
<version>1.1.2</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
</dependencies>
-
+ <profiles>
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sunjsf</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/web.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/web.xml Sun Jun 18 13:20:48 2006
@@ -23,6 +23,16 @@
<display-name>A simple addressbook demo with Tobago</display-name>
+ <filter>
+ <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>
+ </filter-mapping>
+
<!-- workaround for a bug in Oracle AS (e.g. 10.1.2.0.0)-->
<listener>
<listener-class>org.apache.myfaces.tobago.webapp.TobagoServletContextListener</listener-class>
Modified: myfaces/tobago/trunk/example/blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/blank/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/blank/pom.xml (original)
+++ myfaces/tobago/trunk/example/blank/pom.xml Sun Jun 18 13:20:48 2006
@@ -81,5 +81,83 @@
<version>2.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>-->
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sunjsf</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Sun Jun 18 13:20:48 2006
@@ -105,4 +105,56 @@
<!--</dependency>-->
</dependencies>
+ <profiles>
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sunjsf</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/example/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/facelets/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/example/facelets/pom.xml Sun Jun 18 13:20:48 2006
@@ -96,4 +96,56 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sunjsf</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/example/foreach/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/foreach/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/foreach/pom.xml (original)
+++ myfaces/tobago/trunk/example/foreach/pom.xml Sun Jun 18 13:20:48 2006
@@ -84,4 +84,56 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sunjsf</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/example/nonfacesrequest/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/nonfacesrequest/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/nonfacesrequest/pom.xml (original)
+++ myfaces/tobago/trunk/example/nonfacesrequest/pom.xml Sun Jun 18 13:20:48 2006
@@ -77,4 +77,56 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sunjsf</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/example/test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/pom.xml (original)
+++ myfaces/tobago/trunk/example/test/pom.xml Sun Jun 18 13:20:48 2006
@@ -88,6 +88,21 @@
<version>2.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
<!--dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -102,4 +117,56 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sunjsf</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Sun Jun 18 13:20:48 2006
@@ -1,498 +1,512 @@
-<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.8-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>
- <type>mail</type>
- <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 Wessendorf</name>
- <organization>Oracle Deutschland GmbH, 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>cobertura-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <configuration>
- <tags>
- <tag>TODO</tag>
- <tag> FIXME</tag>
- <tag>XXX</tag>
- <tag>@deprecated</tag>
- </tags>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>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>
- <!--<aggregate>true</aggregate>-->
- <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.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-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>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <minSeverity>info</minSeverity>
- </configuration>
- </plugin>
-
- <!-- pmd has problems with annotations -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- <ruleset>/rulesets/imports.xml</ruleset>
- <!--<ruleset>/rulesets/design.xml/SimplifyBooleanReturnsRule</ruleset>
- <ruleset>/rulesets/design.xml/SimplifyBooleanExpressions</ruleset>
- <ruleset>/rulesets/design.xml/AvoidReassigningParametersRule</ruleset>
- <ruleset>/rulesets/design.xml/FinalFieldCouldBeStatic</ruleset>
- <ruleset>/rulesets/design.xml/BooleanInstantiation</ruleset>
- <ruleset>/rulesets/design.xml/NonStaticInitializer</ruleset>
- <ruleset>/rulesets/design.xml/DefaultLabelNotLastInSwitchStmt</ruleset>
- <ruleset>/rulesets/design.xml/OptimizableToArrayCallRule</ruleset>
- <ruleset>/rulesets/coupling.xml/LooseCouplingRule</ruleset>-->
- </rulesets>
- <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>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <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>
- </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>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </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.snapshots</id>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
- </repository>
- </repositories>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>clean</id>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <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 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.8-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>
+ <type>mail</type>
+ <!--sendOnSuccess>true</sendOnSuccess-->
+ <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 Wessendorf</name>
+ <organization>Oracle Deutschland GmbH, 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>cobertura-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <configuration>
+ <tags>
+ <tag>TODO</tag>
+ <tag> FIXME</tag>
+ <tag>XXX</tag>
+ <tag>@deprecated</tag>
+ </tags>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>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>
+ <!--<aggregate>true</aggregate>-->
+ <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.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-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>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <minSeverity>info</minSeverity>
+ </configuration>
+ </plugin>
+
+ <!-- pmd has problems with annotations -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/unusedcode.xml</ruleset>
+ <ruleset>/rulesets/imports.xml</ruleset>
+ <!--<ruleset>/rulesets/design.xml/SimplifyBooleanReturnsRule</ruleset>
+ <ruleset>/rulesets/design.xml/SimplifyBooleanExpressions</ruleset>
+ <ruleset>/rulesets/design.xml/AvoidReassigningParametersRule</ruleset>
+ <ruleset>/rulesets/design.xml/FinalFieldCouldBeStatic</ruleset>
+ <ruleset>/rulesets/design.xml/BooleanInstantiation</ruleset>
+ <ruleset>/rulesets/design.xml/NonStaticInitializer</ruleset>
+ <ruleset>/rulesets/design.xml/DefaultLabelNotLastInSwitchStmt</ruleset>
+ <ruleset>/rulesets/design.xml/OptimizableToArrayCallRule</ruleset>
+ <ruleset>/rulesets/coupling.xml/LooseCouplingRule</ruleset>-->
+ </rulesets>
+ <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>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.0</version>
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${sunjsf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${sunjsf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </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.snapshots</id>
+ <url>http://people.apache.org/maven-snapshot-repository</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <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.4-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>
+ <properties>
+ <myfaces.version>1.1.2</myfaces.version>
+ <sunjsf.version>1.1_02</sunjsf.version>
+ </properties>
</project>
Modified: myfaces/tobago/trunk/theme/scarborough/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/theme/scarborough/pom.xml Sun Jun 18 13:20:48 2006
@@ -31,6 +31,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-standard</artifactId>
<version>${project.version}</version>
@@ -63,10 +68,6 @@
</dependencies>
<profiles>
<profile>
- <!--
- mvn install:install-file -Dfile=retrotranslator-runtime-1.0.4.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.4 -Dpackaging=jar
- mvn install:install-file -Dfile=retrotranslator-transformer-1.0.4.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.4 -Dpackaging=jar
- -->
<id>jdk14retro</id>
<build>
<plugins>
Modified: myfaces/tobago/trunk/theme/speyside/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/pom.xml (original)
+++ myfaces/tobago/trunk/theme/speyside/pom.xml Sun Jun 18 13:20:48 2006
@@ -17,6 +17,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
<version>${project.version}</version>
@@ -40,10 +45,6 @@
<profiles>
<profile>
- <!--
- mvn install:install-file -Dfile=retrotranslator-runtime-1.0.4.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.4 -Dpackaging=jar
- mvn install:install-file -Dfile=retrotranslator-transformer-1.0.4.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.4 -Dpackaging=jar
- -->
<id>jdk14retro</id>
<build>
<plugins>
Modified: myfaces/tobago/trunk/theme/standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/pom.xml?rev=415193&r1=415192&r2=415193&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/pom.xml (original)
+++ myfaces/tobago/trunk/theme/standard/pom.xml Sun Jun 18 13:20:48 2006
@@ -17,6 +17,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
@@ -36,10 +41,6 @@
<profiles>
<profile>
- <!--
-mvn install:install-file -Dfile=retrotranslator-runtime-1.0.4.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.4 -Dpackaging=jar
-mvn install:install-file -Dfile=retrotranslator-transformer-1.0.4.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.4 -Dpackaging=jar
- -->
<id>jdk14retro</id>
<build>
<plugins>