You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bridges-commits@portals.apache.org by at...@apache.org on 2007/03/12 02:45:04 UTC
svn commit: r517068 [6/9] - in /portals/bridges/trunk: ./ applications/
applications/jpetstore/ applications/jpetstore/src/java/
applications/jpetstore/src/java/com/ibatis/jpetstore/domain/
applications/jpetstore/src/java/com/ibatis/jpetstore/persisten...
Modified: portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/tags/spring.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/tags/spring.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/tags/spring.tld (original)
+++ portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/tags/spring.tld Sun Mar 11 18:44:37 2007
@@ -1,323 +1,339 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
-<taglib>
-
- <tlib-version>1.1.2</tlib-version>
-
- <jsp-version>1.2</jsp-version>
-
- <short-name>Spring</short-name>
-
- <uri>http://www.springframework.org/tags</uri>
-
- <description>Spring Framework JSP Tag Library. Authors: Rod Johnson, Juergen Hoeller</description>
-
-
- <tag>
-
- <name>htmlEscape</name>
- <tag-class>org.springframework.web.servlet.tags.HtmlEscapeTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Sets default HTML escape value for the current page.
- Overrides a "defaultHtmlEscape" context-param in web.xml, if any.
- </description>
-
- <attribute>
- <name>defaultHtmlEscape</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>escapeBody</name>
- <tag-class>org.springframework.web.servlet.tags.EscapeBodyTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Escapes its enclosed body content, applying HTML escaping and/or JavaScript escaping.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>javaScriptEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>message</name>
- <tag-class>org.springframework.web.servlet.tags.MessageTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Retrieves the message with the given code, or text if code isn't resolvable.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <attribute>
- <name>message</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>code</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>arguments</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>argumentSeparator</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>text</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>javaScriptEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>theme</name>
- <tag-class>org.springframework.web.servlet.tags.ThemeTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Retrieves the theme message with the given code, or text if code isn't resolvable.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <attribute>
- <name>code</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>arguments</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>text</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>javaScriptEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>hasBindErrors</name>
- <tag-class>org.springframework.web.servlet.tags.BindErrorsTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Provides Errors instance in case of bind errors.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <variable>
- <name-given>errors</name-given>
- <variable-class>org.springframework.validation.Errors</variable-class>
- </variable>
-
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>nestedPath</name>
- <tag-class>org.springframework.web.servlet.tags.NestedPathTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Sets a nested path to be used by the bind tag's path.
- </description>
-
- <variable>
- <name-given>nestedPath</name-given>
- <variable-class>java.lang.String</variable-class>
- </variable>
-
- <attribute>
- <name>path</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>bind</name>
- <tag-class>org.springframework.web.servlet.tags.BindTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Provides BindStatus object for the given bind path.
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <variable>
- <name-given>status</name-given>
- <variable-class>org.springframework.web.servlet.support.BindStatus</variable-class>
- </variable>
-
- <attribute>
- <name>path</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>ignoreNestedPath</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- </tag>
-
-
- <tag>
-
- <name>transform</name>
- <tag-class>org.springframework.web.servlet.tags.TransformTag</tag-class>
- <body-content>JSP</body-content>
-
- <description>
- Provides transformation of variables to Strings, using an appropriate
- custom PropertyEditor from BindTag (can only be used inside BindTag).
- The HTML escaping flag participates in a page-wide or application-wide setting
- (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
- </description>
-
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
-
- <attribute>
- <name>htmlEscape</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </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.
+-->
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+
+ <tlib-version>1.1.2</tlib-version>
+
+ <jsp-version>1.2</jsp-version>
+
+ <short-name>Spring</short-name>
+
+ <uri>http://www.springframework.org/tags</uri>
+
+ <description>Spring Framework JSP Tag Library. Authors: Rod Johnson, Juergen Hoeller</description>
+
+
+ <tag>
+
+ <name>htmlEscape</name>
+ <tag-class>org.springframework.web.servlet.tags.HtmlEscapeTag</tag-class>
+ <body-content>JSP</body-content>
+
+ <description>
+ Sets default HTML escape value for the current page.
+ Overrides a "defaultHtmlEscape" context-param in web.xml, if any.
+ </description>
+
+ <attribute>
+ <name>defaultHtmlEscape</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ </tag>
+
+
+ <tag>
+
+ <name>escapeBody</name>
+ <tag-class>org.springframework.web.servlet.tags.EscapeBodyTag</tag-class>
+ <body-content>JSP</body-content>
+
+ <description>
+ Escapes its enclosed body content, applying HTML escaping and/or JavaScript escaping.
+ The HTML escaping flag participates in a page-wide or application-wide setting
+ (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+ </description>
+
+ <attribute>
+ <name>htmlEscape</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>javaScriptEscape</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ </tag>
+
+
+ <tag>
+
+ <name>message</name>
+ <tag-class>org.springframework.web.servlet.tags.MessageTag</tag-class>
+ <body-content>JSP</body-content>
+
+ <description>
+ Retrieves the message with the given code, or text if code isn't resolvable.
+ The HTML escaping flag participates in a page-wide or application-wide setting
+ (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+ </description>
+
+ <attribute>
+ <name>message</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>code</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>arguments</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>argumentSeparator</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>text</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>htmlEscape</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>javaScriptEscape</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ </tag>
+
+
+ <tag>
+
+ <name>theme</name>
+ <tag-class>org.springframework.web.servlet.tags.ThemeTag</tag-class>
+ <body-content>JSP</body-content>
+
+ <description>
+ Retrieves the theme message with the given code, or text if code isn't resolvable.
+ The HTML escaping flag participates in a page-wide or application-wide setting
+ (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+ </description>
+
+ <attribute>
+ <name>code</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>arguments</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>text</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>htmlEscape</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>javaScriptEscape</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ </tag>
+
+
+ <tag>
+
+ <name>hasBindErrors</name>
+ <tag-class>org.springframework.web.servlet.tags.BindErrorsTag</tag-class>
+ <body-content>JSP</body-content>
+
+ <description>
+ Provides Errors instance in case of bind errors.
+ The HTML escaping flag participates in a page-wide or application-wide setting
+ (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+ </description>
+
+ <variable>
+ <name-given>errors</name-given>
+ <variable-class>org.springframework.validation.Errors</variable-class>
+ </variable>
+
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>htmlEscape</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ </tag>
+
+
+ <tag>
+
+ <name>nestedPath</name>
+ <tag-class>org.springframework.web.servlet.tags.NestedPathTag</tag-class>
+ <body-content>JSP</body-content>
+
+ <description>
+ Sets a nested path to be used by the bind tag's path.
+ </description>
+
+ <variable>
+ <name-given>nestedPath</name-given>
+ <variable-class>java.lang.String</variable-class>
+ </variable>
+
+ <attribute>
+ <name>path</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ </tag>
+
+
+ <tag>
+
+ <name>bind</name>
+ <tag-class>org.springframework.web.servlet.tags.BindTag</tag-class>
+ <body-content>JSP</body-content>
+
+ <description>
+ Provides BindStatus object for the given bind path.
+ The HTML escaping flag participates in a page-wide or application-wide setting
+ (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+ </description>
+
+ <variable>
+ <name-given>status</name-given>
+ <variable-class>org.springframework.web.servlet.support.BindStatus</variable-class>
+ </variable>
+
+ <attribute>
+ <name>path</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>ignoreNestedPath</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>htmlEscape</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ </tag>
+
+
+ <tag>
+
+ <name>transform</name>
+ <tag-class>org.springframework.web.servlet.tags.TransformTag</tag-class>
+ <body-content>JSP</body-content>
+
+ <description>
+ Provides transformation of variables to Strings, using an appropriate
+ custom PropertyEditor from BindTag (can only be used inside BindTag).
+ The HTML escaping flag participates in a page-wide or application-wide setting
+ (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+ </description>
+
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
+ <name>htmlEscape</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ </tag>
+
+</taglib>
Modified: portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/view/domTreeView.vm
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/view/domTreeView.vm?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/view/domTreeView.vm (original)
+++ portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/view/domTreeView.vm Sun Mar 11 18:44:37 2007
@@ -1,37 +1,53 @@
-#macro (traverseNodes $n $domNodeHelper)
- #if ( ! $domNodeHelper.isDocumentNode( $n ) )
- <div dojoType="TreeNode" title="$n.getNodeName()">
- #end
- #if ( $n.hasChildNodes() )
- #foreach ( $childNode in $domNodeHelper.createNodeList( $n.getChildNodes() ) )
- #if ( $domNodeHelper.isElementNode( $childNode ) )
- #traverseNodes($childNode $domNodeHelper)
- #elseif ( $domNodeHelper.isNonEmptyTextNode( $childNode ) )
- <div dojoType="TreeNode" title="$domNodeHelper.replaceLineBreaks( $n.getNodeValue() )"></div>
- #end
- #end
- #end
- #if ( ! $domNodeHelper.isDocumentNode( $n ) )
- </div>
- #end
-#end
-
-#set ($messages = $model.messages)
-
-<div dojoType="LayoutContainer" layoutChildPriority="left-right" style="width: 100%">
-<div id="mainTabContainer" dojoType="TabContainer" style="width: 100%; height: 304px">
-#foreach ( $domTree in $model.domTreeList )
- <div dojoType="ContentPane" label="$domTree.getName()" style="width: 100%; height: 100%; overflow-x: hidden; overflow-y: auto; padding: 3px">
- #if ( $domTree.getParsedDocument() )
- <div dojoType="Tree">
- #traverseNodes($domTree.getParsedDocument() $model.domNodeHelper)
- </div>
- #else
- #if ( $domTree.getMessage() )
- <div>$model.messages.getString( $domTree.getMessage() )</div>
- #end
- #end
- </div>
-#end
-</div>
+#*
+ 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.
+*#
+#macro (traverseNodes $n $domNodeHelper)
+ #if ( ! $domNodeHelper.isDocumentNode( $n ) )
+ <div dojoType="TreeNode" title="$n.getNodeName()">
+ #end
+ #if ( $n.hasChildNodes() )
+ #foreach ( $childNode in $domNodeHelper.createNodeList( $n.getChildNodes() ) )
+ #if ( $domNodeHelper.isElementNode( $childNode ) )
+ #traverseNodes($childNode $domNodeHelper)
+ #elseif ( $domNodeHelper.isNonEmptyTextNode( $childNode ) )
+ <div dojoType="TreeNode" title="$domNodeHelper.replaceLineBreaks( $n.getNodeValue() )"></div>
+ #end
+ #end
+ #end
+ #if ( ! $domNodeHelper.isDocumentNode( $n ) )
+ </div>
+ #end
+#end
+
+#set ($messages = $model.messages)
+
+<div dojoType="LayoutContainer" layoutChildPriority="left-right" style="width: 100%">
+<div id="mainTabContainer" dojoType="TabContainer" style="width: 100%; height: 304px">
+#foreach ( $domTree in $model.domTreeList )
+ <div dojoType="ContentPane" label="$domTree.getName()" style="width: 100%; height: 100%; overflow-x: hidden; overflow-y: auto; padding: 3px">
+ #if ( $domTree.getParsedDocument() )
+ <div dojoType="Tree">
+ #traverseNodes($domTree.getParsedDocument() $model.domNodeHelper)
+ </div>
+ #else
+ #if ( $domTree.getMessage() )
+ <div>$model.messages.getString( $domTree.getMessage() )</div>
+ #end
+ #end
+ </div>
+#end
+</div>
</div>
Modified: portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/web.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/web.xml (original)
+++ portals/bridges/trunk/applications/springmvc/src/webapp/WEB-INF/web.xml Sun Mar 11 18:44:37 2007
@@ -1,4 +1,20 @@
<?xml version="1.0"?>
+<!--
+ 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.
+-->
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
Modified: portals/bridges/trunk/applications/springmvc/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/springmvc/xdocs/navigation.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/applications/springmvc/xdocs/navigation.xml (original)
+++ portals/bridges/trunk/applications/springmvc/xdocs/navigation.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Copyright 2004 The Apache Software Foundation
-
- 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
+ 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
Modified: portals/bridges/trunk/checkstyle.license
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/checkstyle.license?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/checkstyle.license (original)
+++ portals/bridges/trunk/checkstyle.license Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright (\d\d\d\d-)+2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/checkstyle.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/checkstyle.xml (original)
+++ portals/bridges/trunk/checkstyle.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<!--
-Copyright 2004 The Apache Software Foundation
-
-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
+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
Modified: portals/bridges/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/pom.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/pom.xml (original)
+++ portals/bridges/trunk/common/pom.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2006 The Apache Software Foundation
-
-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
+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
@@ -31,7 +32,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-RC</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
Modified: portals/bridges/trunk/common/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/project.properties?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/project.properties (original)
+++ portals/bridges/trunk/common/project.properties Sun Mar 11 18:44:37 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# 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
+# 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
#
Modified: portals/bridges/trunk/common/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/project.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/project.xml (original)
+++ portals/bridges/trunk/common/project.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2004 The Apache Software Foundation
-
-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
+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
@@ -30,4 +31,16 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/bridges/trunk/common</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/portals/bridges/trunk/common/</url>
</repository>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: portals/bridges/trunk/common/src/java/org/apache/portals/bridges/beans/TabBean.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/src/java/org/apache/portals/bridges/beans/TabBean.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/src/java/org/apache/portals/bridges/beans/TabBean.java (original)
+++ portals/bridges/trunk/common/src/java/org/apache/portals/bridges/beans/TabBean.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/GenericServletPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/GenericServletPortlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/GenericServletPortlet.java (original)
+++ portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/GenericServletPortlet.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ScriptPostProcess.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ScriptPostProcess.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ScriptPostProcess.java (original)
+++ portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ScriptPostProcess.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ScriptRuntimeData.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ScriptRuntimeData.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ScriptRuntimeData.java (original)
+++ portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ScriptRuntimeData.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ServletContextProvider.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ServletContextProvider.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ServletContextProvider.java (original)
+++ portals/bridges/trunk/common/src/java/org/apache/portals/bridges/common/ServletContextProvider.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/PortletWindowUtils.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/PortletWindowUtils.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/PortletWindowUtils.java (original)
+++ portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/PortletWindowUtils.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/PreferencesHelper.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/PreferencesHelper.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/PreferencesHelper.java (original)
+++ portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/PreferencesHelper.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/ServletPortletSessionProxy.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/ServletPortletSessionProxy.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/ServletPortletSessionProxy.java (original)
+++ portals/bridges/trunk/common/src/java/org/apache/portals/bridges/util/ServletPortletSessionProxy.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/common/src/java/org/apache/portals/messaging/PortletMessaging.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/src/java/org/apache/portals/messaging/PortletMessaging.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/src/java/org/apache/portals/messaging/PortletMessaging.java (original)
+++ portals/bridges/trunk/common/src/java/org/apache/portals/messaging/PortletMessaging.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/common/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/common/xdocs/navigation.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/common/xdocs/navigation.xml (original)
+++ portals/bridges/trunk/common/xdocs/navigation.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-Copyright 2004 The Apache Software Foundation
-
-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
+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
Modified: portals/bridges/trunk/frameworks/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/pom.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/pom.xml (original)
+++ portals/bridges/trunk/frameworks/pom.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2006 The Apache Software Foundation
-
-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
+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
@@ -31,7 +32,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-RC</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
Modified: portals/bridges/trunk/frameworks/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/project.properties?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/project.properties (original)
+++ portals/bridges/trunk/frameworks/project.properties Sun Mar 11 18:44:37 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# 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
+# 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
#
Modified: portals/bridges/trunk/frameworks/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/project.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/project.xml (original)
+++ portals/bridges/trunk/frameworks/project.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2004 The Apache Software Foundation
-
- 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
+ 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
@@ -102,6 +103,13 @@
<include>**/*.xml</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
</build>
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ExternalComponentSupport.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ExternalComponentSupport.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ExternalComponentSupport.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ExternalComponentSupport.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ForwardConstants.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ForwardConstants.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ForwardConstants.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ForwardConstants.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ForwardTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ForwardTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ForwardTag.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/ForwardTag.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/Forwarder.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/Forwarder.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/Forwarder.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/Forwarder.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/FrameworkConstants.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/FrameworkConstants.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/FrameworkConstants.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/FrameworkConstants.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/GenericFrameworkPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/GenericFrameworkPortlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/GenericFrameworkPortlet.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/GenericFrameworkPortlet.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/Lookup.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/Lookup.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/Lookup.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/Lookup.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/VelocityFrameworkPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/VelocityFrameworkPortlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/VelocityFrameworkPortlet.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/VelocityFrameworkPortlet.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/model/ModelBean.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/model/ModelBean.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/model/ModelBean.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/model/ModelBean.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/model/PortletApplicationModel.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/model/PortletApplicationModel.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/model/PortletApplicationModel.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/model/PortletApplicationModel.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/ModelBeanImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/ModelBeanImpl.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/ModelBeanImpl.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/ModelBeanImpl.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/PortletApplicationModelImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/PortletApplicationModelImpl.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/PortletApplicationModelImpl.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/PortletApplicationModelImpl.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/validation/ValidationSupport.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/validation/ValidationSupport.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/validation/ValidationSupport.java (original)
+++ portals/bridges/trunk/frameworks/src/java/org/apache/portals/bridges/frameworks/spring/validation/ValidationSupport.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/frameworks/webapp/WEB-INF/bridges-frameworks.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/webapp/WEB-INF/bridges-frameworks.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/webapp/WEB-INF/bridges-frameworks.tld (original)
+++ portals/bridges/trunk/frameworks/webapp/WEB-INF/bridges-frameworks.tld Sun Mar 11 18:44:37 2007
@@ -3,10 +3,12 @@
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
<!--
-Copyright 2004 The Apache Software Foundation
-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
+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
Modified: portals/bridges/trunk/frameworks/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/frameworks/xdocs/navigation.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/frameworks/xdocs/navigation.xml (original)
+++ portals/bridges/trunk/frameworks/xdocs/navigation.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-Copyright 2004 The Apache Software Foundation
-
-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
+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
Modified: portals/bridges/trunk/jsf/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/pom.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/pom.xml (original)
+++ portals/bridges/trunk/jsf/pom.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2006 The Apache Software Foundation
-
-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
+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
@@ -31,7 +32,7 @@
<parent>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-RC</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
Modified: portals/bridges/trunk/jsf/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/project.properties?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/project.properties (original)
+++ portals/bridges/trunk/jsf/project.properties Sun Mar 11 18:44:37 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# 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
+# 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
#
Modified: portals/bridges/trunk/jsf/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/project.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/project.xml (original)
+++ portals/bridges/trunk/jsf/project.xml Sun Mar 11 18:44:37 2007
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2004 The Apache Software Foundation
-
-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
+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
@@ -72,6 +73,13 @@
<directory>${basedir}/src/java</directory>
<includes>
<include>META-INF/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
</includes>
</resource>
</resources>
Modified: portals/bridges/trunk/jsf/src/java/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/META-INF/faces-config.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/META-INF/faces-config.xml (original)
+++ portals/bridges/trunk/jsf/src/java/META-INF/faces-config.xml Sun Mar 11 18:44:37 2007
@@ -5,11 +5,12 @@
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/AbstractAttributeMap.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/AbstractAttributeMap.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/AbstractAttributeMap.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/AbstractAttributeMap.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/ApplicationMap.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/ApplicationMap.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/ApplicationMap.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/ApplicationMap.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/EnumerationIterator.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/EnumerationIterator.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/EnumerationIterator.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/EnumerationIterator.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesContextFactoryImpl.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesContextFactoryImpl.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesContextFactoryImpl.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/InitParameterMap.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/InitParameterMap.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/InitParameterMap.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/InitParameterMap.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/NullEnumeration.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/NullEnumeration.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/NullEnumeration.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/NullEnumeration.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/NullIterator.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/NullIterator.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/NullIterator.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/NullIterator.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletExternalContextImpl.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletExternalContextImpl.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletExternalContextImpl.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletFacesContextImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletFacesContextImpl.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletFacesContextImpl.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletFacesContextImpl.java Sun Mar 11 18:44:37 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * 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
+ * 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
*
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletUIViewRoot.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletUIViewRoot.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletUIViewRoot.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletUIViewRoot.java Sun Mar 11 18:44:37 2007
@@ -1,17 +1,18 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * 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
*
- * 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
+ * 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.
+ * 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 org.apache.portals.bridges.jsf;
---------------------------------------------------------------------
To unsubscribe, e-mail: bridges-commits-unsubscribe@portals.apache.org
For additional commands, e-mail: bridges-commits-help@portals.apache.org