You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2011/02/08 20:05:29 UTC
svn commit: r1068527 - in /myfaces/portlet-bridge/core/tags/3.0.0-alpha: ./
api/src/main/java/javax/portlet/faces/ api/src/main/resources/META-INF/
assembly/src/main/resources/META-INF/
examples/assembly/src/main/resources/META-INF/ examples/carstore/s...
Author: mfreedman
Date: Tue Feb 8 19:05:28 2011
New Revision: 1068527
URL: http://svn.apache.org/viewvc?rev=1068527&view=rev
Log:
Updated NOTICE files to remove blurb about it being early release of the JCP standard
Modified:
myfaces/portlet-bridge/core/tags/3.0.0-alpha/ (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/NOTICE
myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/java/javax/portlet/faces/Bridge.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/java/javax/portlet/faces/BridgeUtil.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/resources/META-INF/NOTICE (contents, props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE (contents, props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/assembly/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/carstore/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/facelets-guess/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumber/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMojarraFilter/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDuke/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java (props changed)
myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/resources/META-INF/NOTICE (contents, props changed)
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x:888894-923981
-/myfaces/portlet-bridge/core/trunk_3.0.x:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x:1068501,1068512,1068521
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/java/javax/portlet/faces/Bridge.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/api/src/main/java/javax/portlet/faces/Bridge.java:888894-923981,950308-997838
-/myfaces/portlet-bridge/core/trunk_3.0.x/api/src/main/java/javax/portlet/faces/Bridge.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/api/src/main/java/javax/portlet/faces/Bridge.java:1068501,1068512,1068521
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/java/javax/portlet/faces/BridgeUtil.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/api/src/main/java/javax/portlet/faces/BridgeUtil.java:888894-923981,925027
-/myfaces/portlet-bridge/core/trunk_3.0.x/api/src/main/java/javax/portlet/faces/BridgeUtil.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/api/src/main/java/javax/portlet/faces/BridgeUtil.java:1068501,1068512,1068521
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java:888894-923981,950308-997838
-/myfaces/portlet-bridge/core/trunk_3.0.x/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java:1068501,1068512,1068521
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/api/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,3 +1,3 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/api/src/main/resources/META-INF/NOTICE:888894-923981
-/myfaces/portlet-bridge/core/trunk_3.0.x/api/src/main/resources/META-INF/NOTICE:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/api/src/main/resources/META-INF/NOTICE:1068501,1068512,1068521
/myfaces/portlet-bridge/trunk/api/src/main/resources/META-INF/NOTICE:588229-629933
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/assembly/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,3 +1,3 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/assembly/src/main/resources/META-INF/NOTICE:888894-923981
-/myfaces/portlet-bridge/core/trunk_3.0.x/assembly/src/main/resources/META-INF/NOTICE:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/assembly/src/main/resources/META-INF/NOTICE:1068501,1068512,1068521
/myfaces/portlet-bridge/trunk/assembly/src/main/resources/META-INF/NOTICE:588229-629933
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/assembly/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/assembly/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/assembly/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/assembly/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/carstore/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/carstore/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/carstore/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/carstore/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/facelets-guess/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/facelets-guess/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/facelets-guess/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/facelets-guess/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumber/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumber/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumber/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumber/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMojarraFilter/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMojarraFilter/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMojarraFilter/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMojarraFilter/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDuke/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDuke/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDuke/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDuke/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java:888894-923981,929300
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java:1068501,1068512,1068521
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java:888894-923981,925027-997838
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java:1068501,1068512,1068521
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java:888894-923981,925027-929723
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java:1068501,1068512,1068521
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java:888894-923981,925027-1033781
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java:1068501,1068512,1068521
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java:888894-923981,946789-982807
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java:1068501,1068512,1068521
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java:888894-923981,987340
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java:1068501,1068512,1068521
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java:888894-923981,925027-997838
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java:1068501,1068512,1068521
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java:888894-923981,925027-997838
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java:1068501,1068512,1068521
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/resources/META-INF/NOTICE?rev=1068527&r1=1068526&r2=1068527&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/resources/META-INF/NOTICE Tue Feb 8 19:05:28 2011
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 2.0
Copyright [2007, 2008, 2009, 2010, 2011] The Apache Software Foundation
This product includes software developed at
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 19:05:28 2011
@@ -1,3 +1,3 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/resources/META-INF/NOTICE:888894-923981
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/resources/META-INF/NOTICE:1068501,1068512
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/resources/META-INF/NOTICE:1068501,1068512,1068521
/myfaces/portlet-bridge/trunk/impl/src/main/resources/META-INF/NOTICE:588229-629933