myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfreed...@apache.org
Subject svn commit: r1071846 [1/4] - in /myfaces/portlet-bridge/core/branches/2.0.0-branch: ./ api/ api/src/main/resources/META-INF/ assembly/ assembly/src/main/resources/META-INF/ examples/ examples/assembly/ examples/blank/ examples/carstore/ examples/facele...
Date Fri, 18 Feb 2011 00:29:56 GMT
Author: mfreedman
Date: Fri Feb 18 00:29:55 2011
New Revision: 1071846

URL: http://svn.apache.org/viewvc?rev=1071846&view=rev
Log:
Merges of changes from Trunk versions: 1071817, 1068499, 1063461.  All changes from the 2.0 freeze (1/12/11 to 2/17/11).

Modified:
    myfaces/portlet-bridge/core/branches/2.0.0-branch/   (props changed)
    myfaces/portlet-bridge/core/branches/2.0.0-branch/api/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/api/src/main/resources/META-INF/NOTICE   (props changed)
    myfaces/portlet-bridge/core/branches/2.0.0-branch/assembly/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/assembly/src/main/resources/META-INF/NOTICE   (props changed)
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/assembly/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/blank/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/carstore/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/facelets-guess/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/guessNumber/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/guessNumberMojarraFilter/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/guessNumberMojarra_v04_to_v07_Wrapper/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/guessNumberMyFacesFilter/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/helloDuke/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/helloDukeCoordination/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/pom.xml
    myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
    myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletFacesContextImpl.java
    myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java
    myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/java/org/apache/myfaces/portlet/faces/util/URLUtils.java
    myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/resources/META-INF/NOTICE   (props changed)
    myfaces/portlet-bridge/core/branches/2.0.0-branch/pom.xml

Propchange: myfaces/portlet-bridge/core/branches/2.0.0-branch/
------------------------------------------------------------------------------
    svn:mergeinfo = /myfaces/portlet-bridge/core/trunk_2.0.x:1063461-1071817

Modified: myfaces/portlet-bridge/core/branches/2.0.0-branch/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/2.0.0-branch/api/pom.xml?rev=1071846&r1=1071845&r2=1071846&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/2.0.0-branch/api/pom.xml (original)
+++ myfaces/portlet-bridge/core/branches/2.0.0-branch/api/pom.xml Fri Feb 18 00:29:55 2011
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <name>MyFaces Portlet Bridge API</name>
-  <artifactId>portlet-bridge-api</artifactId>
-  <packaging>jar</packaging>
-
-  <parent>
-    <groupId>org.apache.myfaces.portlet-bridge</groupId>
-    <artifactId>portlet-bridge</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
-  </parent>
-      
-  <distributionManagement>
-    <site>
-      <id>apache-site</id>
-      <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/2.0/api</url>
-    </site>
-  </distributionManagement>
-  
-  <dependencies>
-    <dependency>
-      <artifactId>servlet-api</artifactId>
-      <groupId>javax.servlet</groupId>
-    </dependency>
-
-    <dependency>
-      <artifactId>portlet-api</artifactId>
-      <groupId>javax.portlet</groupId>
-    </dependency>
-    
-    <dependency>
-      <artifactId>jsp-api</artifactId>
-      <groupId>javax.servlet.jsp</groupId>
-    </dependency>
-    
-    <dependency>
-      <artifactId>jsf-api</artifactId>
-      <groupId>javax.faces</groupId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- This is for distribution of the APIDocs for the website.  Must be run after the javadoc:javadoc target -->
-      <plugin>
-        <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/2.0/api/apidocs</url>
-            <inputDirectory>target/site/apidocs</inputDirectory>
-          </configuration>
-      </plugin>
-      
-      <!-- Generates the Javadocs for the Website.  Wagon will transport it -->
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <doctitle>MyFaces Portlet Bridge ${project.version} API</doctitle>
-          <windowtitle>MyFaces Portlet Bridge ${project.version} API</windowtitle>
-       </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> 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <name>MyFaces Portlet Bridge API</name>
+  <artifactId>portlet-bridge-api</artifactId>
+  <packaging>jar</packaging>
+
+  <parent>
+    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+    <artifactId>portlet-bridge</artifactId>
+    <version>2.0.0.1-PATCH</version>
+  </parent>
+      
+  <distributionManagement>
+    <site>
+      <id>apache-site</id>
+      <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/2.0/api</url>
+    </site>
+  </distributionManagement>
+  
+  <dependencies>
+    <dependency>
+      <artifactId>servlet-api</artifactId>
+      <groupId>javax.servlet</groupId>
+    </dependency>
+
+    <dependency>
+      <artifactId>portlet-api</artifactId>
+      <groupId>javax.portlet</groupId>
+    </dependency>
+    
+    <dependency>
+      <artifactId>jsp-api</artifactId>
+      <groupId>javax.servlet.jsp</groupId>
+    </dependency>
+    
+    <dependency>
+      <artifactId>jsf-api</artifactId>
+      <groupId>javax.faces</groupId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- This is for distribution of the APIDocs for the website.  Must be run after the javadoc:javadoc target -->
+      <plugin>
+        <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/2.0/api/apidocs</url>
+            <inputDirectory>target/site/apidocs</inputDirectory>
+          </configuration>
+      </plugin>
+      
+      <!-- Generates the Javadocs for the Website.  Wagon will transport it -->
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <doctitle>MyFaces Portlet Bridge ${project.version} API</doctitle>
+          <windowtitle>MyFaces Portlet Bridge ${project.version} API</windowtitle>
+       </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> 

Propchange: myfaces/portlet-bridge/core/branches/2.0.0-branch/api/src/main/resources/META-INF/NOTICE
            ('svn:mergeinfo' removed)

Modified: myfaces/portlet-bridge/core/branches/2.0.0-branch/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/2.0.0-branch/assembly/pom.xml?rev=1071846&r1=1071845&r2=1071846&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/2.0.0-branch/assembly/pom.xml (original)
+++ myfaces/portlet-bridge/core/branches/2.0.0-branch/assembly/pom.xml Fri Feb 18 00:29:55 2011
@@ -1,139 +1,139 @@
-<?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>
-  <artifactId>portlet-bridge-assembly</artifactId>
-  <packaging>pom</packaging>
-  <name>MyFaces Portlet Bridge Assembly</name>
-  <description>This is the Apache MyFaces Portlet-Bridge Assembly</description>
-
-  <parent>
-    <groupId>org.apache.myfaces.portlet-bridge</groupId>
-    <artifactId>portlet-bridge</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
-  </parent>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/dep.xml</descriptor>
-            <descriptor>src/main/assembly/src-all.xml</descriptor>
-          </descriptors>
-          <finalName>portlet-bridge-${version}</finalName>
-          <outputDirectory>target/assembly/out</outputDirectory>
-          <workDirectory>target/assembly/work</workDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.myfaces.maven</groupId>
-        <artifactId>wagon-maven-plugin</artifactId>
-        <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>
-    </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>
+<?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>
+  <artifactId>portlet-bridge-assembly</artifactId>
+  <packaging>pom</packaging>
+  <name>MyFaces Portlet Bridge Assembly</name>
+  <description>This is the Apache MyFaces Portlet-Bridge Assembly</description>
+
+  <parent>
+    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+    <artifactId>portlet-bridge</artifactId>
+    <version>2.0.0.1-PATCH</version>
+  </parent>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/dep.xml</descriptor>
+            <descriptor>src/main/assembly/src-all.xml</descriptor>
+          </descriptors>
+          <finalName>portlet-bridge-${version}</finalName>
+          <outputDirectory>target/assembly/out</outputDirectory>
+          <workDirectory>target/assembly/work</workDirectory>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.myfaces.maven</groupId>
+        <artifactId>wagon-maven-plugin</artifactId>
+        <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>
+    </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>

Propchange: myfaces/portlet-bridge/core/branches/2.0.0-branch/assembly/src/main/resources/META-INF/NOTICE
            ('svn:mergeinfo' removed)

Modified: myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/assembly/pom.xml?rev=1071846&r1=1071845&r2=1071846&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/assembly/pom.xml (original)
+++ myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/assembly/pom.xml Fri Feb 18 00:29:55 2011
@@ -1,212 +1,212 @@
-<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
-    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.
-	   
--->
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>portlet-bridge-example-assembly</artifactId>
-  <packaging>pom</packaging>
-  <name>MyFaces Portlet Bridge Example Assembly</name>
-  <description>This is the MyFaces Portlet Bridge Example Assembly</description>
-
-  <parent>
-    <groupId>org.apache.myfaces.portlet-bridge</groupId>
-    <artifactId>portlet-bridge</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
-  </parent>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptor>src/main/assembly/dep.xml</descriptor>
-          <finalName>portlet-bridge-${version}</finalName>
-          <outputDirectory>target/assembly/out</outputDirectory>
-          <workDirectory>target/assembly/work</workDirectory>
-        </configuration>
-      </plugin>
-
-      <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>
-    </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>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>dependency-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-example</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-blank</artifactId>
-                      <version>${project.version}</version>
-                      <type>war</type>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-helloDuke</artifactId>
-                      <version>${project.version}</version>
-                      <type>war</type>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-helloDukeCoordination</artifactId>
-                      <version>${project.version}</version>
-                      <type>war</type>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-guessNumber-jsp</artifactId>
-                      <version>${project.version}</version>
-                      <type>war</type>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-facelets-guess</artifactId>
-                      <version>${project.version}</version>
-                      <type>war</type>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-carstore</artifactId>
-                      <version>${project.version}</version>
-                      <type>war</type>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-guessNumber-jsp-mojarraFilter</artifactId>
-                      <version>${project.version}</version>
-                      <type>war</type>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-guessNumber-jsp-mojarra_v04_to_v07_Wrapper</artifactId>
-                      <version>${project.version}</version>
-                      <type>war</type>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-guessNumber-jsp-myFacesFilter</artifactId>
-                      <version>${project.version}</version>
-                      <type>war</type>
-                    </artifactItem>
-                  </artifactItems>
-                  <outputDirectory>${project.build.directory}/webapp</outputDirectory>
-                </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-blank</artifactId>
-                      <version>${project.version}</version>
-                      <classifier>sources</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-helloDuke</artifactId>
-                      <version>${project.version}</version>
-                      <classifier>sources</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-helloDukeCoordination</artifactId>
-                      <version>${project.version}</version>
-                      <classifier>sources</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-guessNumber-jsp</artifactId>
-                      <version>${project.version}</version>
-                      <classifier>sources</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-facelets-guess</artifactId>
-                      <version>${project.version}</version>
-                      <classifier>sources</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-carstore</artifactId>
-                      <version>${project.version}</version>
-                      <classifier>sources</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-guessNumber-jsp-mojarraFilter</artifactId>
-                      <version>${project.version}</version>
-                      <classifier>sources</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-guessNumber-jsp-mojarra_v04_to_v07_Wrapper</artifactId>
-                      <version>${project.version}</version>
-                      <classifier>sources</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>portlet-bridge-guessNumber-jsp-myFacesFilter</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>
+<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
+    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.
+	   
+-->
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>portlet-bridge-example-assembly</artifactId>
+  <packaging>pom</packaging>
+  <name>MyFaces Portlet Bridge Example Assembly</name>
+  <description>This is the MyFaces Portlet Bridge Example Assembly</description>
+
+  <parent>
+    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+    <artifactId>portlet-bridge</artifactId>
+    <version>2.0.0.1-PATCH</version>
+  </parent>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptor>src/main/assembly/dep.xml</descriptor>
+          <finalName>portlet-bridge-${version}</finalName>
+          <outputDirectory>target/assembly/out</outputDirectory>
+          <workDirectory>target/assembly/work</workDirectory>
+        </configuration>
+      </plugin>
+
+      <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>
+    </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>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>dependency-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-example</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-blank</artifactId>
+                      <version>${project.version}</version>
+                      <type>war</type>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-helloDuke</artifactId>
+                      <version>${project.version}</version>
+                      <type>war</type>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-helloDukeCoordination</artifactId>
+                      <version>${project.version}</version>
+                      <type>war</type>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-guessNumber-jsp</artifactId>
+                      <version>${project.version}</version>
+                      <type>war</type>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-facelets-guess</artifactId>
+                      <version>${project.version}</version>
+                      <type>war</type>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-carstore</artifactId>
+                      <version>${project.version}</version>
+                      <type>war</type>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-guessNumber-jsp-mojarraFilter</artifactId>
+                      <version>${project.version}</version>
+                      <type>war</type>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-guessNumber-jsp-mojarra_v04_to_v07_Wrapper</artifactId>
+                      <version>${project.version}</version>
+                      <type>war</type>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-guessNumber-jsp-myFacesFilter</artifactId>
+                      <version>${project.version}</version>
+                      <type>war</type>
+                    </artifactItem>
+                  </artifactItems>
+                  <outputDirectory>${project.build.directory}/webapp</outputDirectory>
+                </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-blank</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>sources</classifier>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-helloDuke</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>sources</classifier>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-helloDukeCoordination</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>sources</classifier>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-guessNumber-jsp</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>sources</classifier>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-facelets-guess</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>sources</classifier>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-carstore</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>sources</classifier>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-guessNumber-jsp-mojarraFilter</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>sources</classifier>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-guessNumber-jsp-mojarra_v04_to_v07_Wrapper</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>sources</classifier>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>portlet-bridge-guessNumber-jsp-myFacesFilter</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/branches/2.0.0-branch/examples/blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/blank/pom.xml?rev=1071846&r1=1071845&r2=1071846&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/blank/pom.xml (original)
+++ myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/blank/pom.xml Fri Feb 18 00:29:55 2011
@@ -1,233 +1,233 @@
-<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>MyFaces Portlet Bridge Blank Project</name>
-  <artifactId>portlet-bridge-blank</artifactId>
-  <packaging>war</packaging>
-
-  <parent>
-    <groupId>org.apache.myfaces.portlet-bridge</groupId>
-    <artifactId>portlet-bridge-examples</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
-  </parent>
-  
-  <dependencies>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-    </dependency>
-        
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>portlet-bridge-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>portlet-bridge-impl</artifactId>
-    </dependency>
-  </dependencies>
-    
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jdev-plugin</artifactId>
-        <groupId>org.apache.myfaces.trinidadbuild</groupId>
-        <configuration>
-          <libraries>
-            <library>JSP Runtime</library>
-          </libraries>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <profiles>
-    <!-- sets up the webapp for deployment to pluto 2.0  "mvn clean install -Ppluto" -->    
-    <profile>
-      <id>pluto</id>
-      <build>
-        <plugins>
-          <plugin>
-            <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>2.0.0</version>
-            <executions>  
-              <execution>  
-                <phase>generate-resources</phase>  
-                <goals>  
-                  <goal>assemble</goal>  
-                </goals>  
-              </execution>  
-            </executions>  
-          </plugin>  
-        </plugins>
-      </build>
-    </profile>
-
-<!-- sets up the webapp for deployment to pluto 2.0 (this is included as its the command in 1.0 for building to 2 - i.e. backwards compat) "mvn clean install -Ppluto2" -->    
-    <profile>
-      <id>pluto2</id>
-      <build>
-        <plugins>
-          <plugin>
-            <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>2.0.0</version>
-            <executions>  
-              <execution>  
-                <phase>generate-resources</phase>  
-                <goals>  
-                  <goal>assemble</goal>  
-                </goals>  
-              </execution>  
-            </executions>  
-          </plugin>  
-        </plugins>
-      </build>
-    </profile>
-    
-    <!-- To run jetty, issue "mvn clean -PjettyConfig jetty:run" -->
-    <profile>
-      <id>jettyConfig</id>
-		<dependencies>
-        <dependency>
-          <groupId>com.bekk.boss</groupId>
-          <artifactId>maven-jetty-pluto-embedded</artifactId>
-        </dependency>
-		</dependencies>
-		<build>      
-      <plugins>
-        <plugin>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>maven-jetty-plugin</artifactId>
-          <configuration>
-            <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-            <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
-            <systemProperties>
-              <systemProperty>
-                <name>org.apache.pluto.embedded.portletId</name>
-                <value>portlet-bridge-blank</value>
-              </systemProperty>
-            </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>  
-      </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>
-        </dependency>
-
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-impl</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <!-- To use the examples using the Sun's JSF Reference Implementation: mvn clean install -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>
-        </dependency>
-      </dependencies>
-      <properties>
-        <jsf_implementation>JSF-RI</jsf_implementation>
-      </properties>
-    </profile>
-    
-    <profile>
-      <id>jsfri-provided</id>
-      <activation>
-        <property>
-          <name>jsf</name>
-          <value>ri-provided</value>
-        </property>
-      </activation>
-
-      <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>
-      <dependencies>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
-          <scope>compile</scope>
-        </dependency>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-impl</artifactId>
-          <version>${jsf.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
-      <properties>
-        <jsf_implementation>JSF-RI</jsf_implementation>
-      </properties>
-    </profile>
-  </profiles>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <name>MyFaces Portlet Bridge Blank Project</name>
+  <artifactId>portlet-bridge-blank</artifactId>
+  <packaging>war</packaging>
+
+  <parent>
+    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+    <artifactId>portlet-bridge-examples</artifactId>
+    <version>2.0.0.1-PATCH</version>
+  </parent>
+  
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.portlet</groupId>
+      <artifactId>portlet-api</artifactId>
+    </dependency>
+        
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>portlet-bridge-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>portlet-bridge-impl</artifactId>
+    </dependency>
+  </dependencies>
+    
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jdev-plugin</artifactId>
+        <groupId>org.apache.myfaces.trinidadbuild</groupId>
+        <configuration>
+          <libraries>
+            <library>JSP Runtime</library>
+          </libraries>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <!-- sets up the webapp for deployment to pluto 2.0  "mvn clean install -Ppluto" -->    
+    <profile>
+      <id>pluto</id>
+      <build>
+        <plugins>
+          <plugin>
+            <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>2.0.0</version>
+            <executions>  
+              <execution>  
+                <phase>generate-resources</phase>  
+                <goals>  
+                  <goal>assemble</goal>  
+                </goals>  
+              </execution>  
+            </executions>  
+          </plugin>  
+        </plugins>
+      </build>
+    </profile>
+
+<!-- sets up the webapp for deployment to pluto 2.0 (this is included as its the command in 1.0 for building to 2 - i.e. backwards compat) "mvn clean install -Ppluto2" -->    
+    <profile>
+      <id>pluto2</id>
+      <build>
+        <plugins>
+          <plugin>
+            <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>2.0.0</version>
+            <executions>  
+              <execution>  
+                <phase>generate-resources</phase>  
+                <goals>  
+                  <goal>assemble</goal>  
+                </goals>  
+              </execution>  
+            </executions>  
+          </plugin>  
+        </plugins>
+      </build>
+    </profile>
+    
+    <!-- To run jetty, issue "mvn clean -PjettyConfig jetty:run" -->
+    <profile>
+      <id>jettyConfig</id>
+		<dependencies>
+        <dependency>
+          <groupId>com.bekk.boss</groupId>
+          <artifactId>maven-jetty-pluto-embedded</artifactId>
+        </dependency>
+		</dependencies>
+		<build>      
+      <plugins>
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <configuration>
+            <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+            <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
+            <systemProperties>
+              <systemProperty>
+                <name>org.apache.pluto.embedded.portletId</name>
+                <value>portlet-bridge-blank</value>
+              </systemProperty>
+            </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>  
+      </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>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-impl</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <!-- To use the examples using the Sun's JSF Reference Implementation: mvn clean install -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>
+        </dependency>
+      </dependencies>
+      <properties>
+        <jsf_implementation>JSF-RI</jsf_implementation>
+      </properties>
+    </profile>
+    
+    <profile>
+      <id>jsfri-provided</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>ri-provided</value>
+        </property>
+      </activation>
+
+      <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>
+      <dependencies>
+        <dependency>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-api</artifactId>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-impl</artifactId>
+          <version>${jsf.version}</version>
+          <scope>runtime</scope>
+        </dependency>
+      </dependencies>
+      <properties>
+        <jsf_implementation>JSF-RI</jsf_implementation>
+      </properties>
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file

Modified: myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/carstore/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/carstore/pom.xml?rev=1071846&r1=1071845&r2=1071846&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/carstore/pom.xml (original)
+++ myfaces/portlet-bridge/core/branches/2.0.0-branch/examples/carstore/pom.xml Fri Feb 18 00:29:55 2011
@@ -1,281 +1,281 @@
-<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>MyFaces Portlet Bridge CarStore Demo</name>
-  <artifactId>portlet-bridge-carstore</artifactId>
-  <packaging>war</packaging>
-
-  <parent>
-    <groupId>org.apache.myfaces.portlet-bridge</groupId>
-    <artifactId>portlet-bridge-examples</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
-  </parent>
-  
-  <dependencies>
-    <!-- Blueprints -->
-    <dependency>
-      <groupId>com.sun.javaee.blueprints</groupId>
-      <artifactId>bp-ui-simple</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>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-    </dependency>
-        
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>portlet-bridge-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>portlet-bridge-impl</artifactId>
-    </dependency>
-
-  </dependencies>
-    
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jdev-plugin</artifactId>
-        <groupId>org.apache.myfaces.trinidadbuild</groupId>
-        <configuration>
-          <libraries>
-            <library>JSP Runtime</library>
-          </libraries>
-        </configuration>
-      </plugin>
-    </plugins>
-  </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 2.0  "mvn clean install -Ppluto" -->    
-    <profile>
-      <id>pluto</id>
-      <build>
-        <plugins>
-          <plugin>
-            <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>2.0.0</version>
-            <executions>  
-              <execution>  
-                <phase>generate-resources</phase>  
-                <goals>  
-                  <goal>assemble</goal>  
-                </goals>  
-              </execution>  
-            </executions>  
-          </plugin>  
-        </plugins>
-      </build>
-    </profile>
-
-<!-- sets up the webapp for deployment to pluto 2.0 (this is included as its the command in 1.0 for building to 2 - i.e. backwards compat) "mvn clean install -Ppluto2" -->    
-    <profile>
-      <id>pluto2</id>
-      <build>
-        <plugins>
-          <plugin>
-            <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>2.0.0</version>
-            <executions>  
-              <execution>  
-                <phase>generate-resources</phase>  
-                <goals>  
-                  <goal>assemble</goal>  
-                </goals>  
-              </execution>  
-            </executions>  
-          </plugin>  
-        </plugins>
-      </build>
-    </profile>
-    
-    <!-- To run jetty, issue "mvn clean -PjettyConfig jetty:run" -->
-    <profile>
-      <id>jettyConfig</id>
-		<dependencies>
-        <dependency>
-          <groupId>com.bekk.boss</groupId>
-          <artifactId>maven-jetty-pluto-embedded</artifactId>
-        </dependency>
-		</dependencies>
-		<build>      
-      <plugins>
-        <plugin>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>maven-jetty-plugin</artifactId>
-          <configuration>
-            <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-            <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
-            <systemProperties>
-              <systemProperty>
-                <name>org.apache.pluto.embedded.portletIds</name>
-                <value>portlet-bridge-carstore</value>
-              </systemProperty>
-            </systemProperties>
-
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.pluto</groupId>
-          <artifactId>maven-pluto-plugin</artifactId>
-        </plugin>  
-      </plugins>
-      </build>  
-    </profile>
-  
-
-   <!-- By default the war examples uses mojarra and packages for a nonjavaee environment (includes the Faces jars)! :) -->
-
-    <!-- If you are running in a nonJavaEE environment (i.e. Faces isn't already deployed) and hence need to have Mojarra packaged in the war: -->
-    <profile>
-      <id>mojarra-nonjavaee</id>
-      <activation>
-        <property>
-          <name>!jsf</name>
-        </property>
-      </activation>
-
-      <dependencies>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
-	    <version>${mojarra.version}</version>
-          <scope>compile</scope>
-        </dependency>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-impl</artifactId>
-          <version>${mojarra.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
-      <properties>
-        <jsf_implementation>JSF-RI</jsf_implementation>
-      </properties>
-    </profile>
-
-    <!-- If you are running in a JavaEE environment (i.e. Faces is already deployed) and hence don't need to have Mojarra packaged in the war: -->
-    <!--    mvn install -Djsf=mojarra-javaee -->
-    <profile>
-      <id>mojarra-javaee</id>
-      <activation>
-        <property>
-          <name>jsf</name>
-          <value>mojarra-javaee</value>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
-        </dependency>
-      </dependencies>
-      <properties>
-        <jsf_implementation>JSF-RI</jsf_implementation>
-      </properties>
-    </profile>
-
-
-    <!-- To use this examples using the MyFacesImplementation: mvn clean install -Djsf=myfaces-javaee -->
-    <!-- Note: currently carstore doesn't work properly in a myfaces environment -->
-    <profile>
-      <id>myfaces-javaee</id>
-      <activation>
-        <property>
-          <name>jsf</name>
-          <value>myfaces-javaee</value>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-api</artifactId>
-	    <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-impl</artifactId>
-          <scope>provided</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-   
-
-
-    <!-- If you are running in a nonJavaEE environment (i.e. Faces isn't already deployed) and hence need to have MyFaces packaged in the war: -->
-    <!--    mvn install -Djsf=myfaces-nonjavaee -->
-    <!-- Note: currently carstore doesn't work properly in a myfaces environment -->
-    <profile>
-      <id>myfaces-nonjavaee</id>
-      <activation>
-        <property>
-          <name>jsf</name>
-          <value>myfaces-nonjavaee</value>
-        </property>
-      </activation>
-
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-api</artifactId>
-	    <version>${myfaces.version}</version>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-impl</artifactId>
-          <version>${myfaces.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <name>MyFaces Portlet Bridge CarStore Demo</name>
+  <artifactId>portlet-bridge-carstore</artifactId>
+  <packaging>war</packaging>
+
+  <parent>
+    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+    <artifactId>portlet-bridge-examples</artifactId>
+    <version>2.0.0.1-PATCH</version>
+  </parent>
+  
+  <dependencies>
+    <!-- Blueprints -->
+    <dependency>
+      <groupId>com.sun.javaee.blueprints</groupId>
+      <artifactId>bp-ui-simple</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>javax.portlet</groupId>
+      <artifactId>portlet-api</artifactId>
+    </dependency>
+        
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>portlet-bridge-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>portlet-bridge-impl</artifactId>
+    </dependency>
+
+  </dependencies>
+    
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jdev-plugin</artifactId>
+        <groupId>org.apache.myfaces.trinidadbuild</groupId>
+        <configuration>
+          <libraries>
+            <library>JSP Runtime</library>
+          </libraries>
+        </configuration>
+      </plugin>
+    </plugins>
+  </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 2.0  "mvn clean install -Ppluto" -->    
+    <profile>
+      <id>pluto</id>
+      <build>
+        <plugins>
+          <plugin>
+            <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>2.0.0</version>
+            <executions>  
+              <execution>  
+                <phase>generate-resources</phase>  
+                <goals>  
+                  <goal>assemble</goal>  
+                </goals>  
+              </execution>  
+            </executions>  
+          </plugin>  
+        </plugins>
+      </build>
+    </profile>
+
+<!-- sets up the webapp for deployment to pluto 2.0 (this is included as its the command in 1.0 for building to 2 - i.e. backwards compat) "mvn clean install -Ppluto2" -->    
+    <profile>
+      <id>pluto2</id>
+      <build>
+        <plugins>
+          <plugin>
+            <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>2.0.0</version>
+            <executions>  
+              <execution>  
+                <phase>generate-resources</phase>  
+                <goals>  
+                  <goal>assemble</goal>  
+                </goals>  
+              </execution>  
+            </executions>  
+          </plugin>  
+        </plugins>
+      </build>
+    </profile>
+    
+    <!-- To run jetty, issue "mvn clean -PjettyConfig jetty:run" -->
+    <profile>
+      <id>jettyConfig</id>
+		<dependencies>
+        <dependency>
+          <groupId>com.bekk.boss</groupId>
+          <artifactId>maven-jetty-pluto-embedded</artifactId>
+        </dependency>
+		</dependencies>
+		<build>      
+      <plugins>
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <configuration>
+            <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+            <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
+            <systemProperties>
+              <systemProperty>
+                <name>org.apache.pluto.embedded.portletIds</name>
+                <value>portlet-bridge-carstore</value>
+              </systemProperty>
+            </systemProperties>
+
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>maven-pluto-plugin</artifactId>
+        </plugin>  
+      </plugins>
+      </build>  
+    </profile>
+  
+
+   <!-- By default the war examples uses mojarra and packages for a nonjavaee environment (includes the Faces jars)! :) -->
+
+    <!-- If you are running in a nonJavaEE environment (i.e. Faces isn't already deployed) and hence need to have Mojarra packaged in the war: -->
+    <profile>
+      <id>mojarra-nonjavaee</id>
+      <activation>
+        <property>
+          <name>!jsf</name>
+        </property>
+      </activation>
+
+      <dependencies>
+        <dependency>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-api</artifactId>
+	    <version>${mojarra.version}</version>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-impl</artifactId>
+          <version>${mojarra.version}</version>
+          <scope>runtime</scope>
+        </dependency>
+      </dependencies>
+      <properties>
+        <jsf_implementation>JSF-RI</jsf_implementation>
+      </properties>
+    </profile>
+
+    <!-- If you are running in a JavaEE environment (i.e. Faces is already deployed) and hence don't need to have Mojarra packaged in the war: -->
+    <!--    mvn install -Djsf=mojarra-javaee -->
+    <profile>
+      <id>mojarra-javaee</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-javaee</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-api</artifactId>
+        </dependency>
+      </dependencies>
+      <properties>
+        <jsf_implementation>JSF-RI</jsf_implementation>
+      </properties>
+    </profile>
+
+
+    <!-- To use this examples using the MyFacesImplementation: mvn clean install -Djsf=myfaces-javaee -->
+    <!-- Note: currently carstore doesn't work properly in a myfaces environment -->
+    <profile>
+      <id>myfaces-javaee</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-javaee</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-api</artifactId>
+	    <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-impl</artifactId>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+   
+
+
+    <!-- If you are running in a nonJavaEE environment (i.e. Faces isn't already deployed) and hence need to have MyFaces packaged in the war: -->
+    <!--    mvn install -Djsf=myfaces-nonjavaee -->
+    <!-- Note: currently carstore doesn't work properly in a myfaces environment -->
+    <profile>
+      <id>myfaces-nonjavaee</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-nonjavaee</value>
+        </property>
+      </activation>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-api</artifactId>
+	    <version>${myfaces.version}</version>
+          <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-impl</artifactId>
+          <version>${myfaces.version}</version>
+          <scope>runtime</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+</project>



Mime
View raw message