Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge org.eclipse.jdt.apt.core into org.eclipse.jdt.core #2548

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion org.eclipse.jdt.apt.core/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
12 changes: 0 additions & 12 deletions org.eclipse.jdt.apt.core/.options

This file was deleted.

11 changes: 11 additions & 0 deletions org.eclipse.jdt.apt.core/.settings/.api_filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.apt.core" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="API moved to org.eclipse.jdt.core, but reexported here" id="923795461">
<message_arguments>
<message_argument value="3.9.0"/>
<message_argument value="3.8.300"/>
</message_arguments>
</filter>
</resource>
</component>
26 changes: 3 additions & 23 deletions org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,30 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.apt.core; singleton:=true
Bundle-Version: 3.8.500.qualifier
Bundle-SymbolicName: org.eclipse.jdt.apt.core;singleton:=true
Bundle-Version: 3.9.0.qualifier
Bundle-Localization: plugin
Export-Package: com.sun.mirror.apt,
com.sun.mirror.declaration,
com.sun.mirror.type,
com.sun.mirror.util,
org.eclipse.jdt.apt.core.build,
org.eclipse.jdt.apt.core.env,
org.eclipse.jdt.apt.core.internal;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.build;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.declaration;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.env;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.generatedfile;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.type;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.util;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.util
Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.36.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
org.apache.ant;bundle-version="1.6.5"
Bundle-Activator: org.eclipse.jdt.apt.core.internal.AptPlugin
Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.38.0,4.0.0)";visibility:=reexport
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Import-Package: com.sun.mirror.type
Automatic-Module-Name: org.eclipse.jdt.apt.core
10 changes: 3 additions & 7 deletions org.eclipse.jdt.apt.core/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@
# SPDX-License-Identifier: EPL-2.0
###############################################################################
jars.compile.order = .
source.. = src/
output.. = bin/
bin.includes = plugin.xml,\
.,\
bin.includes = .,\
META-INF/,\
about.html,\
mirror-api-license.txt,\
plugin.properties,\
.options
plugin.xml
src.includes = about.html,\
mirror-api-license.txt,\
schema/
mirror-api-license.txt
9 changes: 1 addition & 8 deletions org.eclipse.jdt.apt.core/plugin.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,4 @@
# BEA Systems Inc. - initial implementation
###############################################################################
providerName=Eclipse.org
pluginName=Java Annotation Processing Core
annotationProcessorFactoriesName=Annotation Processor Factories
annotationProcessingName=Annotation Processing
aptBatchMarkerName=Annotation Problem
aptNonreconcileBatchMarkerName=Annotation Problem (build-only processor)
aptBuildMarkerName=APT Build Problem
aptConfigurationMarkerName=APT Configuration Problem
traceComponentLabel=JDT APT Core
pluginName=(Deprecated, included in JDT Core) Java Annotation Processing Core
105 changes: 2 additions & 103 deletions org.eclipse.jdt.apt.core/plugin.xml
Original file line number Diff line number Diff line change
@@ -1,106 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<!--
Copyright (c) 2005, 2014 IBM Corporation and others.

This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-2.0/

SPDX-License-Identifier: EPL-2.0

Contributors:
IBM Corporation - initial API and implementation
-->

<?eclipse version="3.4"?>
<plugin>


<!-- =================================================================================== -->
<!-- Extension Point: Annotation Processor Factories -->
<!-- =================================================================================== -->

<extension-point
id="annotationProcessorFactory"
name="%annotationProcessorFactoriesName"
schema="schema/annotationProcessorFactory.exsd"/>

<!-- =================================================================================== -->
<!-- Extension Point: .factorypath File Type -->
<!-- =================================================================================== -->

<extension point="org.eclipse.team.core.fileTypes">
<fileTypes extension="factorypath" type="text"/>
</extension>

<!-- =================================================================================== -->
<!-- Extension: Compilation Participant -->
<!-- =================================================================================== -->
<extension
id="apt"
name="%annotationProcessingName"
point="org.eclipse.jdt.core.compilationParticipant">
<compilationParticipant
class="org.eclipse.jdt.apt.core.internal.AptCompilationParticipantExtensionFactory"
id="APT"
requiredSourceLevel="1.5">
<managedMarker markerType="org.eclipse.jdt.apt.core.compile.problem"/>
<managedMarker markerType="org.eclipse.jdt.apt.core.nonreconcile.compile.problem"/>
</compilationParticipant>
</extension>

<!-- =================================================================================== -->
<!-- Extension: APT Problem -->
<!-- =================================================================================== -->
<extension id="compile.problem" point="org.eclipse.core.resources.markers" name="%aptBatchMarkerName">
<super type="org.eclipse.jdt.core.problem"/>
<persistent value="true"/>
</extension>

<extension id="nonreconcile.compile.problem" point="org.eclipse.core.resources.markers" name="%aptNonreconcileBatchMarkerName">
<super type="org.eclipse.core.resources.problemmarker"/>
<super type="org.eclipse.core.resources.textmarker"/>
<persistent value="true"/>
</extension>

<extension id="buildproblem" point="org.eclipse.core.resources.markers" name="%aptBuildMarkerName">
<super type="org.eclipse.core.resources.problemmarker"/>
<super type="org.eclipse.core.resources.textmarker"/>
<persistent value="true"/>
</extension>

<extension id="configproblem" point="org.eclipse.core.resources.markers" name="%aptConfigurationMarkerName">
<super type="org.eclipse.core.resources.problemmarker"/>
<super type="org.eclipse.core.resources.textmarker"/>
<persistent value="true"/>
</extension>

<!-- =================================================================================== -->
<!-- Extension: Headless Build -->
<!-- =================================================================================== -->
<extension
id="aptBuild"
point="org.eclipse.core.runtime.applications">
<application>
<run class="org.eclipse.jdt.apt.core.build.AptBuilder"/>
</application>
</extension>

<extension
point="org.eclipse.core.runtime.preferences">
<initializer class="org.eclipse.jdt.apt.core.internal.util.AptCorePreferenceInitializer"/>
</extension>

<extension
point="org.eclipse.ui.trace.traceComponents">
<component
id="org.eclipse.jdt.apt.core.trace"
label="%traceComponentLabel">
<bundle
consumed="false"
name="org.eclipse.jdt.apt.core">
</bundle>
</component>
</extension>
<extension-point id="annotationProcessorFactory" name="Deprecated - use org.eclipse.jdt.core.annotationProcessorFactory" schema="schema/annotationProcessorFactory.exsd"/>
</plugin>
11 changes: 7 additions & 4 deletions org.eclipse.jdt.apt.core/schema/annotationProcessorFactory.exsd
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.jdt.apt.core">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.jdt.apt.core" id="annotationProcessorFactory" name="Annotation Processor Factories"/>
</appInfo>
<appinfo>
<meta.schema plugin="org.eclipse.jdt.apt.core" id="annotationProcessorFactory" name="Deprecated - use org.eclipse.jdt.core.annotationProcessorFactory"/>
</appinfo>
<documentation>
Plug-ins which contribute JSR-175 annotation processors should extend this extension point in order to participate in compilation.
Deprecated - use org.eclipse.jdt.core.annotationProcessorFactory
</documentation>
</annotation>

Expand All @@ -21,6 +21,9 @@
<documentation>

</documentation>
<appinfo>
<meta.attribute deprecated="true"/>
</appinfo>
</annotation>
</attribute>
<attribute name="id" type="string">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.apt.core.internal.AptPlugin;
import org.eclipse.jdt.apt.core.internal.env.APTProblem;
import org.eclipse.jdt.apt.core.util.AptConfig;
import org.eclipse.jdt.apt.tests.annotations.BaseProcessor;
import org.eclipse.jdt.apt.tests.annotations.ProcessorTestStatus;
Expand Down Expand Up @@ -262,11 +263,11 @@ protected IMarker[] getAllAPTMarkers(IPath path){
try {
IMarker[] markers = null;
int total = 0;
final IMarker[] processorMarkers = resource.findMarkers(AptPlugin.APT_BATCH_PROCESSOR_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
final IMarker[] processorMarkers = resource.findMarkers(APTProblem.APT_BATCH_PROCESSOR_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
total = processorMarkers.length;
markers = processorMarkers;

final IMarker[] factoryPathMarkers = resource.findMarkers(AptPlugin.APT_LOADER_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
final IMarker[] factoryPathMarkers = resource.findMarkers(APTProblem.APT_LOADER_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
if( factoryPathMarkers.length != 0 ){
if( total != 0 ){
final int len = factoryPathMarkers.length;
Expand All @@ -279,7 +280,7 @@ protected IMarker[] getAllAPTMarkers(IPath path){
else
markers = factoryPathMarkers;
}
final IMarker[] configMarkers = resource.findMarkers(AptPlugin.APT_CONFIG_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
final IMarker[] configMarkers = resource.findMarkers(APTProblem.APT_CONFIG_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
if( configMarkers.length != 0 ){
if( total != 0 ){
final int len = configMarkers.length;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.apt.core.internal.AptPlugin;
import org.eclipse.jdt.apt.core.internal.env.APTProblem;
import org.eclipse.jdt.apt.core.util.AptConfig;
import org.eclipse.jdt.apt.core.util.IFactoryPath;
import org.eclipse.jdt.apt.tests.external.annotations.classloader.ColorAnnotationProcessor;
Expand Down Expand Up @@ -149,7 +150,7 @@ public void testNonexistentEntry() throws Exception {
fullBuild( project.getFullPath() );
IMarker[] markers = getAllAPTMarkers(_projectPath);
assertEquals(1, markers.length);
assertEquals(AptPlugin.APT_LOADER_PROBLEM_MARKER, markers[0].getType());
assertEquals(APTProblem.APT_LOADER_PROBLEM_MARKER, markers[0].getType());
String message = markers[0].getAttribute(IMarker.MESSAGE, "");
assertTrue(message.contains("bogusJar.jar"));

Expand Down
1 change: 1 addition & 0 deletions org.eclipse.jdt.core/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
<classpathentry kind="src" path="formatter"/>
<classpathentry kind="src" path="model"/>
<classpathentry kind="src" path="search"/>
<classpathentry kind="src" path="apt"/>
<classpathentry kind="output" path="bin"/>
</classpath>
13 changes: 13 additions & 0 deletions org.eclipse.jdt.core/.options
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,16 @@ org.eclipse.jdt.core/perf/containerinitializer=5000

# Reports the time to perform a reconcile operation.
org.eclipse.jdt.core/perf/reconcile=1000

# Debug tracing for org.eclipse.jdt.core plugin
# Includes traces needed for most client-visible problems
org.eclipse.jdt.apt.core/debug=false

# Debug tracing for file generation
org.eclipse.jdt.apt.core/debug/generatedFiles=false

# Debug tracing for internal data structures used in file generation
org.eclipse.jdt.apt.core/debug/generatedFileMaps=false

# Debug tracing for compilation environment
org.eclipse.jdt.apt.core/debug/compilationEnv=false
19 changes: 17 additions & 2 deletions org.eclipse.jdt.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true
Bundle-Version: 3.38.100.qualifier
Bundle-Version: 3.39.0.qualifier
Bundle-Activator: org.eclipse.jdt.core.JavaCore
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down Expand Up @@ -41,7 +41,22 @@ Export-Package: org.eclipse.jdt.core,
org.eclipse.jdt.internal.eval;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests",
org.eclipse.jdt.internal.formatter;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests, org.eclipse.jdt.ui.tests",
org.eclipse.jdt.internal.formatter.linewrap;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests",
org.eclipse.jdt.internal.formatter.old;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests"
org.eclipse.jdt.internal.formatter.old;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests",
com.sun.mirror.apt;version="3.8.400",
com.sun.mirror.declaration;version="3.8.400",
com.sun.mirror.type;version="3.8.400",
com.sun.mirror.util;version="3.8.400",
org.eclipse.jdt.apt.core.build;version="3.8.400",
org.eclipse.jdt.apt.core.env;version="3.8.400",
org.eclipse.jdt.apt.core.internal;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.build;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.declaration;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.env;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.generatedfile;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.type;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.internal.util;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
org.eclipse.jdt.apt.core.util;version="3.8.400"
Import-Package: com.sun.mirror.type
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.18.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)",
Expand Down
50 changes: 45 additions & 5 deletions org.eclipse.jdt.core/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,51 @@ <h3>License</h3>
href="http://www.eclipse.org/">http://www.eclipse.org</a>.
</p>


<h3>Disassembler</h3>
<p>This plug-in contains a bytecode disassembler (&quot;Disassembler&quot;) that can produce a listing of the Java assembler mnemonics (&quot;Assembler Mnemonics&quot;) for a Java method. If you
use the Disassembler to view the Assembler Mnemonics for a method, you should ensure that doing so will not violate the terms of any licenses that apply to your use of that method, as
such licenses may not permit you to reverse engineer, decompile, or disassemble method bytecodes.</p>
<h3>Third Party Content</h3>

<p>The Content includes items that have been sourced from third parties as set out below. If you
did not receive this Content directly from the Eclipse Foundation, the following is provided
for informational purposes only, and you should look to the Redistributor&rsquo;s license for
terms and conditions of use.</p>

<h4>Java Mirror API</h4>

<p>The plug-in includes classes in the com.sun.mirror package (&quot;Java Mirror API&quot;).
Your use of the Java Mirror API is governed by the terms and conditions of the following license:</p>

<blockquote>
<pre>
Copyright (c) 2004, Sun Microsystems, Inc. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
* Neither the name of the Sun Microsystems, Inc. nor the names of
its contributors may be used to endorse or promote products
derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</pre>
</blockquote>


</body>
</html>
Loading
Loading