Commits

Jan Lahoda committed 957dff1

Language web currently needs un-escaped library

Comments (0)

Files changed (4)

cmdline/lib/build.xml

     <target name="create-cmdline-lib" depends="init">
         <mkdir dir="${build.classes.dir}/../lib" />
         <ant target="test" inheritall="false" inheritrefs="false">
-            <property name="test.config.standalone.includes" value="org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneLibJar.class"/>
+            <property name="test.config.standalone.includes" value="org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneLibJar*.class"/>
             <property name="test.config" value="standalone"/>
             <property name="test-unit-sys-prop.outputDir" location="${build.classes.dir}/../lib" />
-            <property name="test-unit-sys-prop.targetName" value="jackpot-lib.jar" />
         </ant>
     </target>
 

cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneLibJar.java

 
 package org.netbeans.modules.jackpot30.cmdline.lib;
 
-import org.netbeans.modules.java.hints.declarative.PatternConvertorImpl;
-import org.netbeans.modules.java.hints.jackpot.spi.PatternConvertor;
-
 /**
  *
  * @author lahvac
  */
-public class CreateStandaloneLibJar extends CreateStandaloneJar {
+public class CreateStandaloneLibJar extends CreateStandaloneLibJarNoEscape {
 
     public CreateStandaloneLibJar(String name) {
         super(name, "jackpot-lib");
 
     @Override
     protected Info computeInfo() {
-        return new Info().addAdditionalRoots(NonNBComputer.class.getName(), PatternConvertorImpl.class.getName()).addMetaInfRegistrationToCopy(PatternConvertor.class.getName()).setEscapeJavaxLang();
+        return super.computeInfo().setEscapeJavaxLang();
     }
 
 }

cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneLibJarNoEscape.java

+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * 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
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. 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
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle 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]"
+ *
+ * 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 do not 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.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2010 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.jackpot30.cmdline.lib;
+
+import org.netbeans.modules.java.hints.declarative.PatternConvertorImpl;
+import org.netbeans.modules.java.hints.jackpot.spi.PatternConvertor;
+
+/**
+ *
+ * @author lahvac
+ */
+public class CreateStandaloneLibJarNoEscape extends CreateStandaloneJar {
+
+    public CreateStandaloneLibJarNoEscape(String name) {
+        this(name, "jackpot-lib-noescape");
+    }
+
+    protected CreateStandaloneLibJarNoEscape(String name, String libName) {
+        super(name, libName);
+    }
+
+    @Override
+    protected Info computeInfo() {
+        return new Info().addAdditionalRoots(NonNBComputer.class.getName(), PatternConvertorImpl.class.getName()).addMetaInfRegistrationToCopy(PatternConvertor.class.getName());
+    }
+
+}

language/server/web/language.web.api/nbproject/project.properties

 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.jackpot-lib.jar=../../../../cmdline/lib/build/lib/jackpot-lib.jar
+file.reference.jackpot-lib-noescape.jar=../../../../cmdline/lib/build/lib/jackpot-lib-noescape.jar
 file.reference.org-netbeans-lib-nbjavac.jar=../../../../lib/org-netbeans-lib-nbjavac.jar
 file.reference.org-netbeans-modules-java-source.jar=../../../../lib/org-netbeans-modules-java-source.jar
 file.reference.org-netbeans-modules-parsing-api.jar=../../../../lib/org-netbeans-modules-parsing-api.jar
     ${file.reference.org-netbeans-modules-java-source.jar}:\
     ${libs.freemarker.classpath}:\
     ${file.reference.org-netbeans-lib-nbjavac.jar}:\
-    ${file.reference.jackpot-lib.jar}:\
     ${reference.resolve_web_api.jar}:\
+    ${file.reference.jackpot-lib-noescape.jar}:\
     ${file.reference.org-openide-util-lookup.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=