Attachment #89175 for bug #174202

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 174202
Collapse All | Expand All




<!-- ACTUAL CHANGES BEGIN HERE: -->

<changes>
        <change id="java-classpath-processorpath">
            <api name="classpath"/>
            <summary>Introducing JavaClassPathConstants.PROCESSOR_PATH</summary>
            <version major="1" minor="22"/>
            <date day="18" month="10" year="2009"/>
            <author login="jlahoda"/>
            <compatibility addition="yes" modification="no" semantic="compatible" source="compatible" binary="compatible"/>
            <description>
                <p>
                    Class org.netbeans.api.java.classpath.JavaClassPathConstants is created to hold java specific classpath constants.
                    org.netbeans.api.java.classpath.JavaClassPathConstants.PROCESSOR_PATH constant is created as a key
                    for Java processor path.
                </p>
            </description>
            <class package="org.netbeans.api.java.classpath" name="JavaClassPathConstants" />
            <issue number="174202"/>
        </change>
        <change id="classpath-api-module">
            <api name="classpath"/>
            <summary>Splitting the java API to independent ClassPath API and the rest of the java API</summary>

Lines 1-6 Link Here

(-)a/api.java/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.api.java/1	2	OpenIDE-Module: org.netbeans.api.java/1
3	OpenIDE-Module-Specification-Version: 1.21	3	OpenIDE-Module-Specification-Version: 1.22
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/queries/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/queries/Bundle.properties
5	AutoUpdate-Show-In-Client: false	5	AutoUpdate-Show-In-Client: false
6		6




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2009 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
 * 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.  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]"
 *
 * 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 2009 Sun Microsystems, Inc.
 */

package org.netbeans.api.java.classpath;

/**
 * Java related classpath constants.
 * 
 * @author Jan Lahoda
 * @since 1.22
 */
public class JavaClassPathConstants {

    /**
     * ClassPath for annotation processors. If undefined, {@link ClassPath#COMPILE}
     * should be used.
     * <p class="nonnormative">
     * It corresponds to the <code>-processorpath</code> option of <code>javac</code>.
     * </p>
     *
     * @since 1.22
     */
    public static final String PROCESSOR_PATH = "classpath/processor";
    
}

Lines 70-76 Link Here

(-)a/apisupport.project/nbproject/project.xml (-1 / +1 lines)
70	<compile-dependency/>	70	<compile-dependency/>
71	<run-dependency>	71	<run-dependency>
72	<release-version>1</release-version>	72	<release-version>1</release-version>
73	<specification-version>1.18</specification-version>	73	<specification-version>1.22</specification-version>
74	</run-dependency>	74	</run-dependency>
75	</dependency>	75	</dependency>
76	<dependency>	76	<dependency>




import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.classpath.JavaClassPathConstants;
import org.netbeans.spi.java.classpath.ClassPathFactory;
import org.netbeans.spi.java.classpath.ClassPathImplementation;
import org.netbeans.spi.java.classpath.ClassPathProvider;

                    LOG.log(Level.FINE, "compile/execute-time classpath for file '" + file.getPath() + "' (prj: " + project + "): " + compile);
                }
                return compile;
            } else if (type.equals(ClassPath.EXECUTE) || type.equals(JavaClassPathConstants.PROCESSOR_PATH)) {
                if (execute == null) {
                    execute = ClassPathFactory.createClassPath(createExecuteClasspath());
                }

                    LOG.log(Level.FINE, "compile-time classpath for tests for file '" + file.getPath() + "' (prj: " + project + "): " + testCompile);
                }
                return testCompile;
            } else if (type.equals(ClassPath.EXECUTE) || type.equals(JavaClassPathConstants.PROCESSOR_PATH)) {
                if (testExecute == null) {
                    testExecute = ClassPathFactory.createClassPath(createTestExecuteClasspath("unit"));
                    LOG.log(Level.FINE, "runtime classpath for tests for file '" + file.getPath() + "' (prj: " + project + "): " + testExecute);

                    LOG.log(Level.FINE, "compile-time classpath for func tests for file '" + file.getPath() + "' (prj: " + project + "): " + funcTestCompile);
                }
                return funcTestCompile;
            } else if (type.equals(ClassPath.EXECUTE) || type.equals(JavaClassPathConstants.PROCESSOR_PATH)) {
                if (funcTestExecute == null) {
                    funcTestExecute = ClassPathFactory.createClassPath(createTestExecuteClasspath("qa-functional"));
                }

Return to bug 174202

Lines 73-78 Link Here

(-)a/api.java/apichanges.xml (+17 lines)
73	<!-- ACTUAL CHANGES BEGIN HERE: -->	73	<!-- ACTUAL CHANGES BEGIN HERE: -->
74		74
75	<changes>	75	<changes>
		76	<change id="java-classpath-processorpath">
		77	<api name="classpath"/>
		78	<summary>Introducing JavaClassPathConstants.PROCESSOR_PATH</summary>
		79	<version major="1" minor="22"/>
		80	<date day="18" month="10" year="2009"/>
		81	<author login="jlahoda"/>
		82	<compatibility addition="yes" modification="no" semantic="compatible" source="compatible" binary="compatible"/>
		83	<description>
		84	<p>
		85	Class org.netbeans.api.java.classpath.JavaClassPathConstants is created to hold java specific classpath constants.
		86	org.netbeans.api.java.classpath.JavaClassPathConstants.PROCESSOR_PATH constant is created as a key
		87	for Java processor path.
		88	</p>
		89	</description>
		90	<class package="org.netbeans.api.java.classpath" name="JavaClassPathConstants" />
		91	<issue number="174202"/>
		92	</change>
76	<change id="classpath-api-module">	93	<change id="classpath-api-module">
77	<api name="classpath"/>	94	<api name="classpath"/>
78	<summary>Splitting the java API to independent ClassPath API and the rest of the java API</summary>	95	<summary>Splitting the java API to independent ClassPath API and the rest of the java API</summary>

Line 0 Link Here

(-)a/api.java/src/org/netbeans/api/java/classpath/JavaClassPathConstants.java (+61 lines)
	1	/*
	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	3	*
	4	* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
	5	*
	6	* The contents of this file are subject to the terms of either the GNU
	7	* General Public License Version 2 only ("GPL") or the Common
	8	* Development and Distribution License("CDDL") (collectively, the
	9	* "License"). You may not use this file except in compliance with the
	10	* License. You can obtain a copy of the License at
	11	* http://www.netbeans.org/cddl-gplv2.html
	12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
	13	* specific language governing permissions and limitations under the
	14	* License. When distributing the software, include this License Header
	15	* Notice in each file and include the License file at
	16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
	17	* particular file as subject to the "Classpath" exception as provided
	18	* by Sun in the GPL Version 2 section of the License file that
	19	* accompanied this code. If applicable, add the following below the
	20	* License Header, with the fields enclosed by brackets [] replaced by
	21	* your own identifying information:
	22	* "Portions Copyrighted [year] [name of copyright owner]"
	23	*
	24	* If you wish your version of this file to be governed by only the CDDL
	25	* or only the GPL Version 2, indicate your decision by adding
	26	* "[Contributor] elects to include this software in this distribution
	27	* under the [CDDL or GPL Version 2] license." If you do not indicate a
	28	* single choice of license, a recipient has the option to distribute
	29	* your version of this file under either the CDDL, the GPL Version 2 or
	30	* to extend the choice of license to its licensees as provided above.
	31	* However, if you add GPL Version 2 code and therefore, elected the GPL
	32	* Version 2 license, then the option applies only if the new code is
	33	* made subject to such option by the copyright holder.
	34	*
	35	* Contributor(s):
	36	*
	37	* Portions Copyrighted 2009 Sun Microsystems, Inc.
	38	*/
	39
	40	package org.netbeans.api.java.classpath;
	41
	42	/**
	43	* Java related classpath constants.
	44	*
	45	* @author Jan Lahoda
	46	* @since 1.22
	47	*/
	48	public class JavaClassPathConstants {
	49
	50	/**
	51	* ClassPath for annotation processors. If undefined, {@link ClassPath#COMPILE}
	52	* should be used.
	53	* <p class="nonnormative">
	54	* It corresponds to the <code>-processorpath</code> option of <code>javac</code>.
	55	* </p>
	56	*
	57	* @since 1.22
	58	*/
	59	public static final String PROCESSOR_PATH = "classpath/processor";
	60
	61	}

Lines 57-62 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java (-3 / +4 lines)
57	import java.util.regex.Matcher;	57	import java.util.regex.Matcher;
58	import java.util.regex.Pattern;	58	import java.util.regex.Pattern;
59	import org.netbeans.api.java.classpath.ClassPath;	59	import org.netbeans.api.java.classpath.ClassPath;
		60	import org.netbeans.api.java.classpath.JavaClassPathConstants;
60	import org.netbeans.spi.java.classpath.ClassPathFactory;	61	import org.netbeans.spi.java.classpath.ClassPathFactory;
61	import org.netbeans.spi.java.classpath.ClassPathImplementation;	62	import org.netbeans.spi.java.classpath.ClassPathImplementation;
62	import org.netbeans.spi.java.classpath.ClassPathProvider;	63	import org.netbeans.spi.java.classpath.ClassPathProvider;
Lines 125-131 Link Here
125	LOG.log(Level.FINE, "compile/execute-time classpath for file '" + file.getPath() + "' (prj: " + project + "): " + compile);	126	LOG.log(Level.FINE, "compile/execute-time classpath for file '" + file.getPath() + "' (prj: " + project + "): " + compile);
126	}	127	}
127	return compile;	128	return compile;
128	} else if (type.equals(ClassPath.EXECUTE)) {	129	} else if (type.equals(ClassPath.EXECUTE) \|\| type.equals(JavaClassPathConstants.PROCESSOR_PATH)) {
129	if (execute == null) {	130	if (execute == null) {
130	execute = ClassPathFactory.createClassPath(createExecuteClasspath());	131	execute = ClassPathFactory.createClassPath(createExecuteClasspath());
131	}	132	}
Lines 145-151 Link Here
145	LOG.log(Level.FINE, "compile-time classpath for tests for file '" + file.getPath() + "' (prj: " + project + "): " + testCompile);	146	LOG.log(Level.FINE, "compile-time classpath for tests for file '" + file.getPath() + "' (prj: " + project + "): " + testCompile);
146	}	147	}
147	return testCompile;	148	return testCompile;
148	} else if (type.equals(ClassPath.EXECUTE)) {	149	} else if (type.equals(ClassPath.EXECUTE) \|\| type.equals(JavaClassPathConstants.PROCESSOR_PATH)) {
149	if (testExecute == null) {	150	if (testExecute == null) {
150	testExecute = ClassPathFactory.createClassPath(createTestExecuteClasspath("unit"));	151	testExecute = ClassPathFactory.createClassPath(createTestExecuteClasspath("unit"));
151	LOG.log(Level.FINE, "runtime classpath for tests for file '" + file.getPath() + "' (prj: " + project + "): " + testExecute);	152	LOG.log(Level.FINE, "runtime classpath for tests for file '" + file.getPath() + "' (prj: " + project + "): " + testExecute);
Lines 171-177 Link Here
171	LOG.log(Level.FINE, "compile-time classpath for func tests for file '" + file.getPath() + "' (prj: " + project + "): " + funcTestCompile);	172	LOG.log(Level.FINE, "compile-time classpath for func tests for file '" + file.getPath() + "' (prj: " + project + "): " + funcTestCompile);
172	}	173	}
173	return funcTestCompile;	174	return funcTestCompile;
174	} else if (type.equals(ClassPath.EXECUTE)) {	175	} else if (type.equals(ClassPath.EXECUTE) \|\| type.equals(JavaClassPathConstants.PROCESSOR_PATH)) {
175	if (funcTestExecute == null) {	176	if (funcTestExecute == null) {
176	funcTestExecute = ClassPathFactory.createClassPath(createTestExecuteClasspath("qa-functional"));	177	funcTestExecute = ClassPathFactory.createClassPath(createTestExecuteClasspath("qa-functional"));
177	}	178	}