diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-19 06:15:47 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-19 06:15:47 +0000 |
| commit | 9c2c8d4358b939d505553ce63178977ac2f564a0 (patch) | |
| tree | 2ee3a254ace911505ee9ab53b4b3c021ad15c4c9 /sca-java-1.x | |
| parent | 9da25a6532fcbb9ae66294f1ff9ea903653c83e5 (diff) | |
Updating LICENSE/NOTICE to properly mention required notice from Caucho Technology
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@900665 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x')
| -rw-r--r-- | sca-java-1.x/trunk/modules/binding-hessian/LICENSE | 50 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/modules/binding-hessian/NOTICE | 2 |
2 files changed, 52 insertions, 0 deletions
diff --git a/sca-java-1.x/trunk/modules/binding-hessian/LICENSE b/sca-java-1.x/trunk/modules/binding-hessian/LICENSE index 6e529a25c4..cd592b16c7 100644 --- a/sca-java-1.x/trunk/modules/binding-hessian/LICENSE +++ b/sca-java-1.x/trunk/modules/binding-hessian/LICENSE @@ -202,4 +202,54 @@ limitations under the License.
+===============================================================================
+HessianServiceListenerServlet.java
+
+/*
+ * Copyright (c) 2001-2008 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
+ * info@caucho.com.
+ *
+ * 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.
+ *
+ */
+
diff --git a/sca-java-1.x/trunk/modules/binding-hessian/NOTICE b/sca-java-1.x/trunk/modules/binding-hessian/NOTICE index 25bb89c9b2..2f27989cd3 100644 --- a/sca-java-1.x/trunk/modules/binding-hessian/NOTICE +++ b/sca-java-1.x/trunk/modules/binding-hessian/NOTICE @@ -4,3 +4,5 @@ Copyright (c) 2005 - 2009 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). +This product includes software developed by the + Caucho Technology (http://www.caucho.com/).
\ No newline at end of file |