incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1056196 - in /incubator/lcf/branches/release-0.1-branch: ./ framework/crawler-ui/src/main/webapp/WEB-INF/jsp/
Date Fri, 07 Jan 2011 06:05:09 GMT
Author: kwright
Date: Fri Jan  7 06:05:09 2011
New Revision: 1056196

URL: http://svn.apache.org/viewvc?rev=1056196&view=rev
Log:
Port fix for CONNECTORS-137 from trunk.

Modified:
    incubator/lcf/branches/release-0.1-branch/   (props changed)
    incubator/lcf/branches/release-0.1-branch/CHANGES.txt
    incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/c.tld
    incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/fmt.tld
    incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/sql.tld
    incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/x.tld

Propchange: incubator/lcf/branches/release-0.1-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  7 06:05:09 2011
@@ -1,2 +1,2 @@
 /incubator/lcf/branches/release-0.1-branch:1056045
-/incubator/lcf/trunk:1039159,1041674,1041679,1041763,1041885,1041968,1042383,1042836-1042837,1042896,1042898,1043728,1044276,1044287,1044294,1044641,1049834,1050183,1050605,1056045,1056054,1056104,1056116,1056131-1056139,1056157,1056170-1056173
+/incubator/lcf/trunk:1039159,1041674,1041679,1041763,1041885,1041968,1042383,1042836-1042837,1042896,1042898,1043728,1044276,1044287,1044294,1044641,1049834,1050183,1050605,1056045,1056054,1056104,1056116,1056131-1056139,1056157,1056170-1056173,1056195

Modified: incubator/lcf/branches/release-0.1-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-branch/CHANGES.txt?rev=1056196&r1=1056195&r2=1056196&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.1-branch/CHANGES.txt Fri Jan  7 06:05:09 2011
@@ -4,6 +4,11 @@ $Id$
 ======================= Release 0.1 =======================
 Release Date:  See http://incubator.apache.org/connectors for the official release date.
 
+CONNECTORS-137: Add ASF headers to the jakarta standard tag library tld's
+that the crawler-ui uses.  RAT detected these as a problem, and I have confirmed
+that they have an Apache origin.
+(Sebb, Karl Wright)
+
 CONNECTORS-132: Remove build artifacts from the archives, except for documentation.
 This is to save space.
 (Karl Wright)

Modified: incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/c.tld
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/c.tld?rev=1056196&r1=1056195&r2=1056196&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/c.tld
(original)
+++ incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/c.tld
Fri Jan  7 06:05:09 2011
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"

Modified: incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/fmt.tld
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/fmt.tld?rev=1056196&r1=1056195&r2=1056196&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/fmt.tld
(original)
+++ incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/fmt.tld
Fri Jan  7 06:05:09 2011
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"

Modified: incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/sql.tld
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/sql.tld?rev=1056196&r1=1056195&r2=1056196&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/sql.tld
(original)
+++ incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/sql.tld
Fri Jan  7 06:05:09 2011
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"

Modified: incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/x.tld
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/x.tld?rev=1056196&r1=1056195&r2=1056196&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/x.tld
(original)
+++ incubator/lcf/branches/release-0.1-branch/framework/crawler-ui/src/main/webapp/WEB-INF/jsp/x.tld
Fri Jan  7 06:05:09 2011
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"



Mime
View raw message