You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2008/06/12 00:41:32 UTC
svn commit: r666878 [1/2] - in /myfaces/trinidad/trunk_1.2.x: ./
trinidad-api/ trinidad-assembly/ trinidad-build/ trinidad-examples/
trinidad-examples/trinidad-blank/ trinidad-examples/trinidad-demo/
trinidad-examples/trinidad-example-assembly/ trinida...
Author: sobryan
Date: Wed Jun 11 15:41:32 2008
New Revision: 666878
URL: http://svn.apache.org/viewvc?rev=666878&view=rev
Log:
TRINIDAD-1089: trinidad-demo.war does not run in non-J2EE container as distributed.
This is, essentially the requested enhancement + sterroids. :) Here is
what's changed:
1. All poms audited and properties added to ensure consistency of version
numbers.
2. Upped servlet version to 2.5
3. Added an includeJSF profile
4. Added an includeJSTL profile
5. Added an includeBridge profile
6. Cleaned up the prepareRelease profile so that assemblies can be run
as-is without the need for a performRelease. I also added the sandbox
so that it is versioned as part of the preparation process.
7. Cleaned up the performRelease profile and excluded the examples when
running under this profile
8. Restructured project to more correctly leverage parent poms
9. Reparented trinidad-blank and trinidad-demo projects to trinidad-example
10. Reparented trinidad-example-assembly to trinidad
I've documented the changes to the profiles and properties on this wiki:
http://wiki.apache.org/myfaces/Building_Trinidad_With_Maven
and I've updated the release documentation with the new procedures on
this wiki:
http://wiki.apache.org/myfaces/TrinidadReleaseProcedure
Enjoy.
Modified:
myfaces/trinidad/trunk_1.2.x/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-api/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-build/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-demo/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-impl/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-impl/src/main/java/org/apache/myfaces/trinidadinternal/sandbox/renderkit/core/xhtml/TableFormLayoutRenderer.java
Modified: myfaces/trinidad/trunk_1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/pom.xml Wed Jun 11 15:41:32 2008
@@ -21,6 +21,11 @@
<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>
+ <name>Apache MyFaces Trinidad 1.2</name>
+ <description>JSF 1.2 branch of Apache MyFaces Trinidad</description>
+ <url>http://myfaces.apache.org/trinidad/trinidad-1_2</url>
+ <inceptionYear>2001</inceptionYear>
+
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
@@ -29,11 +34,36 @@
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
- <packaging>pom</packaging>
- <name>Apache MyFaces Trinidad 1.2</name>
<version>1.2.9-SNAPSHOT</version>
- <description>JSF 1.2 branch of Apache MyFaces Trinidad</description>
- <url>http://myfaces.apache.org/trinidad/trinidad-1_2</url>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- Standards -->
+ <jdk.version>1.5</jdk.version>
+ <servlet.version>2.5</servlet.version>
+ <portlet.version>1.0</portlet.version>
+ <jsp.version>2.1</jsp.version>
+ <jstl.version>1.2</jstl.version>
+ <jsf-spec.version>1.2</jsf-spec.version>
+ <jsf-ri.version>1.2_07</jsf-ri.version>
+ <jsf-myfaces.version>1.2.2</jsf-myfaces.version>
+ <jsf-facelets.version>1.1.14</jsf-facelets.version>
+ <portlet-bridge.version>1.0.0-alpha-2</portlet-bridge.version>
+ <commons-lang.version>2.4</commons-lang.version>
+
+ <!-- Testing -->
+ <shale.version>1.0.4</shale.version>
+ <jmock.version>1.2.0</jmock.version>
+ <junit.version>4.4</junit.version>
+
+ <!-- Plugins -->
+ <trinidad-plugins.version>1.2.6</trinidad-plugins.version>
+ <wagon-plugin.version>1.0.6</wagon-plugin.version>
+ <jetty-plugin.version>6.1.7</jetty-plugin.version>
+
+ <!-- Other -->
+ <jdev.release>11.1.1.0.0</jdev.release>
+ </properties>
<issueManagement>
<system>jira</system>
@@ -53,9 +83,7 @@
</notifier>
</notifiers>
</ciManagement>
-
- <inceptionYear>2001</inceptionYear>
-
+
<mailingLists>
<mailingList>
<name>MyFaces Users (use [Trinidad] prefix)</name>
@@ -106,27 +134,214 @@
</mailingLists>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/trunk_1.2.x</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/trinidad/trunk_1.2.x</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/trinidad/trunk_1.2.x</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/tags/trinidad-1.2.8</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/trinidad/tags/trinidad-1.2.8</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/trinidad/tags/trinidad-1.2.8</url>
</scm>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.stage</id>
+ <name>Apache Stage Repository</name>
+ <url>http://people.apache.org/repo/m2-incubating-repository</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+ <name>Apache Website</name>
+ <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/trinidad/trinidad-1_2</url>
+ </site>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache-maven-snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${jsp.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>${portlet-bridge.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <!-- If the impl is needed, it should always be added in -->
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
+ <version>${portlet-bridge.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>${jsf-facelets.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-build</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>${shale.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>${jmock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <version>${jmock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <modules>
+ <module>trinidad-build</module>
+ <module>trinidad-api</module>
+ <module>trinidad-impl</module>
+ </modules>
+
<build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
<configuration>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
</plugin>
- <!-- To work around "No Java test frameworks found" problem with 2.2 -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
<inherited>true</inherited>
<configuration>
<!-- set the forkMode to "always" to validate new tests,
@@ -137,16 +352,32 @@
</plugin>
<plugin>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>${wagon-plugin.version}</version>
+ <inherited>true</inherited>
+ <configuration>
+ <id>myfaces-nightly-builds</id>
+ <url>scpexe://minotaur.apache.org/www/people.apache.org/builds/myfaces/nightly</url>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-xrts-plugin</artifactId>
<version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-faces-plugin</artifactId>
<version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
+ <configuration>
+ <force>true</force>
+ <jsfVersion>${jsf-spec.version}</jsfVersion>
+ </configuration>
</plugin>
<plugin>
@@ -154,6 +385,7 @@
<artifactId>maven-jdev-plugin</artifactId>
<version>${trinidad-plugins.version}</version>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-i18n-plugin</artifactId>
@@ -167,6 +399,7 @@
<version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-tagdoc-plugin</artifactId>
@@ -178,8 +411,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<!--
<showWarnings>true</showWarnings>
<compilerArgument>-Xlint:all,-serial,-fallthrough,-deprecation</compilerArgument>
@@ -192,7 +425,7 @@
<artifactId>maven-pmd-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>${jdk.version}</targetJdk>
</configuration>
</plugin>
@@ -205,21 +438,29 @@
</configuration>
</plugin>
- <!--plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
-
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>${jetty-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
+
<plugins>
+ <!-- is this right? -->
+ <plugin>
+ <groupId>org.apache.myfaces.trinidadbuild</groupId>
+ <artifactId>maven-xrts-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ <goal>generate-test-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.0-alpha-6</version>
@@ -241,41 +482,7 @@
</plugin>
</plugins>
</build>
-
- <modules>
- <module>trinidad-api</module>
- <module>trinidad-build</module>
- <module>trinidad-impl</module>
- <module>trinidad-examples</module>
- </modules>
-
- <repositories>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>apache.stage</id>
- <name>Apache Stage Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- <layout>default</layout>
- </pluginRepository>
- </pluginRepositories>
-
+
<reporting>
<plugins>
<plugin>
@@ -305,228 +512,74 @@
</rulesets>
<linkXref>true</linkXref>
<minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>{jdk.version}</targetJdk>
</configuration>
</plugin>
- <!--plugin>
- <inherited>false</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- <configuration>
- <category>web-framework</category>
- <language>Java</language>
- <shortdesc>Set of user interface components based on JSF.</shortdesc>
- <pmc>http://myfaces.apache.org</pmc>
- </configuration>
- </plugin-->
</plugins>
</reporting>
-<!-- I'm not having any luck getting checkstyle to actually
- pick up the checkstyle.xml from inside adf-faces-build,
- so let's just turn this off for now.
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>adf-faces/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
--->
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_07</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_07</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- <version>1.0.0-alpha</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.4</version>
- <scope>test</scope>
-
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.2.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- <version>1.2.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-build</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>${pom.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <!-- Use 2.1 so we have access to the EL APIs -->
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
-
-
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.14</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <distributionManagement>
- <site>
- <id>apache-site</id>
- <name>Apache Website</name>
- <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/trinidad/trinidad-1_2</url>
- </site>
- <snapshotRepository>
- <uniqueVersion>false</uniqueVersion>
- <id>apache-maven-snapshots</id>
- <name>Apache Maven Snapshot Repository</name>
- <url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
<profiles>
- <!-- This profile can be used for the release:prepare. It enables the assembly and examples
- projects but does not allow trinidad-assembly to compile -->
+ <!--
+ This profile builds the examples when NOT performing a release. Execute this profile
+ by making sure that there is no -DperformRelease property on the maven command. If
+ there is, it may manually be invoked by adding a -PbuildExamples.
+ -->
<profile>
- <id>prepare-release</id>
+ <id>buildExamples</id>
+ <activation>
+ <property>
+ <name>!performRelease</name>
+ </property>
+ </activation>
+
<modules>
- <module>trinidad-assembly</module>
<module>trinidad-examples</module>
</modules>
- <properties>
- <dependencies.disable>true</dependencies.disable>
- </properties>
</profile>
+ <!--
+ This profile is for preparing a release. Execute this profile like this:
+
+ mvn release:prepare -DprepareRelease=true
+ -->
<profile>
- <id>release</id>
- <!--
- NOTE: Execute this profile like
- mvn clean source:jar install deploy -DaltDeploymentRepository=matzew::default::file://FOLDER -Prelease
- -->
+ <id>prepare-release</id>
+
+ <activation>
+ <property>
+ <name>prepareRelease</name>
+ </property>
+ </activation>
+
<modules>
<module>trinidad-assembly</module>
- <module>trinidad-examples</module>
+ <module>trinidad-sandbox</module>
</modules>
+ </profile>
+
+ <!--
+ This profile is for building the release artifacts for review. Execute this profile
+ like this:
+
+ mvn clean source:jar install deploy -DaltDeploymentRepository=matzew::default::file://FOLDER -PperformRelease=true
+
+ Issuing this command will also perform the "sign-artifacts" profile from the master pom.
+ -->
+ <profile>
+ <id>release</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <configuration>
+ <excludePackageNames>org.apache.myfaces.trinidadinternal.*</excludePackageNames>
+ </configuration>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -536,6 +589,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
@@ -552,12 +606,118 @@
</plugins>
</build>
</profile>
+
+ <!--
+ This profile enables asserts in the surefire tests. Do not use this with Maven 2.0.6 or
+ you will get an error. Execute this profile like this:
+
+ mvn install -PenableAssert
+ -->
+ <profile>
+ <id>enableAssert</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <forkMode>once</forkMode>
+ <argLine>-enableassertions</argLine>
+ <parallel>false</parallel>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
+ <!--
+ This marks the JSF libraries for inclusion into the example projects. Execute this profile
+ like this:
+
+ mvn install -PincludeJSF
+ -->
+ <profile>
+ <id>includeJSF</id>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+
+ <!--
+ This marks the JSTL libraries for inclusion into the example projects. Execute this profile
+ like this:
+
+ mvn install -PincludeJSTL
+ -->
+ <profile>
+ <id>includeJSTL</id>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+
+ <!--
+ This marks the Bridge libraries for inclusion into the example projects. Execute this profile
+ like this:
+
+ mvn install -PincludeBridge
+ -->
+ <profile>
+ <id>includeBridge</id>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>${portlet-bridge.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
+ <version>${portlet-bridge.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
</profiles>
-
- <properties>
- <trinidad-plugins.version>1.2.6</trinidad-plugins.version>
- <myfaces.version>1.2.2</myfaces.version>
- <jdev.release>11.1.1.0.0</jdev.release>
- </properties>
-
</project>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml Wed Jun 11 15:41:32 2008
@@ -19,26 +19,83 @@
-->
<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>
+
+ <name>Apache MyFaces Trinidad API</name>
+ <description>Public API for the Apache MyFaces Trinidad project</description>
+
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
<version>1.2.9-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache MyFaces Trinidad API</name>
- <description>Public API for the Apache MyFaces Trinidad project</description>
-
<artifactId>trinidad-api</artifactId>
<packaging>jar</packaging>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-build</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope> <!-- force provided scope here -->
+ </dependency>
+
+ <!-- "test" scope dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-jdev-plugin</artifactId>
- <version>1.2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -59,10 +116,10 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-xrts-plugin</artifactId>
- <!-- TODO: move up to parent after MNG-985 is resolved -->
<executions>
<execution>
<goals>
@@ -72,6 +129,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
@@ -79,15 +137,9 @@
</configuration>
</plugin>
- <!-- TODO: remove once issue MNG-237 is resolved -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
-<!-- Uncomment the following to run with assertions; however,
- do not do so with maven 2.0.6, as you get a LinkageError
- <argLine>-enableassertions</argLine>
- <forkMode>once</forkMode>
--->
<includes implementation="java.util.ArrayList">
<include implementation="java.lang.String">**/*Test.java</include>
</includes>
@@ -100,7 +152,7 @@
<configuration>
<typePrefix>org.apache</typePrefix>
<packageContains>org.apache</packageContains>
- <jsfVersion>1.2</jsfVersion>
+ <jsfVersion>#{jsf-spec.version}</jsfVersion>
<!--suppressListenerMethods>true</suppressListenerMethods-->
<force>true</force>
</configuration>
@@ -132,78 +184,16 @@
</plugins>
</build>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-build</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
-
- <!-- "test" scope dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-tagdoc-plugin</artifactId>
- <version>1.2.3</version>
<configuration>
<taglibs>
<tr>http://myfaces.apache.org/trinidad</tr>
@@ -229,16 +219,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
-<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
--->
+
</plugins>
</reporting>
</project>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-assembly/pom.xml Wed Jun 11 15:41:32 2008
@@ -19,8 +19,7 @@
-->
<modelVersion>4.0.0</modelVersion>
- <artifactId>trinidad-assembly</artifactId>
- <packaging>pom</packaging>
+
<name>Apache MyFaces Trinidad Assembly</name>
<description>This is the Apache MyFaces Trinidad Assembly</description>
@@ -29,12 +28,14 @@
<artifactId>trinidad</artifactId>
<version>1.2.9-SNAPSHOT</version>
</parent>
+
+ <artifactId>trinidad-assembly</artifactId>
+ <packaging>pom</packaging>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0.1</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/dep.xml</descriptor>
@@ -46,13 +47,11 @@
</configuration>
</plugin>
+ <!-- todo: what does this do and how is it activated? -->
<plugin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>wagon-maven-plugin</artifactId>
- <version>1.0.1</version>
<configuration>
- <id>myfaces-nightly-builds</id>
- <url>scpexe://minotaur.apache.org/www/people.apache.org/builds/myfaces/nightly</url>
<inputDirectory>target/assembly/out</inputDirectory>
</configuration>
</plugin>
@@ -61,7 +60,58 @@
<profiles>
<profile>
- <id>release</id>
+ <id>assemble</id>
+ <activation>
+ <property>
+ <name>!prepareRelease</name>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-build</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -121,68 +171,6 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-build</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!--dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-demo</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
- </dependencies>
</profile>
</profiles>
</project>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/pom.xml Wed Jun 11 15:41:32 2008
@@ -19,17 +19,17 @@
-->
<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>
+
+ <name>Apache MyFaces Trinidad Build</name>
+ <description>Apache MyFaces Trinidad Build</description>
+
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
<version>1.2.9-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache MyFaces Trinidad Build</name>
- <description>Apache MyFaces Trinidad Build</description>
-
<artifactId>trinidad-build</artifactId>
<packaging>jar</packaging>
@@ -42,8 +42,6 @@
<excludes>
<exclude>**/includes/**</exclude>
</excludes>
- <force>true</force>
- <jsfVersion>1.2</jsfVersion>
</configuration>
<executions>
<execution>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/pom.xml Wed Jun 11 15:41:32 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,49 +18,180 @@
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>
+
+ <name>Apache MyFaces Trinidad Examples</name>
+ <description>Parent project for the Trinidad Example Projects</description>
+
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
<version>1.2.9-SNAPSHOT</version>
</parent>
- <packaging>pom</packaging>
- <name>Apache MyFaces Trinidad Examples</name>
+
<artifactId>trinidad-example</artifactId>
+ <packaging>pom</packaging>
-<!-- TODO: enter proper values for this on the 1.2 branch
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/tags/trinidad-1.0.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/myfaces/trinidad/tags/trinidad-1.0.1</developerConnection>
- </scm>
- -->
-
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>apache-maven-snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </repository>
+ </repositories>
+
+ <!-- Project dependencies -->
+ <dependencies>
+ <!-- Apache Trinidad -->
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>trinidad-blank</module>
<module>trinidad-demo</module>
</modules>
-
-
<profiles>
+ <!--
+ This profile is for preparing a release. Execute this profile like this:
+
+ mvn release:prepare -DprepareRelease=true
+ -->
<profile>
- <id>prepare-release</id>
- <modules>
- <module>trinidad-blank</module>
- <module>trinidad-demo</module>
- <module>trinidad-example-assembly</module>
- </modules>
- <properties>
- <dependencies.disable>true</dependencies.disable>
- </properties>
+ <id>prepare-release</id>
+ <activation>
+ <property>
+ <name>prepareRelease</name>
+ </property>
+ </activation>
+ <modules>
+ <module>trinidad-example-assembly</module>
+ </modules>
</profile>
+
+ <profile>
+ <id>jettyConfig</id>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+
+
+ <!--
+ This profile activates MyFaces as the release to use for these demos. By default
+ MyFaces is used when these examples are run in Jetty and/or used with the -PincludeJSF
+ flag. To invoke this profile, simply do not include a -Djsf= property on your maven
+ command line. Execute this profile like this:
+
+ mvn -PjettyConfig jetty:run
+ -->
+ <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>
+
+ <!--
+ This profile activates the JSF RI as the release to use for these demos. When activated
+ the JSF RI is used when these examples are run in Jetty and/or used with the
+ -PincludeJSF flag. To invoke this profile, simply do include a -Djsf=ri property on
+ your maven command line. Execute this profile like this:
+
+ mvn -PjettyConfig -Djsf=ri jetty:run
+ -->
<profile>
- <id>release</id>
- <modules>
- <module>trinidad-blank</module>
- <module>trinidad-demo</module>
- <module>trinidad-example-assembly</module>
- </modules>
+ <id>jsfri</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>
+ </dependencies>
</profile>
</profiles>
</project>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-blank/pom.xml Wed Jun 11 15:41:32 2008
@@ -18,123 +18,42 @@
under the License.
-->
- <parent>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad</artifactId>
- <version>1.2.9-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<name>Apache MyFaces Trinidad Blank Demo</name>
<description>Apache MyFaces Trinidad Blank Demo</description>
+ <parent>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-example</artifactId>
+ <version>1.2.9-SNAPSHOT</version>
+ </parent>
+
<artifactId>trinidad-blank</artifactId>
<packaging>war</packaging>
<!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
<profiles>
- <profile>
- <id>jettyConfig</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.0</version>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8181</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
+ <profile>
+ <id>jettyConfig</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8181</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
<scanIntervalSeconds>2</scanIntervalSeconds>
- </configuration>
- </plugin>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
- <dependencies>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <pluginRepositories>
- <!-- Repository to get the jetty plugin -->
- <pluginRepository>
- <id>mortbay-repo</id>
- <name>mortbay-repo</name>
- <url>http://www.mortbay.org/maven2/snapshot</url>
- </pluginRepository>
- </pluginRepositories>
-
</profile>
</profiles>
-
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-maven-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </repository>
- </repositories>
-
- <!-- Project dependencies -->
- <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>
-
- <!-- Apache Trinidad -->
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
</project>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml Wed Jun 11 15:41:32 2008
@@ -18,52 +18,26 @@
under the License.
-->
- <parent>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad</artifactId>
- <version>1.2.9-SNAPSHOT</version>
- </parent>
-
<modelVersion>4.0.0</modelVersion>
<name>Apache MyFaces Trinidad Demo</name>
<description>Apache MyFaces Trinidad Demo</description>
+ <parent>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-example</artifactId>
+ <version>1.2.9-SNAPSHOT</version>
+ </parent>
+
<artifactId>trinidad-demo</artifactId>
<packaging>war</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.trinidadbuild</groupId>
- <artifactId>maven-jdev-plugin</artifactId>
- <version>1.2.3</version>
- <configuration>
- <libraries>
- <library>JSP Runtime</library>
- </libraries>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>${pom.version}</version>
- </dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
@@ -73,11 +47,22 @@
</dependency>
<dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
-<!-- Dependencies pulled in via myfaces/ri pom
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+
+ <!-- For SourceCodeServlet -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <!-- Dependencies pulled in via myfaces core pom
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -105,26 +90,22 @@
<version>2.1</version>
<scope>runtime</scope>
</dependency>
--->
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
-
- <!-- For SourceCodeServlet -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
- </dependency>
+ -->
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.trinidadbuild</groupId>
+ <artifactId>maven-jdev-plugin</artifactId>
+ <configuration>
+ <libraries>
+ <library>JSP Runtime</library>
+ </libraries>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
@@ -134,7 +115,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.7</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
@@ -142,68 +122,6 @@
</plugins>
</build>
</profile>
-
- <!-- By default the war examples use myfaces! :) -->
- <profile>
- <id>myfaces</id>
- <activation>
- <property>
- <name>!jsf</name>
- </property>
- </activation>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
- <profile>
- <id>jsfri</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_07</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_07</version>
- <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>
-
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
- </profile>
</profiles>
</project>
\ No newline at end of file
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml Wed Jun 11 15:41:32 2008
@@ -20,17 +20,19 @@
-->
<modelVersion>4.0.0</modelVersion>
- <artifactId>trinidad-example-assembly</artifactId>
- <packaging>pom</packaging>
+
<name>Apache MyFaces Trinidad Example Assembly</name>
<description>This is the Apache MyFaces Trinidad Example Assembly</description>
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-example</artifactId>
+ <artifactId>trinidad</artifactId>
<version>1.2.9-SNAPSHOT</version>
</parent>
+ <artifactId>trinidad-example-assembly</artifactId>
+ <packaging>pom</packaging>
+
<build>
<plugins>
<plugin>
@@ -58,9 +60,15 @@
</plugins>
</build>
+
<profiles>
<profile>
- <id>release</id>
+ <id>assemble</id>
+ <activation>
+ <property>
+ <name>!prepareRelease</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml Wed Jun 11 15:41:32 2008
@@ -19,26 +19,108 @@
-->
<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>
+
+ <name>Apache MyFaces Trinidad Impl</name>
+ <description>Private implementation of the Apache MyFaces Trinidad project</description>
+
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
<version>1.2.9-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache MyFaces Trinidad Impl</name>
- <description>Private implementation of the Apache MyFaces Trinidad project</description>
-
<artifactId>trinidad-impl</artifactId>
<packaging>jar</packaging>
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-build</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope> <!-- force provided scope here -->
+ </dependency>
+
+ <!-- "test" scope dependencies -->
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-jdev-plugin</artifactId>
- <version>1.2.3</version>
<configuration>
<sourceRoots>
<sourceRoot>src/main/java-templates/</sourceRoot>
@@ -51,11 +133,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
-<!-- Uncomment the following to run with assertions; however,
- do not do so with maven 2.0.6, as you get a LinkageError
- <argLine>-enableassertions</argLine>
- <forkMode>once</forkMode>
--->
<systemProperties>
<!-- Trinidad currently fails proper HTML ID validity,
and rather badly - so turn that test off -->
@@ -127,7 +204,7 @@
<renderKitPrefix>org.apache</renderKitPrefix>
<packageContains>org.apache</packageContains>
<removeRenderers>true</removeRenderers>
- <jsfVersion>1.2</jsfVersion>
+ <jsfVersion>${jsf-spec.version}</jsfVersion>
<force>true</force>
</configuration>
<executions>
@@ -188,96 +265,7 @@
</plugin>
</plugins>
</build>
-
- <dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-build</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
-
- <!-- "test" scope dependencies -->
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </dependency>
-
- </dependencies>
-
+
<reporting>
<plugins>
<plugin>
@@ -288,7 +276,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>{jdk.version}</targetJdk>
</configuration>
</plugin>
</plugins>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/pom.xml Wed Jun 11 15:41:32 2008
@@ -19,27 +19,20 @@
-->
<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">
- <parent>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad</artifactId>
- <version>1.2.8-SNAPSHOT</version>
- </parent>
-
<modelVersion>4.0.0</modelVersion>
<name>Apache MyFaces Trinidad Sandbox</name>
<description>Sandbox for the Apache MyFaces Trinidad project</description>
+ <parent>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad</artifactId>
+ <version>1.2.9-SNAPSHOT</version>
+ </parent>
+
<artifactId>trinidad-sandbox</artifactId>
<packaging>pom</packaging>
- <modules>
- <module>sandbox-build</module>
- <module>sandbox-api</module>
- <module>sandbox-impl</module>
- <module>sandbox-demo</module>
- </modules>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -68,8 +61,13 @@
<artifactId>sandbox-impl</artifactId>
<version>${pom.version}</version>
</dependency>
-
</dependencies>
</dependencyManagement>
+ <modules>
+ <module>sandbox-build</module>
+ <module>sandbox-api</module>
+ <module>sandbox-impl</module>
+ <module>sandbox-demo</module>
+ </modules>
</project>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-api/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-api/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-api/pom.xml Wed Jun 11 15:41:32 2008
@@ -19,26 +19,87 @@
-->
<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>
+
+ <name>Apache MyFaces Trinidad Sandbox API</name>
+ <description>Public Sandbox API for the Apache MyFaces Trinidad project</description>
+
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-sandbox</artifactId>
<version>1.2.9-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache MyFaces Trinidad Sandbox API</name>
- <description>Public Sandbox API for the Apache MyFaces Trinidad project</description>
-
<artifactId>sandbox-api</artifactId>
<packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>sandbox-build</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope> <!-- force provided scope here -->
+ </dependency>
+
+ <!-- "test" scope dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-jdev-plugin</artifactId>
- <version>1.2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -83,11 +144,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
-<!-- Uncomment the following to run with assertions; however,
- do not do so with maven 2.0.6, as you get a LinkageError
- <argLine>-enableassertions</argLine>
- <forkMode>once</forkMode>
--->
<includes implementation="java.util.ArrayList">
<include implementation="java.lang.String">**/*Test.java</include>
</includes>
@@ -131,72 +187,7 @@
</plugins>
</build>
- <dependencies>
-
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>sandbox-build</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
-
- <!-- "test" scope dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
<reporting>
<plugins>
@@ -207,7 +198,6 @@
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-tagdoc-plugin</artifactId>
- <version>1.2.3</version>
<configuration>
<taglibs>
<tr>http://myfaces.apache.org/trinidad</tr>
@@ -234,15 +224,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>${jdk.version}</targetJdk>
</configuration>
</plugin>
-<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
--->
</plugins>
</reporting>
</project>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-build/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-build/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-build/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-build/pom.xml Wed Jun 11 15:41:32 2008
@@ -19,17 +19,17 @@
-->
<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>
+
+ <name>Apache MyFaces Trinidad Sandbox Build</name>
+ <description>Apache MyFaces Trinidad Sandbox Build</description>
+
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-sandbox</artifactId>
<version>1.2.9-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache MyFaces Trinidad Sandbox Build</name>
- <description>Apache MyFaces Trinidad Sandbox Build</description>
-
<artifactId>sandbox-build</artifactId>
<packaging>jar</packaging>
@@ -43,7 +43,7 @@
<exclude>**/includes/**</exclude>
</excludes>
<force>true</force>
- <jsfVersion>1.2</jsfVersion>
+ <jsfVersion>${jsf-spec.version}</jsfVersion>
</configuration>
<executions>
<execution>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-demo/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-demo/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-demo/pom.xml Wed Jun 11 15:41:32 2008
@@ -33,48 +33,34 @@
<artifactId>sandbox-demo</artifactId>
<packaging>war</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.trinidadbuild</groupId>
- <artifactId>maven-jdev-plugin</artifactId>
- <version>1.2.3</version>
- <configuration>
- <libraries>
- <library>JSP Runtime</library>
- </libraries>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <!-- Project dependencies -->
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <!-- Apache Trinidad -->
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-impl</artifactId>
- <version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>sandbox-api</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>sandbox-impl</artifactId>
- <version>${pom.version}</version>
</dependency>
-
-
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
@@ -90,76 +76,100 @@
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
- <scope>runtime</scope>
</dependency>
-<!-- Dependencies pulled in via myfaces/ri pom
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.6</version>
- <scope>runtime</scope>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
</dependency>
-
+
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.5</version>
- <scope>runtime</scope>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- <scope>runtime</scope>
- </dependency>
--->
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<!-- For SourceCodeServlet -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
</dependency>
- </dependencies>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.trinidadbuild</groupId>
+ <artifactId>maven-jdev-plugin</artifactId>
+ <configuration>
+ <libraries>
+ <library>JSP Runtime</library>
+ </libraries>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
- <profile>
- <id>jettyConfig</id>
+ <profile>
+ <id>jettyConfig</id>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.2rc0</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- By default the war examples use myfaces! :) -->
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ This profile activates MyFaces as the release to use for these demos. By default
+ MyFaces is used when these examples are run in Jetty and/or used with the -PincludeJSF
+ flag. To invoke this profile, simply do not include a -Djsf= property on your maven
+ command line. Execute this profile like this:
+
+ mvn -PjettyConfig jetty:run
+ -->
<profile>
<id>myfaces</id>
<activation>
@@ -168,22 +178,25 @@
</property>
</activation>
<dependencies>
-
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
- <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
+ <!--
+ This profile activates the JSF RI as the release to use for these demos. When activated
+ the JSF RI is used when these examples are run in Jetty and/or used with the
+ -PincludeJSF flag. To invoke this profile, simply do include a -Djsf=ri property on
+ your maven command line. Execute this profile like this:
+
+ mvn -PjettyConfig -Djsf=ri jetty:run
+ -->
<profile>
<id>jsfri</id>
<activation>
@@ -196,28 +209,12 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
</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>
-
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
+ </dependencies>
</profile>
</profiles>
-
</project>