svn commit: r938275 - /incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml

[be...@apache.org]

Author: bendewey
Date: Tue Apr 27 00:19:15 2010
New Revision: 938275

URL: http://svn.apache.org/viewvc?rev=938275&view=rev
Log:
JIRA: STONEHENGE-123
Fixed ASF License comment bug in orderprocessor/etc/web.xml, Thanks
Submitted by: Nicholas Hauenstein

Modified:
    incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml

Modified: incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml?rev=938275&r1=938274&r2=938275&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml Tue Apr 27 00:19:15 2010
@@ -1,37 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- 
- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- 
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License").  You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- language governing permissions and limitations under the License.
- 
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code.  If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
- 
- Contributor(s):
- 
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license."  If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- i
-<!--
 	~ 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
@@ -50,12 +19,6 @@
 	~ under the License.
 -->
 
-ts licensees as provided above.  However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
--->
-
 <web-app version="2.4" mlns="http://java.sun.com/xml/ns/j2ee">
     <display-name>wsit-jaxws-fromwsdl</display-name>
     <description>wsit-jaxws-fromwsdl</description>