1.1 --- a/cmdline/lib/build.xml Tue Jan 01 17:26:23 2013 +0100
1.2 +++ b/cmdline/lib/build.xml Tue Jan 01 18:56:54 2013 +0100
1.3 @@ -10,10 +10,9 @@
1.4 <target name="create-cmdline-lib" depends="init">
1.5 <mkdir dir="${build.classes.dir}/../lib" />
1.6 <ant target="test" inheritall="false" inheritrefs="false">
1.7 - <property name="test.config.standalone.includes" value="org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneLibJar.class"/>
1.8 + <property name="test.config.standalone.includes" value="org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneLibJar*.class"/>
1.9 <property name="test.config" value="standalone"/>
1.10 <property name="test-unit-sys-prop.outputDir" location="${build.classes.dir}/../lib" />
1.11 - <property name="test-unit-sys-prop.targetName" value="jackpot-lib.jar" />
1.12 </ant>
1.13 </target>
1.14
2.1 --- a/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneLibJar.java Tue Jan 01 17:26:23 2013 +0100
2.2 +++ b/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneLibJar.java Tue Jan 01 18:56:54 2013 +0100
2.3 @@ -42,14 +42,11 @@
2.4
2.5 package org.netbeans.modules.jackpot30.cmdline.lib;
2.6
2.7 -import org.netbeans.modules.java.hints.declarative.PatternConvertorImpl;
2.8 -import org.netbeans.modules.java.hints.jackpot.spi.PatternConvertor;
2.9 -
2.10 /**
2.11 *
2.12 * @author lahvac
2.13 */
2.14 -public class CreateStandaloneLibJar extends CreateStandaloneJar {
2.15 +public class CreateStandaloneLibJar extends CreateStandaloneLibJarNoEscape {
2.16
2.17 public CreateStandaloneLibJar(String name) {
2.18 super(name, "jackpot-lib");
2.19 @@ -57,7 +54,7 @@
2.20
2.21 @Override
2.22 protected Info computeInfo() {
2.23 - return new Info().addAdditionalRoots(NonNBComputer.class.getName(), PatternConvertorImpl.class.getName()).addMetaInfRegistrationToCopy(PatternConvertor.class.getName()).setEscapeJavaxLang();
2.24 + return super.computeInfo().setEscapeJavaxLang();
2.25 }
2.26
2.27 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneLibJarNoEscape.java Tue Jan 01 18:56:54 2013 +0100
3.3 @@ -0,0 +1,67 @@
3.4 +/*
3.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3.6 + *
3.7 + * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
3.8 + *
3.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3.10 + * Other names may be trademarks of their respective owners.
3.11 + *
3.12 + * The contents of this file are subject to the terms of either the GNU
3.13 + * General Public License Version 2 only ("GPL") or the Common
3.14 + * Development and Distribution License("CDDL") (collectively, the
3.15 + * "License"). You may not use this file except in compliance with the
3.16 + * License. You can obtain a copy of the License at
3.17 + * http://www.netbeans.org/cddl-gplv2.html
3.18 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
3.19 + * specific language governing permissions and limitations under the
3.20 + * License. When distributing the software, include this License Header
3.21 + * Notice in each file and include the License file at
3.22 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3.23 + * particular file as subject to the "Classpath" exception as provided
3.24 + * by Oracle in the GPL Version 2 section of the License file that
3.25 + * accompanied this code. If applicable, add the following below the
3.26 + * License Header, with the fields enclosed by brackets [] replaced by
3.27 + * your own identifying information:
3.28 + * "Portions Copyrighted [year] [name of copyright owner]"
3.29 + *
3.30 + * If you wish your version of this file to be governed by only the CDDL
3.31 + * or only the GPL Version 2, indicate your decision by adding
3.32 + * "[Contributor] elects to include this software in this distribution
3.33 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
3.34 + * single choice of license, a recipient has the option to distribute
3.35 + * your version of this file under either the CDDL, the GPL Version 2 or
3.36 + * to extend the choice of license to its licensees as provided above.
3.37 + * However, if you add GPL Version 2 code and therefore, elected the GPL
3.38 + * Version 2 license, then the option applies only if the new code is
3.39 + * made subject to such option by the copyright holder.
3.40 + *
3.41 + * Contributor(s):
3.42 + *
3.43 + * Portions Copyrighted 2010 Sun Microsystems, Inc.
3.44 + */
3.45 +
3.46 +package org.netbeans.modules.jackpot30.cmdline.lib;
3.47 +
3.48 +import org.netbeans.modules.java.hints.declarative.PatternConvertorImpl;
3.49 +import org.netbeans.modules.java.hints.jackpot.spi.PatternConvertor;
3.50 +
3.51 +/**
3.52 + *
3.53 + * @author lahvac
3.54 + */
3.55 +public class CreateStandaloneLibJarNoEscape extends CreateStandaloneJar {
3.56 +
3.57 + public CreateStandaloneLibJarNoEscape(String name) {
3.58 + this(name, "jackpot-lib-noescape");
3.59 + }
3.60 +
3.61 + protected CreateStandaloneLibJarNoEscape(String name, String libName) {
3.62 + super(name, libName);
3.63 + }
3.64 +
3.65 + @Override
3.66 + protected Info computeInfo() {
3.67 + return new Info().addAdditionalRoots(NonNBComputer.class.getName(), PatternConvertorImpl.class.getName()).addMetaInfRegistrationToCopy(PatternConvertor.class.getName());
3.68 + }
3.69 +
3.70 +}
4.1 --- a/language/server/web/language.web.api/nbproject/project.properties Tue Jan 01 17:26:23 2013 +0100
4.2 +++ b/language/server/web/language.web.api/nbproject/project.properties Tue Jan 01 18:56:54 2013 +0100
4.3 @@ -27,7 +27,7 @@
4.4 dist.javadoc.dir=${dist.dir}/javadoc
4.5 endorsed.classpath=
4.6 excludes=
4.7 -file.reference.jackpot-lib.jar=../../../../cmdline/lib/build/lib/jackpot-lib.jar
4.8 +file.reference.jackpot-lib-noescape.jar=../../../../cmdline/lib/build/lib/jackpot-lib-noescape.jar
4.9 file.reference.org-netbeans-lib-nbjavac.jar=../../../../lib/org-netbeans-lib-nbjavac.jar
4.10 file.reference.org-netbeans-modules-java-source.jar=../../../../lib/org-netbeans-modules-java-source.jar
4.11 file.reference.org-netbeans-modules-parsing-api.jar=../../../../lib/org-netbeans-modules-parsing-api.jar
4.12 @@ -57,8 +57,8 @@
4.13 ${file.reference.org-netbeans-modules-java-source.jar}:\
4.14 ${libs.freemarker.classpath}:\
4.15 ${file.reference.org-netbeans-lib-nbjavac.jar}:\
4.16 - ${file.reference.jackpot-lib.jar}:\
4.17 ${reference.resolve_web_api.jar}:\
4.18 + ${file.reference.jackpot-lib-noescape.jar}:\
4.19 ${file.reference.org-openide-util-lookup.jar}
4.20 # Space-separated list of extra javac options
4.21 javac.compilerargs=