Author: aadamchik
Date: Tue Sep 19 13:59:58 2006
New Revision: 447968
URL: http://svn.apache.org/viewvc?view=rev&rev=447968
Log:
cleaning HessianServlet file licensing
Added:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/third-party/LICENSE.caucho.txt
(with props)
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/remote/hessian/service/_HessianServlet.java
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/top/NOTICE
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/remote/hessian/service/_HessianServlet.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/remote/hessian/service/_HessianServlet.java?view=diff&rev=447968&r1=447967&r2=447968
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/remote/hessian/service/_HessianServlet.java
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/remote/hessian/service/_HessianServlet.java
Tue Sep 19 13:59:58 2006
@@ -16,55 +16,6 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
-/*
- * Copyright (c) 2001-2004 Caucho Technology, Inc. All rights reserved.
- *
- * The Apache Software License, Version 1.1
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Caucho Technology (http://www.caucho.com/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "Hessian", "Resin", and "Caucho" must not be used to
- * endorse or promote products derived from this software without prior
- * written permission. For written permission, please contact
- * [EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called "Resin"
- * nor may "Resin" appear in their names without prior written
- * permission of Caucho Technology.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL CAUCHO TECHNOLOGY OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @author Scott Ferguson
- */
-
package org.apache.cayenne.remote.hessian.service;
import java.io.IOException;
Added:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/third-party/LICENSE.caucho.txt
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/third-party/LICENSE.caucho.txt?view=auto&rev=447968
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/third-party/LICENSE.caucho.txt
(added)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/third-party/LICENSE.caucho.txt
Tue Sep 19 13:59:58 2006
@@ -0,0 +1,44 @@
+ Copyright (c) 2001-2004 Caucho Technology, Inc. All rights reserved.
+
+ The Apache Software License, Version 1.1
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ 3. The end-user documentation included with the redistribution, if
+ any, must include the following acknowlegement:
+ "This product includes software developed by the
+ Caucho Technology (http://www.caucho.com/)."
+ Alternately, this acknowlegement may appear in the software itself,
+ if and wherever such third-party acknowlegements normally appear.
+
+ 4. The names "Hessian", "Resin", and "Caucho" must not be used to
+ endorse or promote products derived from this software without prior
+ written permission. For written permission, please contact
+ [EMAIL PROTECTED]
+
+ 5. Products derived from this software may not be called "Resin"
+ nor may "Resin" appear in their names without prior written
+ permission of Caucho Technology.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL CAUCHO TECHNOLOGY OR ITS CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
\ No newline at end of file
Propchange:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/third-party/LICENSE.caucho.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/top/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/top/NOTICE?view=diff&rev=447968&r1=447967&r2=447968
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/top/NOTICE
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/licenses/top/NOTICE
Tue Sep 19 13:59:58 2006
@@ -1,9 +1,11 @@
Apache Cayenne
Copyright 2006 The Apache Software Foundation
+
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+------------------
This software is derived from Cayenne Framework, originally developed
at The ObjectStyle Group and donated to the ASF by its authors. The
original framework was released under the following license:
@@ -60,3 +62,53 @@
individuals and hosted on ObjectStyle Group web site. For more
information on the ObjectStyle Group, please see
<http://objectstyle.org/>.
+
+
+------------------
+This software includes a file (_HessianServlet.java) originally developed by
+Caucho Technology, Inc.
+
+ Copyright (c) 2001-2004 Caucho Technology, Inc. All rights reserved.
+
+ The Apache Software License, Version 1.1
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ 3. The end-user documentation included with the redistribution, if
+ any, must include the following acknowlegement:
+ "This product includes software developed by the
+ Caucho Technology (http://www.caucho.com/)."
+ Alternately, this acknowlegement may appear in the software itself,
+ if and wherever such third-party acknowlegements normally appear.
+
+ 4. The names "Hessian", "Resin", and "Caucho" must not be used to
+ endorse or promote products derived from this software without prior
+ written permission. For written permission, please contact
+ [EMAIL PROTECTED]
+
+ 5. Products derived from this software may not be called "Resin"
+ nor may "Resin" appear in their names without prior written
+ permission of Caucho Technology.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL CAUCHO TECHNOLOGY OR ITS CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
\ No newline at end of file
