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 2010/07/01 00:39:46 UTC

svn commit: r959467 [1/6] - in /myfaces/portlet-bridge/core/trunk_2.0.x: ./ examples/ examples/assembly/src/main/resources/META-INF/ examples/carstore/src/main/java/carstore/ examples/carstore/src/main/java/carstore/bundles/ examples/carstore/src/main/...

Author: mfreedman
Date: Wed Jun 30 22:39:41 2010
New Revision: 959467

URL: http://svn.apache.org/viewvc?rev=959467&view=rev
Log:
PORTLETBRIDGE-150: ViewHandler render should save/restore current ExternalContext response before delegating

PORTLETBRIDGE-149: Update Copyright Notices in examples

Also updated Example set to use the Mojarra examples

Added:
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/jettypluto/
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/jettypluto/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/webapp/jettypluto/
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/webapp/jettypluto/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/greeting.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/index.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/jettypluto/
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/jettypluto/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/response.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/greeting.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/index.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/jettypluto/
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/jettypluto/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/response.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/greeting.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/index.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/jettypluto/
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/jettypluto/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/response.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/greeting.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/index.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/jettypluto/
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/jettypluto/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/response.jspx
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/jettypluto/
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/jettypluto/index.jsp
Removed:
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/index.jsp.bak
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/greeting.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/response.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/greeting.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/response.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/greeting.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/response.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/greeting.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/index.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/response.jsp
Modified:
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/NOTICE
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/README
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarBean.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarCustomizer.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarStore.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CreditCardConverter.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CustomerBean.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FirstNameChanged.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidator.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidatorTag.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/MessageFactory.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Common_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Custom.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Deluxe.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/OptionPrices.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Performance.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Resources.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Resources_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Resources_en.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Resources_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Resources_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Roadster.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Roadster_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Roadster_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Roadster_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Roadster_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/SUV.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/SUV_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/SUV_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/SUV_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/SUV_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Standard.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/package.html
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/org/apache/myfaces/portlet/faces/examples/renderkit/AreaRenderer.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/META-INF/NOTICE
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Common_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Custom.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Deluxe.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Jalopy.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Jalopy_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Jalopy_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Jalopy_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Jalopy_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Luxury.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Luxury_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Luxury_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Luxury_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Luxury_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Messages.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Messages_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Messages_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Messages_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/OptionPrices.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Performance.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_en.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_de.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_es.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_fr.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_options.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Standard.properties
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/carstore.tld
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/bottomMatter.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/carDetail.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/customerInfo.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/finish.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/optionsPanel.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/storeFront.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/stylesheet.css
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/NumberBean.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/facelets/PortletFaceletViewHandler.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/resources/META-INF/NOTICE
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/webapp/guess.xhtml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/webapp/index.html
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/webapp/response.xhtml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/webapp/template.xhtml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/java/guessNumber/MessageFactory.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/java/guessNumber/UserNumberBean.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/resources/META-INF/NOTICE
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumber/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/java/guessNumber/MessageFactory.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/java/guessNumber/UserNumberBean.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMojarraRenderFilter.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/resources/META-INF/NOTICE
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraFilter/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/resources/META-INF/NOTICE
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMojarraWrapper/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/MessageFactory.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/UserNumberBean.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMyFacesRenderFilter.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/java/helloDuke/UserNameBean.java
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/resources/META-INF/NOTICE
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/error.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/greeting.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/response.jsp
    myfaces/portlet-bridge/core/trunk_2.0.x/examples/pom.xml
    myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java
    myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/NOTICE?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/NOTICE Wed Jun 30 22:39:41 2010
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet Bridge
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
 Copyright [2007, 2008, 2009, 2010] The Apache Software Foundation
 
 This is an implementation of an early draft specification

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/README
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/README?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/README (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/assembly/src/main/resources/META-INF/README Wed Jun 30 22:39:41 2010
@@ -1,14 +1,27 @@
-This demo distribution contains three .war files:
-     portlet-bridge-blank-2.0.0-*.war
-     portlet-bridge-demo-2.0.0-*.war
-     portlet-bridge-demo-pluto-2.0.0-*.war
+This demo distribution contains the following .war files:
+     portlet-bridge-blank-2.0.0(-*).war
+     portlet-bridge-carstore-(pluto-)2.0.0(-*).war 
+     portlet-bridge-facelets-guess-(pluto-)2.0.0(-*).war 
+     portlet-bridge-guessNumber-jsp-(pluto-)2.0.0(-*).war
+     portlet-bridge-guessNumber-jsp-mojarraFilter-(pluto-)2.0.0(-*).war 
+     portlet-bridge-guessNumber-jsp-myFacesFilter-(pluto-)2.0.0(-*).war 
+     portlet-bridge-helloDuke-(pluto-)2.0.0(-*).war 
 
-* denotes location of the release version number.
+(pluto-) denotes this war has been built for deployment in a Pluto 2.x environment. The non-pluto war is packaged with no (server) specific deployment information; its a plain stadnard portlet application ready to be run through the deployment (tool) of your target portlet container. If your portlet container requires deployment specific modifications consult your container's documentation and/or use its deployment/packaging tools to deploy/repackage.
 
-portlet-bridge-blank-2.0.0-*.war contains a simple helloworld/name entering sample.  It is designed as an archetype sample you can use as a template for your own work.  Its packaged generically meaning there is no (server) deployment specific information within the files in its WEB-INF directory.  Hence it can be deployed on any portlet container that doesn't require additional deployment information.  If your portlet container requires deployment specific modifications consult your container's documentation and/or use its deployment/packaging tools to deploy/repackage.
 
-portlet-bridge-demo-2.0.0-*.war contains a simple helloworld/name entering sample.  Its structured however to host a variety of samples and will (hopefully) one day illustrate broad JSF function.  It too is packaged generically meaning there is no (server) deployment specific information within the files in its WEB-INF directory.  Hence it can be deployed on any portlet container that doesn't require additional deployment information.  If your portlet container requires deployment specific modifications consult your container's documentation and/or use its deployment/packaging tools to deploy/repackage.
+(-*) denotes location of additional release qualification (if any). 
 
-portlet-bridge-demo-pluto-2.0.0-*.war contains the same sample as portlet-bridge-demo-2.0.0-*.war.  However it is packaged specifically for installation in a Pluto 2.0 container.  If you are running Pluto 2.0 you can use this .war to deploy directly into your environment without any repackaging.
+portlet-bridge-blank-(pluto-)2.0.0(-*).war contains a simple helloworld/name entering sample.  It is designed as an archetype sample you can use as a template for your own work. 
 
-To see additional JSF applications running in the bridge, consult the "Getting started with the Bridge" page in the MyFaces Portlet Bridge Wiki accessible via the project's home page on the apache site (wiki: http://wiki.apache.org/myfaces/PortletBridge).
\ No newline at end of file
+portlet-bridge-carstore-(pluto-)2.0.0(-*).war contains a version of the Mojarra (JSF RI) CarStore demonstration packaged as a portlet application.  It has been modified to run to run correctly in both a servlet and portlet environment.
+
+portlet-bridge-facelets-guess-(pluto-)2.0.0(-*).war contains a fixed up version of the Facelets Guess Number sample packaged as a portlet application.  It has been modified to run to run correctly in both a servlet and portlet environment. It demonstrates how to use the Portlet Bridge with a Facelets based JSF application. 
+
+portlet-bridge-guessNumber-jsp-(pluto-)2.0.0(-*).war contains a fixed up version of the Mojarra Guess Number sample packaged as a portlet application. It has been modified to run to run correctly in both a servlet and portlet environment. 
+
+portlet-bridge-guessNumber-jsp-(pluto-)mojarraFilter-2.0.0(-*).war contains a fixed up version of the Mojarra Guess Number sample packaged as a portlet application. It contains a Mojarra specific servlet filter that provides the support for JSP write behind behavior.  That is this sample demonstrates how to implement write behind JSP behavior when running in a Mojarra JSF environment. 
+
+portlet-bridge-guessNumber-jsp-(pluto-)myFacesFilter-2.0.0(-*).war contains a fixed up version of the Mojarra Guess Number sample packaged as a portlet application. It contains a MyFaces specific servlet filter that provides the support for JSP write behind behavior.  That is this sample demonstrates how to implement write behind JSP behavior when running in a MyFaces JSF environment.
+
+portlet-bridge-helloDuke-(pluto-)2.0.0(-*).war contains a fixed up version of the Mojarra HelloDuke sample packaged as a portlet application. It has been modified to run to run correctly in both a servlet and portlet environment. 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarBean.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarBean.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarBean.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarBean.java Wed Jun 30 22:39:41 2010
@@ -1,26 +1,20 @@
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- * 
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt. 
- * See the License for the specific language governing
- * permission and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.    
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * [Name of File] [ver.__] [Date]
- * 
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
  */
 
 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarCustomizer.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarCustomizer.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarCustomizer.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarCustomizer.java Wed Jun 30 22:39:41 2010
@@ -1,26 +1,20 @@
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- * 
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt. 
- * See the License for the specific language governing
- * permission and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.    
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * [Name of File] [ver.__] [Date]
- * 
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
  */
 
 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarStore.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarStore.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarStore.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CarStore.java Wed Jun 30 22:39:41 2010
@@ -1,26 +1,20 @@
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- * 
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt. 
- * See the License for the specific language governing
- * permission and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.    
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * [Name of File] [ver.__] [Date]
- * 
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
  */
 
 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CreditCardConverter.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CreditCardConverter.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CreditCardConverter.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CreditCardConverter.java Wed Jun 30 22:39:41 2010
@@ -1,30 +1,20 @@
-/*
- * $Id: CreditCardConverter.java,v 1.3 2006/03/09 01:17:29 rlubke Exp $
- */
-
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- * 
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt. 
- * See the License for the specific language governing
- * permission and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.    
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * [Name of File] [ver.__] [Date]
- * 
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
  */
 
 package carstore;

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CustomerBean.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CustomerBean.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CustomerBean.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/CustomerBean.java Wed Jun 30 22:39:41 2010
@@ -1,29 +1,20 @@
-/*
- * $Id: CustomerBean.java,v 1.3 2006/03/09 01:17:29 rlubke Exp $
- */
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- * 
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt. 
- * See the License for the specific language governing
- * permission and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.    
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * [Name of File] [ver.__] [Date]
- * 
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
  */
 
 package carstore;

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FirstNameChanged.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FirstNameChanged.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FirstNameChanged.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FirstNameChanged.java Wed Jun 30 22:39:41 2010
@@ -1,26 +1,20 @@
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- * 
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt. 
- * See the License for the specific language governing
- * permission and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.    
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * [Name of File] [ver.__] [Date]
- * 
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
  */
 
 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidator.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidator.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidator.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidator.java Wed Jun 30 22:39:41 2010
@@ -1,30 +1,20 @@
-/*
- * $Id: FormatValidator.java,v 1.3 2006/03/09 01:17:29 rlubke Exp $
- */
-
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- * 
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt. 
- * See the License for the specific language governing
- * permission and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.    
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * [Name of File] [ver.__] [Date]
- * 
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
  */
 
 package carstore;

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidatorTag.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidatorTag.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidatorTag.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/FormatValidatorTag.java Wed Jun 30 22:39:41 2010
@@ -1,30 +1,20 @@
-/*
- * $Id: FormatValidatorTag.java,v 1.3 2006/03/09 01:17:30 rlubke Exp $
- */
-
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- * 
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt. 
- * See the License for the specific language governing
- * permission and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.    
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * [Name of File] [ver.__] [Date]
- * 
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
  */
 
 package carstore;

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/MessageFactory.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/MessageFactory.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/MessageFactory.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/MessageFactory.java Wed Jun 30 22:39:41 2010
@@ -1,30 +1,20 @@
-/*
- * $Id: MessageFactory.java,v 1.3 2006/03/09 01:17:30 rlubke Exp $
- */
-
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- * 
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt. 
- * See the License for the specific language governing
- * permission and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.    
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * [Name of File] [ver.__] [Date]
- * 
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
  */
 
 package carstore;

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Common_options.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Common_options.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Common_options.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Common_options.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,20 @@
+# 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.
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
 #
 
 # this file contains the non-localized set of options common to all cars

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Custom.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Custom.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Custom.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Custom.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 sunroof=false
 sunroof_disabled=false

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Deluxe.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Deluxe.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Deluxe.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Deluxe.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 sunroof=true
 sunroof_disabled=false

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the localized content for the Jalopy 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_de.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_de.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_de.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_de.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the localized content for the Jalopy 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_es.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_es.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the localized content for the Jalopy 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_fr.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_fr.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_fr.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_fr.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the localized content for the Jalopy 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_options.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_options.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_options.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Jalopy_options.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the non-localized set of options for the Jalopy

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the localized content for the Luxury

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_de.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_de.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_de.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_de.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the localized content for the Luxury

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_es.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_es.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the localized content for the Luxury

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_fr.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_fr.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_fr.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_fr.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the localized content for the Luxury

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_options.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_options.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_options.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Luxury_options.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 # this file contains the non-localized set of options for the Luxury

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 carstore.Format_Invalid=Input must match one of the following patterns {0}

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_de.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_de.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_de.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_de.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 carstore.Format_Invalid=Eingang mu\u00df eins der folgenden Muster zusammenbringen {0}

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_es.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/java/carstore/bundles/Messages_es.properties Wed Jun 30 22:39:41 2010
@@ -1,26 +1,22 @@
 #
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-# 
-# You can obtain a copy of the License at
-# https://javaserverfaces.dev.java.net/CDDL.html or
-# legal/CDDLv1.0.txt. 
-# See the License for the specific language governing
-# permission and limitations under the License.
-# 
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at legal/CDDLv1.0.txt.    
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# [Name of File] [ver.__] [Date]
-# 
-# Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+# 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.
+#
+#
 #
 
 carstore.Format_Invalid=La entrada debe emparejar uno de los patrones siguientes {0}