1.1 --- a/languages.velocity/nbproject/project.properties	Thu Aug 16 12:41:18 2012 +0200
     1.2 +++ b/languages.velocity/nbproject/project.properties	Thu Aug 23 12:32:32 2012 +0200
     1.3 @@ -0,0 +1,2 @@
     1.4 +javac.compilerargs=-Xlint -Xlint:-serial
     1.5 +javac.source=1.6

     2.1 --- a/languages.velocity/nbproject/project.xml	Thu Aug 16 12:41:18 2012 +0200
     2.2 +++ b/languages.velocity/nbproject/project.xml	Thu Aug 23 12:32:32 2012 +0200
     2.3 @@ -19,10 +19,10 @@
     2.4                      <build-prerequisite/>
     2.5                      <compile-dependency/>
     2.6                      <run-dependency>
     2.7 -                        <specification-version>7.0</specification-version>
     2.8 +                        <specification-version>8.0</specification-version>
     2.9                      </run-dependency>
    2.10                  </dependency>
    2.11 -            </module-dependencies>
    2.12 +                </module-dependencies>
    2.13              <public-packages/>
    2.14          </data>
    2.15      </configuration>

     3.1 --- a/languages.velocity/src/org/netbeans/modules/languages/velocity/layer.xml	Thu Aug 16 12:41:18 2012 +0200
     3.2 +++ b/languages.velocity/src/org/netbeans/modules/languages/velocity/layer.xml	Thu Aug 23 12:32:32 2012 +0200
     3.3 @@ -42,14 +42,6 @@
     3.4  -->
     3.5  <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
     3.6  <filesystem>
     3.7 -    <folder name="Services">
     3.8 -        <folder name="MIMEResolver">
     3.9 -            <file name="Velocity.xml" url="Velocity.xml">
    3.10 -                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.languages.velocity.Bundle"/>
    3.11 -                <attr name="position" intvalue="275"/>
    3.12 -            </file>
    3.13 -        </folder>
    3.14 -    </folder>
    3.15      <folder name="Editors">
    3.16          <folder name="text">
    3.17              <folder name="x-velocity">

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/languages.velocity/src/org/netbeans/modules/languages/velocity/package-info.java	Thu Aug 23 12:32:32 2012 +0200
     4.3 @@ -0,0 +1,50 @@
     4.4 +/*
     4.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     4.6 + *
     4.7 + * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
     4.8 + *
     4.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    4.10 + * Other names may be trademarks of their respective owners.
    4.11 + *
    4.12 + * The contents of this file are subject to the terms of either the GNU
    4.13 + * General Public License Version 2 only ("GPL") or the Common
    4.14 + * Development and Distribution License("CDDL") (collectively, the
    4.15 + * "License"). You may not use this file except in compliance with the
    4.16 + * License. You can obtain a copy of the License at
    4.17 + * http://www.netbeans.org/cddl-gplv2.html
    4.18 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    4.19 + * specific language governing permissions and limitations under the
    4.20 + * License.  When distributing the software, include this License Header
    4.21 + * Notice in each file and include the License file at
    4.22 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    4.23 + * particular file as subject to the "Classpath" exception as provided
    4.24 + * by Oracle in the GPL Version 2 section of the License file that
    4.25 + * accompanied this code. If applicable, add the following below the
    4.26 + * License Header, with the fields enclosed by brackets [] replaced by
    4.27 + * your own identifying information:
    4.28 + * "Portions Copyrighted [year] [name of copyright owner]"
    4.29 + *
    4.30 + * If you wish your version of this file to be governed by only the CDDL
    4.31 + * or only the GPL Version 2, indicate your decision by adding
    4.32 + * "[Contributor] elects to include this software in this distribution
    4.33 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
    4.34 + * single choice of license, a recipient has the option to distribute
    4.35 + * your version of this file under either the CDDL, the GPL Version 2 or
    4.36 + * to extend the choice of license to its licensees as provided above.
    4.37 + * However, if you add GPL Version 2 code and therefore, elected the GPL
    4.38 + * Version 2 license, then the option applies only if the new code is
    4.39 + * made subject to such option by the copyright holder.
    4.40 + *
    4.41 + * Contributor(s):
    4.42 + *
    4.43 + * Portions Copyrighted 2012 Sun Microsystems, Inc.
    4.44 + */
    4.45 +@MIMEResolver.Registration(
    4.46 +    resource="Velocity.xml", 
    4.47 +    displayName="#Services/MIMEResolver/Velocity.xml",
    4.48 +    position=57489
    4.49 +)
    4.50 +package org.netbeans.modules.languages.velocity;
    4.51 +
    4.52 +import org.openide.filesystems.MIMEResolver;
    4.53 +