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/07/16 11:12:59 UTC
svn commit: r794602 - in /myfaces/portlet-bridge/core/trunk_2.0.x: ./ api/
assembly/ examples/blank/pom.xml examples/demo/pom.xml impl/ pom.xml
Author: sobryan
Date: Thu Jul 16 09:12:58 2009
New Revision: 794602
URL: http://svn.apache.org/viewvc?rev=794602&view=rev
Log:
Build enhancements to build javadocs
Modified:
myfaces/portlet-bridge/core/trunk_2.0.x/ (props changed)
myfaces/portlet-bridge/core/trunk_2.0.x/api/ (props changed)
myfaces/portlet-bridge/core/trunk_2.0.x/assembly/ (props changed)
myfaces/portlet-bridge/core/trunk_2.0.x/examples/blank/pom.xml
myfaces/portlet-bridge/core/trunk_2.0.x/examples/demo/pom.xml
myfaces/portlet-bridge/core/trunk_2.0.x/impl/ (props changed)
myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml
Propchange: myfaces/portlet-bridge/core/trunk_2.0.x/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 16 09:12:58 2009
@@ -0,0 +1 @@
+target
Propchange: myfaces/portlet-bridge/core/trunk_2.0.x/api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 16 09:12:58 2009
@@ -0,0 +1 @@
+target
Propchange: myfaces/portlet-bridge/core/trunk_2.0.x/assembly/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 16 09:12:58 2009
@@ -0,0 +1 @@
+target
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/blank/pom.xml?rev=794602&r1=794601&r2=794602&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/blank/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/blank/pom.xml Thu Jul 16 09:12:58 2009
@@ -22,7 +22,7 @@
</dependency>
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
</dependency>
@@ -192,4 +192,4 @@
</properties>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/demo/pom.xml?rev=794602&r1=794601&r2=794602&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/demo/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/demo/pom.xml Thu Jul 16 09:12:58 2009
@@ -22,7 +22,7 @@
</dependency>
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
</dependency>
@@ -52,15 +52,39 @@
</build>
<profiles>
+ <profile>
+ <id>pluto-assemble</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warName>${pom.artifactId}-pluto-${pom.version}</warName>
+ <outputDirectory>${project.build.directory}/../../assembly/target/webapp</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!-- sets up the webapp for deployment to pluto "mvn clean install -Ppluto" -->
<profile>
<id>pluto</id>
<build>
<plugins>
<plugin>
- <groupId>org.apache.pluto</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.portals.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
- <version>1.1.4</version>
+ <version>2.0.0-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -99,19 +123,19 @@
</systemProperties>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <version>1.1.4</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>maven-pluto-plugin</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -192,4 +216,4 @@
</properties>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Propchange: myfaces/portlet-bridge/core/trunk_2.0.x/impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 16 09:12:58 2009
@@ -0,0 +1 @@
+target
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=794602&r1=794601&r2=794602&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml Thu Jul 16 09:12:58 2009
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -47,7 +47,7 @@
<jsfSpecVersion>1.2</jsfSpecVersion>
<specVersion>1.0</specVersion>
<jsrNumber>301</jsrNumber>
- <specLink>https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_JCP-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=portlet_2_0_bridge-ea-oth-JSpec@CDS-CDS_JCP</specLink>
+ <specLink>http://www.jcp.org/en/jsr/detail?id=${jsrNumber}</specLink>
<specName>Portlet ${portletSpecVersion} Bridge for JavaServer Faces ${jsfSpecVersion}</specName>
<projectSeries>2.x</projectSeries>
<jsf.version>1.2_03</jsf.version>
@@ -75,6 +75,7 @@
<modules>
<module>api</module>
<module>impl</module>
+ <module>examples</module>
</modules>
<!-- Versions and scope of dependencies -->