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 [8/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/php/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/project.properties?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/project.properties (original)
+++ portals/bridges/trunk/php/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/php/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/project.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/project.xml (original)
+++ portals/bridges/trunk/php/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
Modified: portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPApplicationPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPApplicationPortlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPApplicationPortlet.java (original)
+++ portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPApplicationPortlet.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/php/src/java/org/apache/portals/bridges/php/PHPParameters.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPParameters.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPParameters.java (original)
+++ portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPParameters.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/php/src/java/org/apache/portals/bridges/php/PHPServletContextProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPServletContextProviderImpl.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPServletContextProviderImpl.java (original)
+++ portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/PHPServletContextProviderImpl.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/php/src/java/org/apache/portals/bridges/php/ServletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/ServletConfigImpl.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/ServletConfigImpl.java (original)
+++ portals/bridges/trunk/php/src/java/org/apache/portals/bridges/php/ServletConfigImpl.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/php/xdocs/demo.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/xdocs/demo.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/xdocs/demo.xml (original)
+++ portals/bridges/trunk/php/xdocs/demo.xml Sun Mar 11 18:44:37 2007
@@ -1,49 +1,50 @@
-<?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
-
- 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.
--->
-<document>
- <properties>
- <title>PHP Bridge Demo</title>
- <authors>
- <person name="Roger Ruttimann" email="rogerrut@apache.org"/>
- </authors>
- </properties>
- <body>
- <section name="Setting up the PHP Demo">
-<p>
-The php demo uses a backed database (MySQL) that simulates
-a simple machine database.
-</p>
-<p>
-the php file in hosts/conf/config.php defines the database and
-the connection parameter that the application will use. Change
-it to your needs.
-</p>
-<p>
-Create a database (I used hosts) and populate it with the script
-found in sql/php-demo.sql
-</p>
-<p>
-The php-demo portlet is configured to use the following start page:
-hosts/index.php
-</p>
-<p>
-That's it!
-Questions/problems: jetspeed-user@portals.apache.org
-</p>
-</section>
-</body>
-</document>
+<?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.
+-->
+<document>
+ <properties>
+ <title>PHP Bridge Demo</title>
+ <authors>
+ <person name="Roger Ruttimann" email="rogerrut@apache.org"/>
+ </authors>
+ </properties>
+ <body>
+ <section name="Setting up the PHP Demo">
+<p>
+The php demo uses a backed database (MySQL) that simulates
+a simple machine database.
+</p>
+<p>
+the php file in hosts/conf/config.php defines the database and
+the connection parameter that the application will use. Change
+it to your needs.
+</p>
+<p>
+Create a database (I used hosts) and populate it with the script
+found in sql/php-demo.sql
+</p>
+<p>
+The php-demo portlet is configured to use the following start page:
+hosts/index.php
+</p>
+<p>
+That's it!
+Questions/problems: jetspeed-user@portals.apache.org
+</p>
+</section>
+</body>
+</document>
Modified: portals/bridges/trunk/php/xdocs/getting-started.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/xdocs/getting-started.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/xdocs/getting-started.xml (original)
+++ portals/bridges/trunk/php/xdocs/getting-started.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/php/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/xdocs/index.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/xdocs/index.xml (original)
+++ portals/bridges/trunk/php/xdocs/index.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/php/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/xdocs/navigation.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/xdocs/navigation.xml (original)
+++ portals/bridges/trunk/php/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/php/xdocs/portlets.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/php/xdocs/portlets.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/php/xdocs/portlets.xml (original)
+++ portals/bridges/trunk/php/xdocs/portlets.xml Sun Mar 11 18:44:37 2007
@@ -1,38 +1,39 @@
-<?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
-
- 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.
--->
-<document>
- <properties>
- <title>PHP Bridge Demo</title>
- <authors>
- <person name="Roger Ruttimann" email="rogerrut@apache.org"/>
- </authors>
- </properties>
- <body>
- <section name="Configuring Portlets">
-<p>
-To configure a PHP application into your portlet definition, define an init param
-to hold the PHP start page. For example:
-</p>
-<source><![CDATA[
- <init-param>
- <name>StartPage</name>
- <value>hosts/index.php</value>
- </init-param>
-]]></source>
-</section>
-</body>
-</document>
+<?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.
+-->
+<document>
+ <properties>
+ <title>PHP Bridge Demo</title>
+ <authors>
+ <person name="Roger Ruttimann" email="rogerrut@apache.org"/>
+ </authors>
+ </properties>
+ <body>
+ <section name="Configuring Portlets">
+<p>
+To configure a PHP application into your portlet definition, define an init param
+to hold the PHP start page. For example:
+</p>
+<source><![CDATA[
+ <init-param>
+ <name>StartPage</name>
+ <value>hosts/index.php</value>
+ </init-param>
+]]></source>
+</section>
+</body>
+</document>
Modified: portals/bridges/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/pom.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/pom.xml (original)
+++ portals/bridges/trunk/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
@@ -29,7 +30,7 @@
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-RC</version>
<packaging>pom</packaging>
<name>Portals Bridges</name>
<description>
@@ -72,7 +73,7 @@
<!-- Default Build Properties -->
<maven.test.skip>true</maven.test.skip>
- <jetspeed.version>2.1</jetspeed.version>
+ <jetspeed.version>2.1.1-RC</jetspeed.version>
<javax.servlet.version>2.3</javax.servlet.version>
<junit.version>3.8.1</junit.version>
<portlet-api.version>1.0</portlet-api.version>
@@ -91,7 +92,7 @@
<commons-logging.version>1.0.4</commons-logging.version>
<commons-collections.version>3.0</commons-collections.version>
- <jetspeed.version>2.1</jetspeed.version>
+ <jetspeed.version>2.1.1-RC</jetspeed.version>
<struts.version>1.2.7</struts.version>
<myfaces.version>1.1.4</myfaces.version>
<tomahawk.version>1.1.4</tomahawk.version>
@@ -100,16 +101,16 @@
<log4j.version>1.2.8</log4j.version>
<castor.version>0.9.4.3</castor.version>
- <org.apache.portals.bridges.common.version>1.0.1</org.apache.portals.bridges.common.version>
- <org.apache.portals.bridges.frameworks.version>1.0.1</org.apache.portals.bridges.frameworks.version>
- <org.apache.portals.bridges.jpetstore.version>1.0.1</org.apache.portals.bridges.jpetstore.version>
- <org.apache.portals.bridges.jsf-demo.version>1.0.1</org.apache.portals.bridges.jsf-demo.version>
- <org.apache.portals.bridges.jsf.version>1.0.1</org.apache.portals.bridges.jsf.version>
- <org.apache.portals.bridges.perl.version>1.0.1</org.apache.portals.bridges.perl.version>
- <org.apache.portals.bridges.php.version>1.0.1</org.apache.portals.bridges.php.version>
- <org.apache.portals.bridges.velocity.version>1.0.1</org.apache.portals.bridges.velocity.version>
- <org.apache.portals.bridges.portletfilter.version>1.0.1</org.apache.portals.bridges.portletfilter.version>
- <portals.bridges.struts.version>1.0.1</portals.bridges.struts.version>
+ <org.apache.portals.bridges.common.version>1.0.2-RC</org.apache.portals.bridges.common.version>
+ <org.apache.portals.bridges.frameworks.version>1.0.2-RC</org.apache.portals.bridges.frameworks.version>
+ <org.apache.portals.bridges.jpetstore.version>1.0.2-RC</org.apache.portals.bridges.jpetstore.version>
+ <org.apache.portals.bridges.jsf-demo.version>1.0.2-RC</org.apache.portals.bridges.jsf-demo.version>
+ <org.apache.portals.bridges.jsf.version>1.0.2-RC</org.apache.portals.bridges.jsf.version>
+ <org.apache.portals.bridges.perl.version>1.0.2-RC</org.apache.portals.bridges.perl.version>
+ <org.apache.portals.bridges.php.version>1.0.2-RC</org.apache.portals.bridges.php.version>
+ <org.apache.portals.bridges.velocity.version>1.0.2-RC</org.apache.portals.bridges.velocity.version>
+ <org.apache.portals.bridges.portletfilter.version>1.0.2-RC</org.apache.portals.bridges.portletfilter.version>
+ <portals.bridges.struts.version>1.0.2-RC</portals.bridges.struts.version>
</properties>
<!-- Default Modules -->
Modified: portals/bridges/trunk/portletfilter/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/pom.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/portletfilter/pom.xml (original)
+++ portals/bridges/trunk/portletfilter/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/portletfilter/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/project.properties?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/portletfilter/project.properties (original)
+++ portals/bridges/trunk/portletfilter/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/portletfilter/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/project.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/portletfilter/project.xml (original)
+++ portals/bridges/trunk/portletfilter/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
@@ -66,6 +67,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/portletfilter/src/java/org/apache/portals/bridges/portletfilter/FilterPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/FilterPortlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/FilterPortlet.java (original)
+++ portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/FilterPortlet.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/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilter.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilter.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilter.java (original)
+++ portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilter.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/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilterChain.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilterChain.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilterChain.java (original)
+++ portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilterChain.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/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilterConfig.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilterConfig.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilterConfig.java (original)
+++ portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/PortletFilterConfig.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/portletfilter/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/xdocs/index.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/portletfilter/xdocs/index.xml (original)
+++ portals/bridges/trunk/portletfilter/xdocs/index.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/portletfilter/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/xdocs/navigation.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/portletfilter/xdocs/navigation.xml (original)
+++ portals/bridges/trunk/portletfilter/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/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/project.properties?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/project.properties (original)
+++ portals/bridges/trunk/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
#
@@ -84,17 +85,17 @@
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
# bridges versions
-portals.bridges.version=1.0.1
-portals.bridges.common.version=1.0.1
-portals.bridges.frameworks.version=1.0.1
-portals.bridges.jsf.version=1.0.1
-portals.bridges.perl.version=1.0.1
-portals.bridges.php.version=1.0.1
-portals.bridges.python.version=1.0.1
-portals.bridges.struts.version=1.0.1
-portals.bridges.velocity.version=1.0.1
-portals.bridges.portletfilter.version=1.0.1
-portals.bridges.mapserver.version=1.0.1
+portals.bridges.version=1.0.2-RC
+portals.bridges.common.version=1.0.2-RC
+portals.bridges.frameworks.version=1.0.2-RC
+portals.bridges.jsf.version=1.0.2-RC
+portals.bridges.perl.version=1.0.2-RC
+portals.bridges.php.version=1.0.2-RC
+portals.bridges.python.version=1.0.2-RC
+portals.bridges.struts.version=1.0.2-RC
+portals.bridges.velocity.version=1.0.2-RC
+portals.bridges.portletfilter.version=1.0.2-RC
+portals.bridges.mapserver.version=1.0.2-RC
# dependency versions
commons.logging.version=1.0.4
@@ -104,7 +105,7 @@
tomahawk.version=1.1.4
spring.version=2.0
jython.version=2.2a1
-jetspeed.rewriter.version=2.1
+jetspeed.rewriter.version=2.1.1-RC
log4j.version=1.2.8
# Whether or not to include log4j in war files. Your container may already have this.
log4j.include=true
Modified: portals/bridges/trunk/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/project.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/project.xml (original)
+++ portals/bridges/trunk/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
Modified: portals/bridges/trunk/struts/README.txt
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/README.txt?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/README.txt (original)
+++ portals/bridges/trunk/struts/README.txt 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/struts/maven.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/maven.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/maven.xml (original)
+++ portals/bridges/trunk/struts/maven.xml 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/struts/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/pom.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/pom.xml (original)
+++ portals/bridges/trunk/struts/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/struts/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/project.properties?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/project.properties (original)
+++ portals/bridges/trunk/struts/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/struts/project.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/project.xml?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/project.xml (original)
+++ portals/bridges/trunk/struts/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
@@ -76,6 +77,13 @@
<include>META-INF/tlds/struts-1.2.7/*</include>
</includes>
<filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
</resource>
</resources>
</build>
Modified: portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-el.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-el.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-el.tld (original)
+++ portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-el.tld Sun Mar 11 18:44:37 2007
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_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/struts/src/archived/struts-1.2.4/struts-portlet-html-el.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-html-el.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-html-el.tld (original)
+++ portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-html-el.tld Sun Mar 11 18:44:37 2007
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_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/struts/src/archived/struts-1.2.4/struts-portlet-html.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-html.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-html.tld (original)
+++ portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet-html.tld Sun Mar 11 18:44:37 2007
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_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/struts/src/archived/struts-1.2.4/struts-portlet.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet.tld (original)
+++ portals/bridges/trunk/struts/src/archived/struts-1.2.4/struts-portlet.tld Sun Mar 11 18:44:37 2007
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_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/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-el.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-el.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-el.tld (original)
+++ portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-el.tld Sun Mar 11 18:44:37 2007
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_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/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-html-el.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-html-el.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-html-el.tld (original)
+++ portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-html-el.tld Sun Mar 11 18:44:37 2007
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_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/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-html.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-html.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-html.tld (original)
+++ portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet-html.tld Sun Mar 11 18:44:37 2007
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_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/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet.tld
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet.tld?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet.tld (original)
+++ portals/bridges/trunk/struts/src/java/META-INF/tlds/struts-1.2.7/struts-portlet.tld Sun Mar 11 18:44:37 2007
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_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/struts/src/java/org/apache/portals/bridges/struts/PortletRequestProcessor.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletRequestProcessor.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletRequestProcessor.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletRequestProcessor.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/struts/src/java/org/apache/portals/bridges/struts/PortletServlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServlet.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServlet.java Sun Mar 11 18:44:37 2007
@@ -1,17 +1,18 @@
/*
- * Copyright 2000-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.struts;
Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletConfigImpl.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletConfigImpl.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletConfigImpl.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/struts/src/java/org/apache/portals/bridges/struts/PortletServletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletContextImpl.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletContextImpl.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletContextImpl.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/struts/src/java/org/apache/portals/bridges/struts/PortletServletRequestDispatcher.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletRequestDispatcher.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletRequestDispatcher.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletRequestDispatcher.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/struts/src/java/org/apache/portals/bridges/struts/PortletServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletRequestWrapper.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletRequestWrapper.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletRequestWrapper.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/struts/src/java/org/apache/portals/bridges/struts/PortletServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletResponseWrapper.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletResponseWrapper.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletServletResponseWrapper.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/struts/src/java/org/apache/portals/bridges/struts/PortletTilesRequestProcessor.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletTilesRequestProcessor.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletTilesRequestProcessor.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/PortletTilesRequestProcessor.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/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.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/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletErrorContext.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletErrorContext.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletErrorContext.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletErrorContext.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/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletRenderContext.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletRenderContext.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletRenderContext.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletRenderContext.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/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletURL.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletURL.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletURL.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortletURL.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/struts/src/java/org/apache/portals/bridges/struts/config/AbstractConfigComponent.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/AbstractConfigComponent.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/AbstractConfigComponent.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/AbstractConfigComponent.java Sun Mar 11 18:44:37 2007
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.portals.bridges.struts.config;
import org.apache.commons.digester.Digester;
Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/PortletURLTypes.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/PortletURLTypes.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/PortletURLTypes.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/PortletURLTypes.java Sun Mar 11 18:44:37 2007
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.portals.bridges.struts.config;
import java.util.ArrayList;
Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/RenderContextAttributes.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/RenderContextAttributes.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/RenderContextAttributes.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/RenderContextAttributes.java Sun Mar 11 18:44:37 2007
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.portals.bridges.struts.config;
import java.io.Serializable;
Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/StrutsPortletConfig.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/StrutsPortletConfig.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/StrutsPortletConfig.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/config/StrutsPortletConfig.java Sun Mar 11 18:44:37 2007
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.portals.bridges.struts.config;
import java.io.InputStream;
Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELFormTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELFormTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELFormTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELFormTag.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/struts/src/java/org/apache/portals/bridges/struts/taglib/ELImageTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELImageTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELImageTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELImageTag.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/struts/src/java/org/apache/portals/bridges/struts/taglib/ELImgTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELImgTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELImgTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELImgTag.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/struts/src/java/org/apache/portals/bridges/struts/taglib/ELLinkTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELLinkTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELLinkTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELLinkTag.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/struts/src/java/org/apache/portals/bridges/struts/taglib/ELRewriteTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELRewriteTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELRewriteTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ELRewriteTag.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/struts/src/java/org/apache/portals/bridges/struts/taglib/FormTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/FormTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/FormTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/FormTag.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/struts/src/java/org/apache/portals/bridges/struts/taglib/ImageTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ImageTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ImageTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ImageTag.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/struts/src/java/org/apache/portals/bridges/struts/taglib/ImgTag.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ImgTag.java?view=diff&rev=517068&r1=517067&r2=517068
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ImgTag.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/taglib/ImgTag.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
*
---------------------------------------------------------------------
To unsubscribe, e-mail: bridges-commits-unsubscribe@portals.apache.org
For additional commands, e-mail: bridges-commits-help@portals.apache.org