incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1233563 - in /incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag: RegistrationData.java RegistrationDocument.java
Date Thu, 19 Jan 2012 20:37:30 GMT
Author: arist
Date: Thu Jan 19 20:37:30 2012
New Revision: 1233563

URL: http://svn.apache.org/viewvc?rev=1233563&view=rev
Log:
Additional files needing headers

Modified:
    incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
    incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java

Modified: incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java?rev=1233563&r1=1233562&r2=1233563&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
(original)
+++ incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
Thu Jan 19 20:37:30 2012
@@ -20,42 +20,6 @@
  *************************************************************/
 
 
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2008 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
- * its 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.
- */
-
 package com.sun.star.servicetag;
 
 import java.io.*;

Modified: incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java?rev=1233563&r1=1233562&r2=1233563&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
(original)
+++ incubator/ooo/trunk/main/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
Thu Jan 19 20:37:30 2012
@@ -1,39 +1,23 @@
-
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2008 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
- * its 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.
- */
+/**************************************************************
+ * 
+ * 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 com.sun.star.servicetag;
 



Mime
View raw message