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 2007/11/21 19:59:59 UTC

svn commit: r597182 - in /myfaces/portlet-bridge/trunk: api/pom.xml impl/pom.xml impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java pom.xml

Author: sobryan
Date: Wed Nov 21 10:59:58 2007
New Revision: 597182

URL: http://svn.apache.org/viewvc?rev=597182&view=rev
Log:
PORTLETBRIDGE-13 Switch to new MyFaces Master POM
* Reparented master POM
* Updated version of JDEV plugin in api and impl
* Added Mike Freedman as a contributor
* Added Simon Lessard as a developer
* Fixed a runtime issue in PortletExternalContextImpl associated with 
  the JDK 1.5 updates...  My bad... 

Modified:
    myfaces/portlet-bridge/trunk/api/pom.xml
    myfaces/portlet-bridge/trunk/impl/pom.xml
    myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
    myfaces/portlet-bridge/trunk/pom.xml

Modified: myfaces/portlet-bridge/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/trunk/api/pom.xml?rev=597182&r1=597181&r2=597182&view=diff
==============================================================================
--- myfaces/portlet-bridge/trunk/api/pom.xml (original)
+++ myfaces/portlet-bridge/trunk/api/pom.xml Wed Nov 21 10:59:58 2007
@@ -54,7 +54,7 @@
       <plugin>
         <groupId>org.apache.myfaces.trinidadbuild</groupId>
         <artifactId>maven-jdev-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>1.2.3</version>
       </plugin>
 
       <!-- Build and sign jars (http://maven.apache.org/plugins/maven-jar-plugin/)-->

Modified: myfaces/portlet-bridge/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/trunk/impl/pom.xml?rev=597182&r1=597181&r2=597182&view=diff
==============================================================================
--- myfaces/portlet-bridge/trunk/impl/pom.xml (original)
+++ myfaces/portlet-bridge/trunk/impl/pom.xml Wed Nov 21 10:59:58 2007
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.myfaces.trinidadbuild</groupId>
         <artifactId>maven-jdev-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>1.2.3</version>
       </plugin>
 
       <!-- Build and sign jars (http://maven.apache.org/plugins/maven-jar-plugin/)-->

Modified: myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java?rev=597182&r1=597181&r2=597182&view=diff
==============================================================================
--- myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java (original)
+++ myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java Wed Nov 21 10:59:58 2007
@@ -33,7 +33,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.Vector;
 
 import javax.faces.FacesException;
 import javax.faces.application.ViewHandler;
@@ -147,7 +146,7 @@
     
     // Now reverse engineer the servlet paths from the mappings 
     // So Faces thinks was a client request
-    mFacesMappings = (Vector<String>) mPortletRequest.getAttribute(FACES_MAPPING_ATTRIBUTE);
+    mFacesMappings = (List<String>) mPortletRequest.getAttribute(FACES_MAPPING_ATTRIBUTE);
     mapPathsFromViewId(mViewId, mFacesMappings);
 
 

Modified: myfaces/portlet-bridge/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/trunk/pom.xml?rev=597182&r1=597181&r2=597182&view=diff
==============================================================================
--- myfaces/portlet-bridge/trunk/pom.xml (original)
+++ myfaces/portlet-bridge/trunk/pom.xml Wed Nov 21 10:59:58 2007
@@ -22,58 +22,32 @@
 <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>
   <parent>
-    <artifactId>myfaces-master</artifactId>
-    <groupId>org.apache.myfaces.maven</groupId>
-    <version>1.0.5</version>
+    <artifactId>myfaces</artifactId>
+    <groupId>org.apache.myfaces</groupId>
+    <version>3</version>
   </parent>
 
   <groupId>org.apache.myfaces.portlet-bridge</groupId>
   <artifactId>portlet-bridge</artifactId>
   <packaging>pom</packaging>
   <name>Portlet Bridge for JavaServer Faces</name>
-  <url>http://myfaces.apache.org/portlet-bridge</url>
-  <inceptionYear>2007</inceptionYear>
   <version>1.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</url>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/portlet-bridge/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/portlet-bridge/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/portlet-bridge/trunk</url>
-  </scm>
   <issueManagement>
     <system>jira</system>
     <url>http://issues.apache.org/jira/browse/PORTLETBRIDGE</url>
   </issueManagement>
 
-  <distributionManagement>
-    <repository>
-      <id>apache-maven</id>
-      <name>Apache Maven Repository</name>
-      <url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-    </repository>
-    <snapshotRepository>
-      <uniqueVersion>false</uniqueVersion>
-      <id>apache-maven-snapshots</id>
-      <name>Apache Maven Snapshot Repository</name>
-      <url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-    </snapshotRepository>
-    <site>
-      <id>apache-site</id>
-      <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/</url>
-    </site>
-  </distributionManagement>
-
-  <modules>
-    <module>api</module>
-    <module>impl</module>
-  </modules>
+  <!-- ciManagement are in parent -->
+  <!-- mailingLists are in parent -->
 
   <developers>
     <developer>
@@ -95,7 +69,6 @@
       <email>martin.marinschek@gmail.com</email>
       <roles>
         <role>Expert Group Member</role>
-        <role>Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
@@ -107,12 +80,50 @@
       <organizationUrl>http://jboss.org/jbossBlog/blog/Stan%20Silvert/</organizationUrl>
       <roles>
         <role>Expert Group Member</role>
-        <role>Committer</role>
       </roles>
       <timezone />
     </developer>
+    <developer>
+      <id>slessard</id>
+      <name>Simon Lessard</name>
+      <email>slessard@apache.org</email>
+      <organization>Fujitsu Consulting</organization>
+      <organizationUrl>http://www.dmrconseil.ca/</organizationUrl>
+      <timezone>-5</timezone>
+    </developer>
   </developers>
 
+  <contributors>
+    <contributor>
+      <name>Michael Freedman</name>
+      <organization>Oracle Corporation, U.S.A.</organization>
+      <organizationUrl>http://www.oracle.com/</organizationUrl>
+      <email>michael.freedman@oracle.com</email>
+      <roles>
+        <role>JSR-301 Spec Lead</role>
+      </roles>
+      <timezone>-8</timezone>
+    </contributor>
+  </contributors>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/portlet-bridge/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/portlet-bridge/trunk</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/portlet-bridge/trunk</url>
+  </scm>
+
+  <distributionManagement>
+    <site>
+      <id>apache-site</id>
+      <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/</url>
+    </site>
+  </distributionManagement>
+
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
+
   <repositories>
     <repository>
        <id>java.net</id>
@@ -142,6 +153,17 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    
+    <repository>
+      <id>myfaces-staging</id>
+      <url>http://people.apache.org/builds/myfaces/m2-staging-repository</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
   </repositories>
 
   <!-- Versions and scope of dependencies -->
@@ -317,6 +339,18 @@
   <build>
     <pluginManagement>
       <plugins>
+        <!-- Compiler (http://maven.apache.org/plugins/maven-compiler-plugin/index.html)-->
+        <!-- Overrides MyFaces Master settings -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+          </configuration>
+        </plugin>
+        
+        <!-- Checkstyle tools (http://maven.apache.org/plugins/maven-checkstyle-plugin/index.html) -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
@@ -329,7 +363,6 @@
           </configuration>
         </plugin>
 
-
         <!-- Site generation tools (http://maven.apache.org/plugins/maven-site-plugin/index.html)-->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -351,16 +384,6 @@
           </executions>
         </plugin>
 
-        <!-- Compiler (http://maven.apache.org/plugins/maven-compiler-plugin/index.html)-->
-        <!-- TODO: will this override the settings in MyFaces master -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
         
         <!-- Code analysis tool (http://maven.apache.org/plugins/maven-pmd-plugin/index.html) -->
         <plugin>