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 2009/01/10 00:54:46 UTC
svn commit: r733189 - in /myfaces/portlet-bridge/core/trunk_2.0.x:
README.txt api/pom.xml assembly/pom.xml impl/pom.xml pom.xml
Author: sobryan
Date: Fri Jan 9 15:54:45 2009
New Revision: 733189
URL: http://svn.apache.org/viewvc?rev=733189&view=rev
Log:
Changed the build files to more accurately reflect the same environment as the main trunk.
Removed:
myfaces/portlet-bridge/core/trunk_2.0.x/README.txt
Modified:
myfaces/portlet-bridge/core/trunk_2.0.x/api/pom.xml
myfaces/portlet-bridge/core/trunk_2.0.x/assembly/pom.xml
myfaces/portlet-bridge/core/trunk_2.0.x/impl/pom.xml
myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/api/pom.xml?rev=733189&r1=733188&r2=733189&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/api/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/api/pom.xml Fri Jan 9 15:54:45 2009
@@ -57,17 +57,47 @@
<build>
<plugins>
- <!-- Allows building of jdev projects (jdev:jdev target) -->
- <!-- TODO: This is an artifical dependancy on Trinidad, should it be removed? -->
+ <!-- This is for distribution of the APIDocs for the website. Must be run after the javadoc:javadoc target -->
<plugin>
- <groupId>org.apache.myfaces.trinidadbuild</groupId>
- <artifactId>maven-jdev-plugin</artifactId>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0.2</version>
+ <configuration>
+ <id>myfaces-nightly-builds</id>
+ <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/1.0/api/apidocs</url>
+ <inputDirectory>target/site/apidocs</inputDirectory>
+ </configuration>
</plugin>
+ <!-- Generates the Javadocs for the Website. Wagon will transport it -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <doctitle>MyFaces Portlet Bridge ${project.version} API</doctitle>
+ <windowtitle>MyFaces Portlet Bridge ${project.version} API</windowtitle>
+ <aggregate>false</aggregate>
+ <linksource>true</linksource>
+ <breakiterator>true</breakiterator>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <source>${jdk.version}</source>
+ <charset>UTF-8</charset>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/api</link>
+ <!--TODO: Find a better site to lonk to-->
+ <link>http://www.bluesunrise.com/portlet-api</link>
+ </links>
+ </configuration>
+ </plugin>
+ <!-- Allows building of jdev projects (jdev:jdev target) -->
+ <!-- TODO: This is an artifical dependancy on Trinidad, should it be removed? -->
+ <plugin>
+ <groupId>org.apache.myfaces.trinidadbuild</groupId>
+ <artifactId>maven-jdev-plugin</artifactId>
</plugin>
-
</plugins>
</build>
</project>
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/assembly/pom.xml?rev=733189&r1=733188&r2=733189&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/assembly/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/assembly/pom.xml Fri Jan 9 15:54:45 2009
@@ -30,22 +30,10 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
- <dependencies>
- <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>
- </dependencies>
-
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/dep.xml</descriptor>
@@ -60,63 +48,92 @@
<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>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-source</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-impl</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/src
- </outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
+
+ <!-- The project does nothing if dependencies are disabled. This helps with predeployment. -->
+ <profiles>
+ <profile>
+ <id>assemble</id>
+ <activation>
+ <property>
+ <name>!prepareRelease</name>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/impl/pom.xml?rev=733189&r1=733188&r2=733189&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/impl/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/impl/pom.xml Fri Jan 9 15:54:45 2009
@@ -72,9 +72,6 @@
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-jdev-plugin</artifactId>
</plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml?rev=733189&r1=733188&r2=733189&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml Fri Jan 9 15:54:45 2009
@@ -17,179 +17,231 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge</artifactId>
- <packaging>pom</packaging>
- <name>MyFaces Portlet Bridge 2.0</name>
- <version>2.0.0-SNAPSHOT</version>
- <inceptionYear>2007</inceptionYear>
- <description>
- Portlet Bridge for JavaServer Faces is a subproject of Apache MyFaces which provides an
- implementation of the standardized Portlet Bridge as outlined by JSR-301 and subsequent
- specifications. This project will work with MyFaces as well as the R.I. and intended to
- be used to develop the Portlet Bridge Reference Implementation.
- </description>
- <url>http://myfaces.apache.org/portlet-bridge/2.0</url>
-
- <parent>
- <artifactId>portlet-bridge-master-pom</artifactId>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <version>2</version>
- </parent>
-
- <!-- Added temporarily until I can get the Portlet 2.0 api in the Apache Repository -->
- <repositories>
- <repository>
- <id>JBOSS repository</id>
- <url>http://repository.jboss.com/maven2</url>
- </repository>
- </repositories>
-
- <properties>
- <jdk.version>1.5</jdk.version>
- <specName>Portlet 2.0 Bridge for JavaServer Faces 1.2</specName>
- <specVersion>1.0</specVersion>
- <projectSeries>2.0.x</projectSeries>
- </properties>
-
- <!-- issueManagement is in parent -->
- <!-- ciManagement are in parent -->
- <!-- mailingLists are in parent -->
- <!-- developers are in parent -->
- <!-- contributors are in parent -->
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/portlet-bridge/core/trunk_2.0.x</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/portlet-bridge/core/trunk_2.0.x</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/portlet-bridge/core/trunk_2.0.x</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>apache-site</id>
- <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/2.0</url>
- </site>
- </distributionManagement>
-
- <modules>
- <module>api</module>
- <module>impl</module>
- </modules>
-
- <!-- Versions and scope of dependencies -->
- <dependencyManagement>
- <dependencies>
- <!-- Servlet API -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- JSP API -->
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- J2EE Annotations -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Portlet API -->
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- MyFaces API -->
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.2.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.2.2</version>
- </dependency>
-
- <!-- JSF R.I. API -->
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <!-- As per spec, 1.2_03 is the minimum R.I. for version 1.0 bridge -->
- <version>1.2_03</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- JSF Portlet Bridge API -->
- <dependency>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- JSF Portlet Bridge Impl -->
- <dependency>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-impl</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>${specName}</Specification-Title>
- <Specification-Version>${specVersion}</Specification-Version>
- <Specification-Vendor>Java Community (JSR-301)</Specification-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <aggregate>false</aggregate>
- <linksource>true</linksource>
- <breakiterator>true</breakiterator>
- <quiet>true</quiet>
- <verbose>false</verbose>
- <source>${jdk.version}</source>
- <charset>UTF-8</charset>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/api</link>
- <link>http://portals.apache.org/pluto/multiproject/portlet-api/apidocs</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge</artifactId>
+ <packaging>pom</packaging>
+ <name>MyFaces Portlet Bridge</name>
+ <version>2.0.0-SNAPSHOT</version>
+ <inceptionYear>2007</inceptionYear>
+ <description>
+ Portlet Bridge for JavaServer Faces is a subproject of Apache MyFaces which provides an
+ implementation of the standardized Portlet Bridge as outlined by JSR-301 and subsequent
+ specifications. This project will work with MyFaces as well as the R.I. and intended to
+ be used to develop the Portlet Bridge Reference Implementation.
+ </description>
+
+ <url>http://myfaces.apache.org/portlet-bridge/2.0</url>
+
+ <parent>
+ <artifactId>portlet-bridge-master-pom</artifactId>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <version>2</version>
+ </parent>
+
+ <properties>
+ <specName>Portlet 2.0 Bridge for JavaServer Faces 1.2</specName>
+ <specVersion>1.0</specVersion>
+ <projectSeries>2.x</projectSeries>
+ <jsf.version>1.2_03</jsf.version>
+ </properties>
+
+ <!-- issueManagement is in parent -->
+ <!-- ciManagement are in parent -->
+ <!-- mailingLists are in parent -->
+ <!-- developers are in parent -->
+ <!-- contributors are in parent -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/portlet-bridge/core/trunk_2.0.x</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/portlet-bridge/core/trunk_2.0.x</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/portlet-bridge/core/trunk_2.0.x</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+ <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/2.0</url>
+ </site>
+ </distributionManagement>
+
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ </modules>
+
+ <!-- Versions and scope of dependencies -->
+ <dependencyManagement>
+ <dependencies>
+ <!-- Portlet API -->
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Servlet API -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JSP API -->
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- J2EE Annotations -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- MyFaces API -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.2.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- JSF R.I. API -->
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <!-- As per spec, 1.2_03 is the minimum R.I. for version 1.0 bridge -->
+ <version>${jsf.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Pluto 2.0 is not yet ready to embed into Jetty -->
+ <!-- Jetty Pluto Plugin -->
+ <!--dependency>
+ <groupId>com.bekk.boss</groupId>
+ <artifactId>maven-jetty-pluto-embedded</artifactId>
+ <version>2.0</version>
+ </dependency-->
+
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <!-- JSF Portlet Bridge API -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- JSF Portlet Bridge Impl -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>${specName}</Specification-Title>
+ <Specification-Version>${specVersion}</Specification-Version>
+ <Specification-Vendor>Java Community (JSR-301)</Specification-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <!-- This profile is invoked by -DprepareRelease=true. This allows mvn release:prepare to
+ run successfully on the assembly projects. -->
+ <profile>
+ <id>prepare-release</id>
+ <activation>
+ <property>
+ <name>prepareRelease</name>
+ </property>
+ </activation>
+ <modules>
+ <module>assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-DprepareRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>perform-release</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <modules>
+ <module>assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <id>getting-scm.revision</id>
+ <goals>
+ <goal>update</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>