Author: ptahchiev Date: Sun Jan 18 15:04:08 2009 New Revision: 735573 URL: http://svn.apache.org/viewvc?rev=735573&view=rev Log: Apache license added and updated the N&L files to include the CDDL license for the Servlet API
Modified: jakarta/cactus/trunk/LICENSE jakarta/cactus/trunk/NOTICE jakarta/cactus/trunk/cactus-maven-skin/src/main/resources/css/maven-theme.css jakarta/cactus/trunk/doap_Jakarta_Cactus.rdf jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/main/resources/org/apache/cactus/server/jspRedirector.jsp jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-13/src/main/resources/org/apache/cactus/server/jspRedirector.jsp jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-14/src/main/resources/org/apache/cactus/server/jspRedirector.jsp jakarta/cactus/trunk/framework/web/jspRedirector.jsp jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/conf/jspRedirector.jsp jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/cactify/CactifyUtils.java jakarta/cactus/trunk/samples/servlet/src/main/webapp/WEB-INF/cactus-web.xml Modified: jakarta/cactus/trunk/LICENSE URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/LICENSE?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/LICENSE (original) +++ jakarta/cactus/trunk/LICENSE Sun Jan 18 15:04:08 2009 @@ -224,4 +224,6 @@ The NekoHtml library is licensed under the Apache License, Version 2.0. -The Cargo project is licensed under the Apache License, Version 2.0. \ No newline at end of file +The Cargo project is licensed under the Apache License, Version 2.0. + +The Servlet API project is licensed under the CDDL license. \ No newline at end of file Modified: jakarta/cactus/trunk/NOTICE URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/NOTICE?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/NOTICE (original) +++ jakarta/cactus/trunk/NOTICE Sun Jan 18 15:04:08 2009 @@ -24,4 +24,6 @@ Sourceforge.net, and distributed under an Apache 2 license. The Cargo project distributed under an Apache 2 license, -and is hosted at: http://cargo.codehaus.org/ \ No newline at end of file +and is hosted at: http://cargo.codehaus.org/ + +The Servlet API project is licensed under the CDDL license. \ No newline at end of file Modified: jakarta/cactus/trunk/cactus-maven-skin/src/main/resources/css/maven-theme.css URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-maven-skin/src/main/resources/css/maven-theme.css?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/cactus-maven-skin/src/main/resources/css/maven-theme.css (original) +++ jakarta/cactus/trunk/cactus-maven-skin/src/main/resources/css/maven-theme.css Sun Jan 18 15:04:08 2009 @@ -1,3 +1,21 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +*/ body { background-color: #fff; font-family: Lucida Grande, Arial, Helvetica, sans-serif; Modified: jakarta/cactus/trunk/doap_Jakarta_Cactus.rdf URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/doap_Jakarta_Cactus.rdf?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/doap_Jakarta_Cactus.rdf (original) +++ jakarta/cactus/trunk/doap_Jakarta_Cactus.rdf Sun Jan 18 15:04:08 2009 @@ -1,4 +1,22 @@ <?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. +--> <?xml-stylesheet type="text/xsl"?> <rdf:RDF xml:lang="en" xmlns="http://usefulinc.com/ns/doap#" Modified: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/main/resources/org/apache/cactus/server/jspRedirector.jsp URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/main/resources/org/apache/cactus/server/jspRedirector.jsp?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/main/resources/org/apache/cactus/server/jspRedirector.jsp (original) +++ jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/main/resources/org/apache/cactus/server/jspRedirector.jsp Sun Jan 18 15:04:08 2009 @@ -1,3 +1,22 @@ +<%-- + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. +--%> + <%...@page import="org.apache.cactus.server.*,org.apache.cactus.internal.server.*" session="true" %><% /** Modified: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-13/src/main/resources/org/apache/cactus/server/jspRedirector.jsp URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-13/src/main/resources/org/apache/cactus/server/jspRedirector.jsp?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-13/src/main/resources/org/apache/cactus/server/jspRedirector.jsp (original) +++ jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-13/src/main/resources/org/apache/cactus/server/jspRedirector.jsp Sun Jan 18 15:04:08 2009 @@ -1,3 +1,22 @@ +<%-- + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. +--%> + <%...@page import="org.apache.cactus.server.*,org.apache.cactus.internal.server.*" session="true" %><% /** Modified: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-14/src/main/resources/org/apache/cactus/server/jspRedirector.jsp URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-14/src/main/resources/org/apache/cactus/server/jspRedirector.jsp?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-14/src/main/resources/org/apache/cactus/server/jspRedirector.jsp (original) +++ jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-14/src/main/resources/org/apache/cactus/server/jspRedirector.jsp Sun Jan 18 15:04:08 2009 @@ -1,3 +1,22 @@ +<%-- + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. +--%> + <%...@page import="org.apache.cactus.server.*,org.apache.cactus.internal.server.*" session="true" %><% /** Modified: jakarta/cactus/trunk/framework/web/jspRedirector.jsp URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/web/jspRedirector.jsp?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/framework/web/jspRedirector.jsp (original) +++ jakarta/cactus/trunk/framework/web/jspRedirector.jsp Sun Jan 18 15:04:08 2009 @@ -1,3 +1,22 @@ +<%-- + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. +--%> + <%...@page import="org.apache.cactus.server.*,org.apache.cactus.internal.server.*" session="true" %><% /** Modified: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/conf/jspRedirector.jsp URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/conf/jspRedirector.jsp?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/conf/jspRedirector.jsp (original) +++ jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/conf/jspRedirector.jsp Sun Jan 18 15:04:08 2009 @@ -1,3 +1,22 @@ +<%-- + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. +--%> + <%...@page import="org.apache.cactus.server.*,org.apache.cactus.internal.server.*" session="true" %><% /** Modified: jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/cactify/CactifyUtils.java URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/cactify/CactifyUtils.java?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/cactify/CactifyUtils.java (original) +++ jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/cactify/CactifyUtils.java Sun Jan 18 15:04:08 2009 @@ -1,3 +1,23 @@ +/* + * ======================================================================== + * + * 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.cactus.integration.api.cactify; import java.io.File; Modified: jakarta/cactus/trunk/samples/servlet/src/main/webapp/WEB-INF/cactus-web.xml URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/src/main/webapp/WEB-INF/cactus-web.xml?rev=735573&r1=735572&r2=735573&view=diff ============================================================================== --- jakarta/cactus/trunk/samples/servlet/src/main/webapp/WEB-INF/cactus-web.xml (original) +++ jakarta/cactus/trunk/samples/servlet/src/main/webapp/WEB-INF/cactus-web.xml Sun Jan 18 15:04:08 2009 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> --------------------------------------------------------------------- To unsubscribe, e-mail: cactus-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: cactus-dev-h...@jakarta.apache.org