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 [3/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/...

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Messages_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/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/resources/carstore/bundles/Messages_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/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}

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Messages_fr.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Messages_fr.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Messages_fr.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Messages_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.
+#
+#
 #
 
 carstore.Format_Invalid=L'entr\u00e9 doit assortir un des mod'les suivants {0}

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/OptionPrices.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/OptionPrices.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/OptionPrices.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/OptionPrices.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.
+#
+#
 #
 V4=100
 V6=200

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Performance.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Performance.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Performance.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Performance.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=true

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources.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.
+#
+#
 #
 
 #

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_de.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_de.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_de.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_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.
+#
+#
 #
 
 carDetails=Here are the details for your car.

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_en.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_en.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_en.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_en.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.
+#
+#
 #
 
 #

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_es.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_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.
+#
+#
 #
 
 carDetails=Here are the details for your car.

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_fr.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_fr.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_fr.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Resources_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.
+#
+#
 #
 
 carDetails=Here are the details for your car.

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster.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 Roadster

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_de.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_de.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_de.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_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 Roadster

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_es.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_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.
+#
+#
 #
 title=El coche MLC de Duke.
 title_componentType=javax.faces.Output

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_fr.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_fr.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_fr.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_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.
+#
+#
 #
 
 title=La sportive de Duke

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_options.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_options.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_options.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Roadster_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 Roadster

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV.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 SUV

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_de.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_de.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_de.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_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 SUV

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_es.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_es.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_es.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_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 SUV

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_fr.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_fr.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_fr.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_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 SUV

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_options.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_options.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_options.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/SUV_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 SUV

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Standard.properties
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Standard.properties?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Standard.properties (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/resources/carstore/bundles/Standard.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=true

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/carstore.tld
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/carstore.tld?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/carstore.tld (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/carstore.tld Wed Jun 30 22:39:41 2010
@@ -1,28 +1,22 @@
 <?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
+    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"

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/faces-config.xml?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/faces-config.xml Wed Jun 30 22:39:41 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_2.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml Wed Jun 30 22:39:41 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_2.0.x/examples/carstore/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/web.xml?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/WEB-INF/web.xml Wed Jun 30 22:39:41 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.
 -->
 
 <web-app version="2.5"

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/bottomMatter.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/bottomMatter.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/bottomMatter.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/bottomMatter.jsp 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.
 -->
 <%@ page contentType="text/html"
          isELIgnored="false" %>

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/carDetail.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/carDetail.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/carDetail.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/carDetail.jsp Wed Jun 30 22:39:41 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_2.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp Wed Jun 30 22:39:41 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_2.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp Wed Jun 30 22:39:41 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_2.0.x/examples/carstore/src/main/webapp/customerInfo.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/customerInfo.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/customerInfo.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/customerInfo.jsp Wed Jun 30 22:39:41 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_2.0.x/examples/carstore/src/main/webapp/finish.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/finish.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/finish.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/finish.jsp Wed Jun 30 22:39:41 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_2.0.x/examples/carstore/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/index.jsp?rev=959467&view=auto
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/index.jsp (added)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/index.jsp Wed Jun 30 22:39:41 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>

Added: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/jettypluto/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/jettypluto/index.jsp?rev=959467&view=auto
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/jettypluto/index.jsp (added)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/jettypluto/index.jsp Wed Jun 30 22:39:41 2010
@@ -0,0 +1,109 @@
+<!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.
+-->
+
+<%@ page contentType="text/html"
+         isELIgnored="false" %>
+         
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+
+<html>
+<head>
+    <title>Pluto Portal</title>
+    <style type="text/css" title="currentStyle" media="screen">
+        @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
+        @import "<c:out value="${pageContext.request.contextPath}"/>/portlet-spec-1.0.css";
+        <c:forEach items="${org_apache_pluto_embedded_extraStyles}" var="style">
+	    @import "<c:out value="${pageContext.request.contextPath}"/><c:out value="${style}"/>";
+	    </c:forEach>
+    </style>
+    <script type="text/javascript" src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js">
+    </script>
+</head>
+
+<body>
+
+<div id="portal">
+
+    <!-- Header block: the Apache Pluto banner image and description -->
+    <div id="header">
+        <h1>Apache Pluto</h1>
+
+        <p>An Apache Portals Project</p>
+    </div>
+
+    <!-- Logout link -->
+    <c:if test="${pageContext.request.remoteUser != null}">
+        <div id="logout">
+            <a href="<c:url value='/Logout'/>">Logout</a>
+        </div>
+    </c:if>
+    
+    
+    <!-- Content block: portlets are divided into two columns/groups -->
+    <div id="content">
+        <pluto:isMaximized var="isMax"/>
+
+        <!-- Left column -->
+        <c:choose>
+            <c:when test="${isMax}">
+                    <c:forEach var="portlet" varStatus="status"
+                               items="${org_apache_pluto_embedded_portletIds}">
+                        <c:set var="portlet" value="${portlet}" scope="request"/>
+                        <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+                    </c:forEach>
+             </c:when>
+
+            <c:otherwise>
+                <div id="portlets-left-column">
+                    <c:forEach var="portlet" varStatus="status"
+                               items="${org_apache_pluto_embedded_portletIds}" step="2">
+                        <c:set var="portlet" value="${portlet}" scope="request"/>
+                        <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+                    </c:forEach>
+                </div>
+
+                <!-- Right column -->
+                <div id="portlets-right-column">
+                    <c:forEach var="portlet" varStatus="status"
+                               items="${org_apache_pluto_embedded_portletIds}" begin="1" step="2">
+                        <c:set var="portlet" value="${portlet}" scope="request"/>
+                        <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+                    </c:forEach>
+                </div>
+
+            </c:otherwise>
+        </c:choose>
+
+    </div>
+
+
+
+    <!-- Footer block: copyright -->
+    <div id="footer">
+        &copy; 2003-2005 Apache Software Foundation
+    </div>
+
+</div>
+
+</body>
+
+</html>
+

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/optionsPanel.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/optionsPanel.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/optionsPanel.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/optionsPanel.jsp 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.
 -->
 <%@ page contentType="text/html"
          isELIgnored="false" %>

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/storeFront.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/storeFront.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/storeFront.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/storeFront.jsp 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.
 -->
 
 <%@ page contentType="text/html"

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/stylesheet.css
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/stylesheet.css?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/stylesheet.css (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/carstore/src/main/webapp/stylesheet.css 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.
+ *
  */
 
 body {

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/NumberBean.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/NumberBean.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/NumberBean.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/NumberBean.java Wed Jun 30 22:39:41 2010
@@ -1,16 +1,21 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ /* 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 guess;
 

Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/facelets/PortletFaceletViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/facelets/PortletFaceletViewHandler.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/facelets/PortletFaceletViewHandler.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/facelets-guess/src/main/java/guess/facelets/PortletFaceletViewHandler.java Wed Jun 30 22:39:41 2010
@@ -1,16 +1,21 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ /* 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 guess.facelets;