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/06/17 23:00:52 UTC

svn commit: r955744 [4/7] - in /myfaces/portlet-bridge/core/trunk/examples: carstore/src/main/java/carstore/ carstore/src/main/java/carstore/bundles/ carstore/src/main/java/org/apache/myfaces/portlet/faces/examples/renderkit/ carstore/src/main/resource...

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Resources_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Resources_es.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Resources_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Resources_es.properties Thu Jun 17 21:00:48 2010
@@ -1,174 +1,170 @@
-#
-# 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
-#
-
-carDetails=Here are the details for your car.
-
-moreButton=M\u00e1s
-
-
-
-chooseLocale=Escoje tu sitio favorito del mapa 
-
-
-
-basePriceLabel=Precio base
-
-yourPriceLabel=Tu precio 
-
-OptionsPackages=Paquete de opci\u00f3nes
-
-
-
-Custom=personalizado a tu gusto
-
-Deluxe=delujo
-
-Package=paquete
-
-
-
-Engine=Motor
-
-
-
-Brakes=Frenos
-
-Disc=Disco de frenos
-
-Drum=Tambor de frenos
-
-
-
-Suspension=suspensi\u00f3n
-
-Regular=Regular
-
-Performance=Redimiento
-
-
-
-Speakers=Bocinas
-
-
-
-Audio=Equipo de sonido
-
-Standard=Est\u00e1ndar
-
-Premium=Superior
-
-
-
-Transmission=Transmisi\u00f3n
-
-Auto=Transmisi\u00f3n   Automatica
-
-Manual=Transmisi\u00f3n  Manual
-
-
-
-OtherOptions=Otras opci\u00f3nes
-
-
-
-sunroofLabel=techo corredizo
-
-cruiseLabel=control de velocidad constante
-
-keylessLabel=sistema de entrada sin llaves a control remoto
-
-securityLabel=Sistema de seguridad
-
-skiRackLabel=Porta esquis
-
-towPkgLabel=Paquete para remolque
-
-gpsLabel=Sistema de posicionamiento global
-
-buy=Comprar
-back=Regresar
-
-buyLabel=Gracias por visitamos!
-
-
-
-recalculate=Calcular de nuevo
-
-buyTitle=Tu has escojido las siguientes opci\u00f3nes: 
-
-configureButton=Reconfigurar
-
-customerTitle=Por favor complete su nombre y direcci\u00f3n.
-
-
-
-titleLabel=T\u00edtulo
-
-mrLabel=Se\u00f1or
-
-msLabel=Srta.
-
-mrsLabel=Sra.
-
-firstLabel=Primer Nombre
-
-middleLabel=Segundo Nombre
-
-lastLabel=Apellido
-
-mailingLabel=Dirrecci\u00f3n
-
-cityLabel=Ciudad
-
-stateLabel=Estado
-
-zipLabel=C\u00f3digo postal
-
-ccNumberLabel=Numero de carta de cr\u00e9dito
-
-monthLabel=Fecha de expiraci\u00f3n
-
-finishButton=Terminar
-
-errorLabel=Un error de sucedio
-
-thanksLabel=Gracias, {0}, para usar CarStore! Tu carro enviado pronto.
-
-
-
-outputMessageKey=bundle param 0: {0} bundle param: 1 {1} bundle param: 2 {2}
-
-
-
-
-
-
-stockLabel=Apesadumbrada, la azotea del sol para Jalopy est\u00E1 actualmente fuera de acci\u00F3n.\ 
-chooseCar=Which car would you like to buy?
-
-english=English
-german=Deutsch
-spanish=Espanol
-french=Francais
+#
+# 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.
+#
+#
+#
+
+carDetails=Here are the details for your car.
+
+moreButton=M\u00e1s
+
+
+
+chooseLocale=Escoje tu sitio favorito del mapa 
+
+
+
+basePriceLabel=Precio base
+
+yourPriceLabel=Tu precio 
+
+OptionsPackages=Paquete de opci\u00f3nes
+
+
+
+Custom=personalizado a tu gusto
+
+Deluxe=delujo
+
+Package=paquete
+
+
+
+Engine=Motor
+
+
+
+Brakes=Frenos
+
+Disc=Disco de frenos
+
+Drum=Tambor de frenos
+
+
+
+Suspension=suspensi\u00f3n
+
+Regular=Regular
+
+Performance=Redimiento
+
+
+
+Speakers=Bocinas
+
+
+
+Audio=Equipo de sonido
+
+Standard=Est\u00e1ndar
+
+Premium=Superior
+
+
+
+Transmission=Transmisi\u00f3n
+
+Auto=Transmisi\u00f3n   Automatica
+
+Manual=Transmisi\u00f3n  Manual
+
+
+
+OtherOptions=Otras opci\u00f3nes
+
+
+
+sunroofLabel=techo corredizo
+
+cruiseLabel=control de velocidad constante
+
+keylessLabel=sistema de entrada sin llaves a control remoto
+
+securityLabel=Sistema de seguridad
+
+skiRackLabel=Porta esquis
+
+towPkgLabel=Paquete para remolque
+
+gpsLabel=Sistema de posicionamiento global
+
+buy=Comprar
+back=Regresar
+
+buyLabel=Gracias por visitamos!
+
+
+
+recalculate=Calcular de nuevo
+
+buyTitle=Tu has escojido las siguientes opci\u00f3nes: 
+
+configureButton=Reconfigurar
+
+customerTitle=Por favor complete su nombre y direcci\u00f3n.
+
+
+
+titleLabel=T\u00edtulo
+
+mrLabel=Se\u00f1or
+
+msLabel=Srta.
+
+mrsLabel=Sra.
+
+firstLabel=Primer Nombre
+
+middleLabel=Segundo Nombre
+
+lastLabel=Apellido
+
+mailingLabel=Dirrecci\u00f3n
+
+cityLabel=Ciudad
+
+stateLabel=Estado
+
+zipLabel=C\u00f3digo postal
+
+ccNumberLabel=Numero de carta de cr\u00e9dito
+
+monthLabel=Fecha de expiraci\u00f3n
+
+finishButton=Terminar
+
+errorLabel=Un error de sucedio
+
+thanksLabel=Gracias, {0}, para usar CarStore! Tu carro enviado pronto.
+
+
+
+outputMessageKey=bundle param 0: {0} bundle param: 1 {1} bundle param: 2 {2}
+
+
+
+
+
+
+stockLabel=Apesadumbrada, la azotea del sol para Jalopy est\u00E1 actualmente fuera de acci\u00F3n.\ 
+chooseCar=Which car would you like to buy?
+
+english=English
+german=Deutsch
+spanish=Espanol
+french=Francais

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Resources_fr.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Resources_fr.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Resources_fr.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Resources_fr.properties Thu Jun 17 21:00:48 2010
@@ -1,103 +1,99 @@
-#
-# 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
-#
-
-carDetails=Here are the details for your car.
-
-moreButton=Plus
-
-chooseLocale=Choisissez votre locale pr\u00e9f\u00e9r\u00e9e avec la carte g\u00e9ographique
-
-basePriceLabel=Prix de Base
-yourPriceLabel=Votre Prix 
-OptionsPackages=Options
-
-Package=Pack
-Custom=Sp\u00e9cifique
-Deluxe=Grand Confort
-
-Engine=Moteur
-
-Brakes=Freins
-Disc=disque
-Drum=tambour
-
-Suspension=Suspension
-Regular=r\u00e9gulier
-Performance=performance
-
-Speakers=Hauts-parleurs
-
-Audio=Audio
-Standard=standard
-Premium=premium
-
-Transmission=Transmission
-Auto=automatique
-Manual=manuelle
-
-OtherOptions=Autres Options
-
-sunroofLabel=Toit Ouvrant
-cruiseLabel=R\u00e9gulateur de Vitesse
-keylessLabel=Entr\u00e9e sans clef
-securityLabel=Syst\u00e8me de s\u00e9curit\u00e9
-skiRackLabel=Porte Skis
-towPkgLabel=Remorquage
-gpsLabel=Syst\u00e8me de navigation par satellite
-buy=Acheter
-back=retourner
-buyLabel=Merci de nous visiter!
-
-recalculate=Recalculer
-buyTitle=Vous avez s\u00e9lectionn\u00e9 les options suivantes:
-configureButton=Reconfigurer
-customerTitle=S.V.P., sp\u00e9cifiez votre nom et adresse.
-
-titleLabel=Titre
-mrLabel=M.
-msLabel=Mlle
-mrsLabel=Mme
-firstLabel=Pr\u00e9nom
-middleLabel=Initiale
-lastLabel=Nom de Famille
-mailingLabel=Adresse
-cityLabel=Ville
-stateLabel=Province
-zipLabel=Code Postal
-ccNumberLabel=Num\u00e9ro de carte de cr\u00e9dit
-monthLabel=Date d'expiration
-finishButton=Terminer
-errorLabel=Il s'est produit une erreur!
-thanksLabel=Merci d utiliser, {0}, D\u00e9moVoiture! Votre automobile arrivera bient\u00f4t.
-
-outputMessageKey=bundle param 0: {0} bundle param: 1 {1} bundle param: 2 {2}
-
-stockLabel=D\u00E9sol\u00E9, le toit du soleil pour Jalopy est actuellement hors des actions.\ 
-chooseCar=Which car would you like to buy?
-
-english=English
-german=Deutsch
-spanish=Espanol
-french=Francais
+#
+# 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.
+#
+#
+#
+
+carDetails=Here are the details for your car.
+
+moreButton=Plus
+
+chooseLocale=Choisissez votre locale pr\u00e9f\u00e9r\u00e9e avec la carte g\u00e9ographique
+
+basePriceLabel=Prix de Base
+yourPriceLabel=Votre Prix 
+OptionsPackages=Options
+
+Package=Pack
+Custom=Sp\u00e9cifique
+Deluxe=Grand Confort
+
+Engine=Moteur
+
+Brakes=Freins
+Disc=disque
+Drum=tambour
+
+Suspension=Suspension
+Regular=r\u00e9gulier
+Performance=performance
+
+Speakers=Hauts-parleurs
+
+Audio=Audio
+Standard=standard
+Premium=premium
+
+Transmission=Transmission
+Auto=automatique
+Manual=manuelle
+
+OtherOptions=Autres Options
+
+sunroofLabel=Toit Ouvrant
+cruiseLabel=R\u00e9gulateur de Vitesse
+keylessLabel=Entr\u00e9e sans clef
+securityLabel=Syst\u00e8me de s\u00e9curit\u00e9
+skiRackLabel=Porte Skis
+towPkgLabel=Remorquage
+gpsLabel=Syst\u00e8me de navigation par satellite
+buy=Acheter
+back=retourner
+buyLabel=Merci de nous visiter!
+
+recalculate=Recalculer
+buyTitle=Vous avez s\u00e9lectionn\u00e9 les options suivantes:
+configureButton=Reconfigurer
+customerTitle=S.V.P., sp\u00e9cifiez votre nom et adresse.
+
+titleLabel=Titre
+mrLabel=M.
+msLabel=Mlle
+mrsLabel=Mme
+firstLabel=Pr\u00e9nom
+middleLabel=Initiale
+lastLabel=Nom de Famille
+mailingLabel=Adresse
+cityLabel=Ville
+stateLabel=Province
+zipLabel=Code Postal
+ccNumberLabel=Num\u00e9ro de carte de cr\u00e9dit
+monthLabel=Date d'expiration
+finishButton=Terminer
+errorLabel=Il s'est produit une erreur!
+thanksLabel=Merci d utiliser, {0}, D\u00e9moVoiture! Votre automobile arrivera bient\u00f4t.
+
+outputMessageKey=bundle param 0: {0} bundle param: 1 {1} bundle param: 2 {2}
+
+stockLabel=D\u00E9sol\u00E9, le toit du soleil pour Jalopy est actuellement hors des actions.\ 
+chooseCar=Which car would you like to buy?
+
+english=English
+german=Deutsch
+spanish=Espanol
+french=Francais

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster.properties Thu Jun 17 21:00:48 2010
@@ -1,33 +1,29 @@
-#
-# 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 localized content for the Roadster
-
-title=Duke's MLC Roadster
-title_componentType=javax.faces.Output
-title_valueType=java.lang.String
-description=Getting on in years? Need to make one last-ditch grasp at youth?  You'll feel 20 years younger when step behind the wheel of this baby.
-description_componentType=javax.faces.Output
-description_valueType=java.lang.String
+#
+# 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 Roadster
+
+title=Duke's MLC Roadster
+title_componentType=javax.faces.Output
+title_valueType=java.lang.String
+description=Getting on in years? Need to make one last-ditch grasp at youth?  You'll feel 20 years younger when step behind the wheel of this baby.
+description_componentType=javax.faces.Output
+description_valueType=java.lang.String

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_de.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_de.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_de.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_de.properties Thu Jun 17 21:00:48 2010
@@ -1,34 +1,30 @@
-#
-# 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 localized content for the Roadster
-
-title=Duke's MLC Roadster
-title_componentType=javax.faces.Output
-title_valueType=java.lang.String
-description=Kommen Sie in die Jahre? Wollen Sie nicht noch mal nach der Jugend greifen? Sie f\u00fchlen sich 20 Jahre j\u00fcnger, wenn Sie sich hinter das Lenkrad dieses Babies setzen.
-destcription_componentType=javax.faces.Output
-destcription_valueType=java.lang.String
-
+#
+# 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 Roadster
+
+title=Duke's MLC Roadster
+title_componentType=javax.faces.Output
+title_valueType=java.lang.String
+description=Kommen Sie in die Jahre? Wollen Sie nicht noch mal nach der Jugend greifen? Sie f\u00fchlen sich 20 Jahre j\u00fcnger, wenn Sie sich hinter das Lenkrad dieses Babies setzen.
+destcription_componentType=javax.faces.Output
+destcription_valueType=java.lang.String
+

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_es.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_es.properties Thu Jun 17 21:00:48 2010
@@ -1,30 +1,26 @@
-#
-# 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
-#
-title=El coche MLC de Duke.
-title_componentType=javax.faces.Output
-title_valueType=java.lang.String
-description=Te sientes como que los a\u00f1os se estan acumulando? Te quieres sentir como adolecente de Nuevo? Tu te vas a sentir como un nuevo joven una vez mas te montes en  este autom\u00d3vil.
-description_componentType=javax.faces.Output
-description_valueType=java.lang.String
+#
+# 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.
+#
+#
+#
+title=El coche MLC de Duke.
+title_componentType=javax.faces.Output
+title_valueType=java.lang.String
+description=Te sientes como que los a\u00f1os se estan acumulando? Te quieres sentir como adolecente de Nuevo? Tu te vas a sentir como un nuevo joven una vez mas te montes en  este autom\u00d3vil.
+description_componentType=javax.faces.Output
+description_valueType=java.lang.String

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_fr.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_fr.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_fr.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_fr.properties Thu Jun 17 21:00:48 2010
@@ -1,33 +1,29 @@
-#
-# 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
-#
-
-title=La sportive de Duke
-
-title_componentType=javax.faces.Output
-title_valueType=java.lang.String
-description=On vieillit? On aimerait revivre cette jeunesse pass\u00e9e? Rajeunissez de 20 ans au volant de cette petite merveille.
-description_componentType=javax.faces.Output
-description_valueType=java.lang.String
-
+#
+# 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.
+#
+#
+#
+
+title=La sportive de Duke
+
+title_componentType=javax.faces.Output
+title_valueType=java.lang.String
+description=On vieillit? On aimerait revivre cette jeunesse pass\u00e9e? Rajeunissez de 20 ans au volant de cette petite merveille.
+description_componentType=javax.faces.Output
+description_valueType=java.lang.String
+

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_options.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_options.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_options.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Roadster_options.properties Thu Jun 17 21:00:48 2010
@@ -1,58 +1,54 @@
-#
-# 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 for the Roadster
-
-
-basePrice=15700
-basePrice_componentType=javax.faces.Output
-basePrice_valueType=java.lang.Integer
-currentPrice=15700
-currentPrice_componentType=javax.faces.Output
-currentPrice_valueType=java.lang.Integer
-image=/images/200x168_Roadster.jpg
-image_componentType=javax.faces.Graphic
-image_valueType=java.lang.String
-imageSmall=/images/150x126_Roadster.jpg
-imageSmall_componentType=javax.faces.Graphic
-imageSmall_valueType=java.lang.String
-brake=Disc,Drum
-brake_componentType=javax.faces.SelectOne
-brake_valueType=java.lang.String
-suspension=Performance,Regular
-suspension_componentType=javax.faces.SelectOne
-suspension_valueType=java.lang.String
-audio=Standard,Premium
-audio_componentType=javax.faces.SelectOne
-audio_valueType=java.lang.String
-transmission=Auto,Manual
-transmission_componentType=javax.faces.SelectOne
-transmission_valueType=java.lang.String
-engine=V4,V6,V8
-engine_componentType=javax.faces.SelectOne
-engine_valueType=java.lang.String
-speaker=4,6
-speaker_componentType=javax.faces.SelectOne
-speaker_valueType=java.lang.String
+#
+# 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 Roadster
+
+
+basePrice=15700
+basePrice_componentType=javax.faces.Output
+basePrice_valueType=java.lang.Integer
+currentPrice=15700
+currentPrice_componentType=javax.faces.Output
+currentPrice_valueType=java.lang.Integer
+image=/images/200x168_Roadster.jpg
+image_componentType=javax.faces.Graphic
+image_valueType=java.lang.String
+imageSmall=/images/150x126_Roadster.jpg
+imageSmall_componentType=javax.faces.Graphic
+imageSmall_valueType=java.lang.String
+brake=Disc,Drum
+brake_componentType=javax.faces.SelectOne
+brake_valueType=java.lang.String
+suspension=Performance,Regular
+suspension_componentType=javax.faces.SelectOne
+suspension_valueType=java.lang.String
+audio=Standard,Premium
+audio_componentType=javax.faces.SelectOne
+audio_valueType=java.lang.String
+transmission=Auto,Manual
+transmission_componentType=javax.faces.SelectOne
+transmission_valueType=java.lang.String
+engine=V4,V6,V8
+engine_componentType=javax.faces.SelectOne
+engine_valueType=java.lang.String
+speaker=4,6
+speaker_componentType=javax.faces.SelectOne
+speaker_valueType=java.lang.String

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV.properties Thu Jun 17 21:00:48 2010
@@ -1,34 +1,30 @@
-#
-# 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 localized content for the SUV
-
-
-title=Duke's Bloated SUV
-title_componentType=javax.faces.Output
-title_valueType=java.lang.String
-description=Sometimes you can never be high enough or big enough compared to the car next to you. And those newborns come out bigger every time. Get the SUV that will hold everything and scare the begeezes out of everyone on the road.
-description_componentType=javax.faces.Output
-description_valueType=java.lang.String
+#
+# 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 SUV
+
+
+title=Duke's Bloated SUV
+title_componentType=javax.faces.Output
+title_valueType=java.lang.String
+description=Sometimes you can never be high enough or big enough compared to the car next to you. And those newborns come out bigger every time. Get the SUV that will hold everything and scare the begeezes out of everyone on the road.
+description_componentType=javax.faces.Output
+description_valueType=java.lang.String

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_de.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_de.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_de.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_de.properties Thu Jun 17 21:00:48 2010
@@ -1,34 +1,30 @@
-#
-# 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 localized content for the SUV
-
-title=Dukes aufgeblasener Gel\u00e4ndewagen
-title_componentType=javax.faces.Output
-title_valueType=java.lang.String
-description=Manchmal k\u00f6nnen Sie niemels hoch oder gro\u00df genug sein, verglichen mit dem Wagen neben Ihnen. Und diese Welpen kommen jedesmal gr\u00fc\u00dfer raus. Nehmen Sie diesen Gel\u00e4ndewagen, der allem standh\u00e4lt und jeden auf der Stra\u00dfe beeindruckt.
-description_componentType=javax.faces.Output
-description_valueType=java.lang.String
-
+#
+# 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 SUV
+
+title=Dukes aufgeblasener Gel\u00e4ndewagen
+title_componentType=javax.faces.Output
+title_valueType=java.lang.String
+description=Manchmal k\u00f6nnen Sie niemels hoch oder gro\u00df genug sein, verglichen mit dem Wagen neben Ihnen. Und diese Welpen kommen jedesmal gr\u00fc\u00dfer raus. Nehmen Sie diesen Gel\u00e4ndewagen, der allem standh\u00e4lt und jeden auf der Stra\u00dfe beeindruckt.
+description_componentType=javax.faces.Output
+description_valueType=java.lang.String
+

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_es.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_es.properties Thu Jun 17 21:00:48 2010
@@ -1,34 +1,30 @@
-#
-# 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 localized content for the SUV
-
-title=El enorme carro SUV de Duke
-title_componentType=javax.faces.Output
-title_valueType=java.lang.String
-description=Hay muchas veces de que uno nunca puede tener un carro mas grande de que el carro ala par de uno. Compra el SUV mas grande para poder poner todas las cosas que quiras y asustar a todos que se aproximen a tu SUV.
-description_componentType=javax.faces.Output
-description_valueType=java.lang.String
-
+#
+# 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 SUV
+
+title=El enorme carro SUV de Duke
+title_componentType=javax.faces.Output
+title_valueType=java.lang.String
+description=Hay muchas veces de que uno nunca puede tener un carro mas grande de que el carro ala par de uno. Compra el SUV mas grande para poder poner todas las cosas que quiras y asustar a todos que se aproximen a tu SUV.
+description_componentType=javax.faces.Output
+description_valueType=java.lang.String
+

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_fr.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_fr.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_fr.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_fr.properties Thu Jun 17 21:00:48 2010
@@ -1,34 +1,30 @@
-#
-# 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 localized content for the SUV
-
-title=Le SUV de Duke
-title_componentType=javax.faces.Output
-title_valueType=java.lang.String
-description=Que ce soit en hauteur ou en grosseur, vous voulez surpasser toutes les voitures sur la route? Les rejetons grandissent trop vite? Vous devez vous procurer ce v\u00e9hicule utilitaire qui regorge d'espace pour asseoir tout le monde confortablement en plus de demander le respect de quiconque s'aventure sur la route avec vous.
-description_componentType=javax.faces.Output
-description_valueType=java.lang.String
-
+#
+# 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 SUV
+
+title=Le SUV de Duke
+title_componentType=javax.faces.Output
+title_valueType=java.lang.String
+description=Que ce soit en hauteur ou en grosseur, vous voulez surpasser toutes les voitures sur la route? Les rejetons grandissent trop vite? Vous devez vous procurer ce v\u00e9hicule utilitaire qui regorge d'espace pour asseoir tout le monde confortablement en plus de demander le respect de quiconque s'aventure sur la route avec vous.
+description_componentType=javax.faces.Output
+description_valueType=java.lang.String
+

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_options.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_options.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_options.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/SUV_options.properties Thu Jun 17 21:00:48 2010
@@ -1,57 +1,53 @@
-#
-# 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 for the SUV
-
-basePrice=25000
-basePrice_componentType=javax.faces.Output
-basePrice_valueType=java.lang.Integer
-currentPrice=25000
-currentPrice_componentType=javax.faces.Output
-currentPrice_valueType=java.lang.Integer
-image=/images/200x168_SUV.jpg
-image_componentType=javax.faces.Graphic
-image_valueType=java.lang.String
-imageSmall=/images/150x126_SUV.jpg
-imageSmall_componentType=javax.faces.Graphic
-imageSmall_valueType=java.lang.String
-brake=Disc,Drum
-brake_componentType=javax.faces.SelectOne
-brake_valueType=java.lang.String
-suspension=Performance,Regular
-suspension_componentType=javax.faces.SelectOne
-suspension_valueType=java.lang.String
-audio=Standard,Premium
-audio_componentType=javax.faces.SelectOne
-audio_valueType=java.lang.String
-transmission=Auto,Manual
-transmission_componentType=javax.faces.SelectOne
-transmission_valueType=java.lang.String
-engine=V4,V6,V8
-engine_componentType=javax.faces.SelectOne
-engine_valueType=java.lang.String
-speaker=4,6
-speaker_componentType=javax.faces.SelectOne
-speaker_valueType=java.lang.String
+#
+# 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 SUV
+
+basePrice=25000
+basePrice_componentType=javax.faces.Output
+basePrice_valueType=java.lang.Integer
+currentPrice=25000
+currentPrice_componentType=javax.faces.Output
+currentPrice_valueType=java.lang.Integer
+image=/images/200x168_SUV.jpg
+image_componentType=javax.faces.Graphic
+image_valueType=java.lang.String
+imageSmall=/images/150x126_SUV.jpg
+imageSmall_componentType=javax.faces.Graphic
+imageSmall_valueType=java.lang.String
+brake=Disc,Drum
+brake_componentType=javax.faces.SelectOne
+brake_valueType=java.lang.String
+suspension=Performance,Regular
+suspension_componentType=javax.faces.SelectOne
+suspension_valueType=java.lang.String
+audio=Standard,Premium
+audio_componentType=javax.faces.SelectOne
+audio_valueType=java.lang.String
+transmission=Auto,Manual
+transmission_componentType=javax.faces.SelectOne
+transmission_valueType=java.lang.String
+engine=V4,V6,V8
+engine_componentType=javax.faces.SelectOne
+engine_valueType=java.lang.String
+speaker=4,6
+speaker_componentType=javax.faces.SelectOne
+speaker_valueType=java.lang.String

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Standard.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Standard.properties?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Standard.properties (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/resources/carstore/bundles/Standard.properties Thu Jun 17 21:00:48 2010
@@ -1,45 +1,41 @@
-#
-# 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
-#
-sunroof=true
-sunroof_disabled=true
-cruisecontrol=true
-cruisecontrol_disabled=true
-keylessentry=true
-keylessentry_disabled=true
-securitySystem=false
-securitySystem_disabled=true
-skirack=true
-skirack_disabled=true
-towPackage=false
-towPackage_disabled=true
-gps=false
-gps_disabled=true
-
-engine=V4
-brake=Disc
-suspension=Regular
-speaker=4
-audio=Standard
-transmission=Auto
+#
+# 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=true
+cruisecontrol=true
+cruisecontrol_disabled=true
+keylessentry=true
+keylessentry_disabled=true
+securitySystem=false
+securitySystem_disabled=true
+skirack=true
+skirack_disabled=true
+towPackage=false
+towPackage_disabled=true
+gps=false
+gps_disabled=true
+
+engine=V4
+brake=Disc
+suspension=Regular
+speaker=4
+audio=Standard
+transmission=Auto

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/carstore.tld
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/carstore.tld?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/carstore.tld (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/carstore.tld Thu Jun 17 21:00:48 2010
@@ -1,67 +1,61 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!--
- 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
--->
-
-<taglib xmlns="http://java.sun.com/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
-        version="2.1">
-
-    <!-- ============== Tag Library Description Elements ============= -->
-    <description>
-        This tag library contains tags used by the CarStore application.
-    </description>
-    <tlib-version>1.2</tlib-version>
-    <short-name>cs</short-name>
-    <uri>https://javaserverfaces.dev.java.net/demo/carstore</uri>
-
-    <!-- ===================== ImageMap tags ====================== -->
-    <tag>
-        <description>
-            Defines the format-validator tag, with the
-            tag-handler class, carstore.FormatValidatorTag. This tag
-            must be nested inside a UI component tag. The value of the
-            UI component whose tag encloses the format_validator tag
-            is validated against the format patterns defined by the
-            formatPatterns attribute.
-        </description>
-        <name>format_validator</name>
-        <tag-class>carstore.FormatValidatorTag</tag-class>
-        <body-content>empty</body-content>
-        <attribute>
-            <description>
-                Defines the format patterns to use to validate the data of
-                the UI component, whose tag encloses the format_validator
-                tag.
-            </description>
-            <name>formatPatterns</name>
-            <required>true</required>
-            <deferred-value>
-                <type>java.lang.String</type>
-            </deferred-value>
-        </attribute>
-    </tag>
-</taglib>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!--
+    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.
+-->
+
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+        version="2.1">
+
+    <!-- ============== Tag Library Description Elements ============= -->
+    <description>
+        This tag library contains tags used by the CarStore application.
+    </description>
+    <tlib-version>1.2</tlib-version>
+    <short-name>cs</short-name>
+    <uri>https://javaserverfaces.dev.java.net/demo/carstore</uri>
+
+    <!-- ===================== ImageMap tags ====================== -->
+    <tag>
+        <description>
+            Defines the format-validator tag, with the
+            tag-handler class, carstore.FormatValidatorTag. This tag
+            must be nested inside a UI component tag. The value of the
+            UI component whose tag encloses the format_validator tag
+            is validated against the format patterns defined by the
+            formatPatterns attribute.
+        </description>
+        <name>format_validator</name>
+        <tag-class>carstore.FormatValidatorTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                Defines the format patterns to use to validate the data of
+                the UI component, whose tag encloses the format_validator
+                tag.
+            </description>
+            <name>formatPatterns</name>
+            <required>true</required>
+            <deferred-value>
+                <type>java.lang.String</type>
+            </deferred-value>
+        </attribute>
+    </tag>
+</taglib>

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/faces-config.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/faces-config.xml Thu Jun 17 21:00:48 2010
@@ -1,28 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <!--
- 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.
 -->
 
 <!-- =========== FULL CONFIGURATION FILE ================================== -->

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml Thu Jun 17 21:00:48 2010
@@ -66,8 +66,8 @@
 
   <filter-mapping>
     <filter-name>plutoPortalDriver</filter-name>
-    <url-pattern>/pluto/index.jsp</url-pattern>
-    <url-pattern>/pluto/index.jsp/*</url-pattern>
+    <url-pattern>/jettypluto/index.jsp</url-pattern>
+    <url-pattern>/jettypluto/index.jsp/*</url-pattern>
   </filter-mapping>
 
   <!-- Servlets and Mappings -->

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/web.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/WEB-INF/web.xml Thu Jun 17 21:00:48 2010
@@ -1,130 +1,124 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!--
- 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
--->
-
-<web-app version="2.5"
-         xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-    <display-name>Car Store</display-name>
-    <description>Buy a car.</description>
-
-    <context-param>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>com.sun.faces.externalizeJavaScript</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-    <context-param>
-        <description>
-            Set this flag to true if you want the JavaServer Faces
-            Reference Implementation to validate the XML in your
-            faces-config.xml resources against the DTD. Default
-            value is false.
-        </description>
-        <param-name>com.sun.faces.validateXml</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-    <!--
-         PENDING: set to false because demo-components.jar has
-         components that can only be created in the context of
-         a current request.
-    -->
-    <context-param>
-        <description>
-            Set this flag to true if you want the JavaServer Faces
-            Reference Implementation to verify that all of the application
-            objects you have configured (components, converters,
-            renderers, and validators) can be successfully created.
-            Default value is false.
-        </description>
-        <param-name>com.sun.faces.verifyObjects</param-name>
-        <param-value>false</param-value>
-    </context-param>
-
-    <!-- Faces Servlet -->
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-
-    <!-- Faces Servlet Mapping -->
-    <!-- 
-
-         This mapping identifies a jsp page as having JSF content.  If a
-         request comes to the server for foo.faces, the container will
-         send the request to the FacesServlet, which will expect a
-         corresponding foo.jsp page to exist containing the content.
-
-    -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.faces</url-pattern>
-    </servlet-mapping>
-
-    <security-constraint>
-        <!-- This security constraint illustrates how JSP pages 
-             with JavaServer Faces components can be protected from
-             being accessed without going through the Faces Servlet.
-             The security constraint ensures that the Faces Servlet will
-             be used or the pages will not be processed. -->
-        <display-name>Restrict access to JSP pages</display-name>
-        <web-resource-collection>
-            <web-resource-name>
-                Restrict access to JSP pages
-            </web-resource-name>
-            <url-pattern>/bottomMatter.jsp</url-pattern>
-            <url-pattern>/carDetail.jsp</url-pattern>
-            <url-pattern>/chooseLocale.jsp</url-pattern>
-            <url-pattern>/confirmChoices.jsp</url-pattern>
-            <url-pattern>/customerInfo.jsp</url-pattern>
-            <url-pattern>/finish.jsp</url-pattern>
-            <url-pattern>/optionsPanel.jsp</url-pattern>
-            <url-pattern>/storeFront.jsp</url-pattern>
-        </web-resource-collection>
-        <auth-constraint>
-            <description>
-                With no roles defined, no access granted
-            </description>
-        </auth-constraint>
-    </security-constraint>
-
-    <!-- Enable encryption for client side state saving -->
-    <env-entry>
-        <env-entry-name>com.sun.faces.ClientStateSavingPassword</env-entry-name>
-        <env-entry-type>java.lang.String</env-entry-type>
-        <env-entry-value>password</env-entry-value>
-    </env-entry>
-
-</web-app>
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<web-app version="2.5"
+         xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+    <display-name>Car Store</display-name>
+    <description>Buy a car.</description>
+
+    <context-param>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>client</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>com.sun.faces.externalizeJavaScript</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <context-param>
+        <description>
+            Set this flag to true if you want the JavaServer Faces
+            Reference Implementation to validate the XML in your
+            faces-config.xml resources against the DTD. Default
+            value is false.
+        </description>
+        <param-name>com.sun.faces.validateXml</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <!--
+         PENDING: set to false because demo-components.jar has
+         components that can only be created in the context of
+         a current request.
+    -->
+    <context-param>
+        <description>
+            Set this flag to true if you want the JavaServer Faces
+            Reference Implementation to verify that all of the application
+            objects you have configured (components, converters,
+            renderers, and validators) can be successfully created.
+            Default value is false.
+        </description>
+        <param-name>com.sun.faces.verifyObjects</param-name>
+        <param-value>false</param-value>
+    </context-param>
+
+    <!-- Faces Servlet -->
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+
+    <!-- Faces Servlet Mapping -->
+    <!-- 
+
+         This mapping identifies a jsp page as having JSF content.  If a
+         request comes to the server for foo.faces, the container will
+         send the request to the FacesServlet, which will expect a
+         corresponding foo.jsp page to exist containing the content.
+
+    -->
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.faces</url-pattern>
+    </servlet-mapping>
+
+    <security-constraint>
+        <!-- This security constraint illustrates how JSP pages 
+             with JavaServer Faces components can be protected from
+             being accessed without going through the Faces Servlet.
+             The security constraint ensures that the Faces Servlet will
+             be used or the pages will not be processed. -->
+        <display-name>Restrict access to JSP pages</display-name>
+        <web-resource-collection>
+            <web-resource-name>
+                Restrict access to JSP pages
+            </web-resource-name>
+            <url-pattern>/bottomMatter.jsp</url-pattern>
+            <url-pattern>/carDetail.jsp</url-pattern>
+            <url-pattern>/chooseLocale.jsp</url-pattern>
+            <url-pattern>/confirmChoices.jsp</url-pattern>
+            <url-pattern>/customerInfo.jsp</url-pattern>
+            <url-pattern>/finish.jsp</url-pattern>
+            <url-pattern>/optionsPanel.jsp</url-pattern>
+            <url-pattern>/storeFront.jsp</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <description>
+                With no roles defined, no access granted
+            </description>
+        </auth-constraint>
+    </security-constraint>
+
+    <!-- Enable encryption for client side state saving -->
+    <env-entry>
+        <env-entry-name>com.sun.faces.ClientStateSavingPassword</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>password</env-entry-value>
+    </env-entry>
+
+</web-app>

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/bottomMatter.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/bottomMatter.jsp?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/bottomMatter.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/bottomMatter.jsp Thu Jun 17 21:00:48 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.
 -->
 <%@ page contentType="text/html"
          isELIgnored="false" %>

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/carDetail.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/carDetail.jsp?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/carDetail.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/carDetail.jsp Thu Jun 17 21:00:48 2010
@@ -1,28 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 
 <!--
-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.
 -->
 
 <%@ page contentType="text/html"

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/chooseLocale.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/chooseLocale.jsp?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/chooseLocale.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/chooseLocale.jsp Thu Jun 17 21:00:48 2010
@@ -1,27 +1,21 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <!--
-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.
 -->
 <%@ page contentType="text/html"
          isELIgnored="false" %>

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/confirmChoices.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/confirmChoices.jsp?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/confirmChoices.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/confirmChoices.jsp Thu Jun 17 21:00:48 2010
@@ -1,27 +1,21 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <!--
-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.
 -->
 
 <%@ page contentType="text/html"

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/customerInfo.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/customerInfo.jsp?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/customerInfo.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/customerInfo.jsp Thu Jun 17 21:00:48 2010
@@ -1,27 +1,21 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <!--
-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.
 -->
 
 <%@ page contentType="text/html"

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/finish.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/finish.jsp?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/finish.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/finish.jsp Thu Jun 17 21:00:48 2010
@@ -1,27 +1,21 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <!--
-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.
 -->
 
 <%@ page contentType="text/html"

Added: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/index.jsp?rev=955744&view=auto
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/index.jsp (added)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/index.jsp Thu Jun 17 21:00:48 2010
@@ -0,0 +1,39 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--
+/* 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.
+-->
+<html>
+<head>
+</head>
+
+<body>
+
+<!--  
+
+This page allows the user to go to the context-path and get redirected
+to the front page of the app.  For example,
+http://localhost:8080/jsf-carstore/.  Note that we use "*.faces" as the
+page mapping.  Doing so allows us to just name our pages as "*.jsp",
+refer to them as "*.faces" and know that they will be properly picked up
+by the container.
+
+-->
+
+<jsp:forward page="chooseLocale.faces"/>
+</body>
+</html>