Attachment #135801 for bug #230847

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 230847
Collapse All | Expand All

Lines 186-191 Link Here

(-)a/j2ee.clientproject/nbproject/project.xml (+8 lines)
186	</run-dependency>	186	</run-dependency>
187	</dependency>	187	</dependency>
188	<dependency>	188	<dependency>
		189	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		190	<build-prerequisite/>
		191	<compile-dependency/>
		192	<run-dependency>
		193	<specification-version>1.0</specification-version>
		194	</run-dependency>
		195	</dependency>
		196	<dependency>
189	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	197	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
190	<build-prerequisite/>	198	<build-prerequisite/>
191	<compile-dependency/>	199	<compile-dependency/>




import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.SourceUtils;
import org.netbeans.modules.j2ee.api.ejbjar.Car;
import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation;

/**
 *
 * @author jungi
 */
@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class)
public class AppClientInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation {
    
    public AppClientInjectionTargetQueryImplementation() {

Lines 65-71 Link Here

(-)a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java (-1 / +1 lines)
65	import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceSupport;	65	import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceSupport;
66	import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference;	66	import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference;
67	import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;	67	import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
68	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	68	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
69	import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;	69	import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
70	import org.netbeans.modules.j2ee.dd.api.client.AppClient;	70	import org.netbeans.modules.j2ee.dd.api.client.AppClient;
71	import org.netbeans.modules.j2ee.dd.api.client.DDProvider;	71	import org.netbeans.modules.j2ee.dd.api.client.DDProvider;

Lines 172-177 Link Here

(-)a/j2ee.common/nbproject/project.xml (+8 lines)
172	</run-dependency>	172	</run-dependency>
173	</dependency>	173	</dependency>
174	<dependency>	174	<dependency>
		175	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		176	<build-prerequisite/>
		177	<compile-dependency/>
		178	<run-dependency>
		179	<specification-version>1.0</specification-version>
		180	</run-dependency>
		181	</dependency>
		182	<dependency>
175	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	183	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
176	<build-prerequisite/>	184	<build-prerequisite/>
177	<compile-dependency/>	185	<compile-dependency/>




import org.netbeans.api.project.Project;
import javax.lang.model.element.TypeElement;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
import org.openide.filesystems.FileObject;

/**
 * Realization for all common ee injectable targets
 */
@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class)
public class EEInjectiontargetQueryImplementation implements InjectionTargetQueryImplementation {
    
    /** Creates a new instance of EEInjectiontargetQueryImplementation */

Lines 48-54 Link Here

(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/EMGenStrategyResolverImpl.java (-1 / +1 lines)
48	import org.netbeans.api.java.source.Task;	48	import org.netbeans.api.java.source.Task;
49	import org.netbeans.api.java.source.WorkingCopy;	49	import org.netbeans.api.java.source.WorkingCopy;
50	import org.netbeans.api.project.Project;	50	import org.netbeans.api.project.Project;
51	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	51	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
52	import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;	52	import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
53	import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;	53	import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
54	import org.netbeans.modules.j2ee.persistence.api.PersistenceScope;	54	import org.netbeans.modules.j2ee.persistence.api.PersistenceScope;

Lines 220-225 Link Here

(-)a/j2ee.ejbcore/nbproject/project.xml (+8 lines)
220	<run-dependency/>	220	<run-dependency/>
221	</dependency>	221	</dependency>
222	<dependency>	222	<dependency>
		223	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		224	<build-prerequisite/>
		225	<compile-dependency/>
		226	<run-dependency>
		227	<specification-version>1.0</specification-version>
		228	</run-dependency>
		229	</dependency>
		230	<dependency>
223	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	231	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
224	<build-prerequisite/>	232	<build-prerequisite/>
225	<compile-dependency/>	233	<compile-dependency/>

Lines 48-54 Link Here

(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbInjectionTargetQueryImplementation.java (-2 / +2 lines)
48	import javax.lang.model.element.TypeElement;	48	import javax.lang.model.element.TypeElement;
49	import org.netbeans.api.j2ee.core.Profile;	49	import org.netbeans.api.j2ee.core.Profile;
50	import org.netbeans.api.java.source.CompilationController;	50	import org.netbeans.api.java.source.CompilationController;
51	import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation;	51	import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation;
52	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;	52	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
53	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;	53	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
54	import org.openide.util.Exceptions;	54	import org.openide.util.Exceptions;
Lines 57-63 Link Here
57	*	57	*
58	* @author Martin Adamek	58	* @author Martin Adamek
59	*/	59	*/
60	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class)	60	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class)
61	public class EjbInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation {	61	public class EjbInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation {
62		62
63	public EjbInjectionTargetQueryImplementation() {	63	public EjbInjectionTargetQueryImplementation() {

Lines 76-82 Link Here

(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java (-1 / +1 lines)
76	import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;	76	import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
77	import org.netbeans.modules.j2ee.common.method.MethodModel;	77	import org.netbeans.modules.j2ee.common.method.MethodModel;
78	import org.netbeans.modules.j2ee.common.method.MethodModelSupport;	78	import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
79	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	79	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
80	import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;	80	import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
81	import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;	81	import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
82	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;	82	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;

Lines 65-71 Link Here

(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java (-1 / +1 lines)
65	import org.netbeans.modules.j2ee.common.Util;	65	import org.netbeans.modules.j2ee.common.Util;
66	import org.netbeans.modules.j2ee.common.method.MethodModel;	66	import org.netbeans.modules.j2ee.common.method.MethodModel;
67	import org.netbeans.modules.j2ee.common.method.MethodModelSupport;	67	import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
68	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	68	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
69	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;	69	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
70	import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;	70	import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
71	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;	71	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;

Lines 74-80 Link Here

(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java (-1 / +1 lines)
74	import org.netbeans.modules.j2ee.common.Util;	74	import org.netbeans.modules.j2ee.common.Util;
75	import org.netbeans.modules.j2ee.common.method.MethodModel;	75	import org.netbeans.modules.j2ee.common.method.MethodModel;
76	import org.netbeans.modules.j2ee.common.method.MethodModelSupport;	76	import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
77	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	77	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
78	import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;	78	import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
79	import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;	79	import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
80	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;	80	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;

Lines 68-74 Link Here

(-)a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java (-1 / +1 lines)
68	import org.netbeans.modules.j2ee.common.Util;	68	import org.netbeans.modules.j2ee.common.Util;
69	import org.netbeans.modules.j2ee.common.method.MethodModel;	69	import org.netbeans.modules.j2ee.common.method.MethodModel;
70	import org.netbeans.modules.j2ee.common.method.MethodModelSupport;	70	import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
71	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	71	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
72	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;	72	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
73	import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;	73	import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
74	import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;	74	import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;

Line 0 Link Here

(-)a/j2ee.injection/build.xml (+5 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<project basedir="." default="netbeans" name="j2ee.injection">
	3	<description>Builds, tests, and runs the project org.netbeans.modules.j2ee.injection</description>
	4	<import file="../nbbuild/templates/projectized.xml"/>
	5	</project>

Line 0 Link Here

(-)a/j2ee.injection/manifest.mf (+5 lines)
	1	Manifest-Version: 1.0
	2	OpenIDE-Module: org.netbeans.modules.j2ee.injection
	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/injection/Bundle.properties
	4	OpenIDE-Module-Specification-Version: 1.0
	5

Line 0 Link Here

(-)a/j2ee.injection/nbproject/project.properties (+2 lines)
	1	javac.source=1.6
	2	javac.compilerargs=-Xlint -Xlint:-serial




<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
    <type>org.netbeans.modules.apisupport.project</type>
    <configuration>
        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
            <code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.modules.java.source</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>0.127</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.7</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.lookup</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.21</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <friend-packages>
                <friend>org.netbeans.modules.j2ee.clientproject</friend>
                <friend>org.netbeans.modules.j2ee.common</friend>
                <friend>org.netbeans.modules.j2ee.ejbcore</friend>
                <friend>org.netbeans.modules.maven.j2ee</friend>
                <friend>org.netbeans.modules.maven.jaxws</friend>
                <friend>org.netbeans.modules.web.beans</friend>
                <friend>org.netbeans.modules.web.core</friend>
                <friend>org.netbeans.modules.web.jsf</friend>
                <friend>org.netbeans.modules.web.project</friend>
                <friend>org.netbeans.modules.websvc.core</friend>
                <package>org.netbeans.modules.j2ee.injection.api</package>
                <package>org.netbeans.modules.j2ee.injection.spi</package>
            </friend-packages>
        </data>
    </configuration>
</project>

Line 0 Link Here

(-)a/j2ee.injection/src/org/netbeans/modules/j2ee/injection/Bundle.properties (+1 lines)
	1	OpenIDE-Module-Name=Injection Query API/SPI

Lines 42-48 Link Here

(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/queries/api/InjectionTargetQuery.java (-2 / +2 lines)
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44		44
45	package org.netbeans.modules.j2ee.common.queries.api;	45	package org.netbeans.modules.j2ee.injection.api;
46		46
47	import java.io.IOException;	47	import java.io.IOException;
48	import java.util.ArrayList;	48	import java.util.ArrayList;
Lines 51-57 Link Here
51	import org.netbeans.api.java.source.CompilationController;	51	import org.netbeans.api.java.source.CompilationController;
52	import org.netbeans.api.java.source.JavaSource;	52	import org.netbeans.api.java.source.JavaSource;
53	import org.netbeans.api.java.source.Task;	53	import org.netbeans.api.java.source.Task;
54	import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation;	54	import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation;
55	import org.openide.filesystems.FileObject;	55	import org.openide.filesystems.FileObject;
56	import org.openide.util.Lookup;	56	import org.openide.util.Lookup;
57	import org.openide.util.LookupEvent;	57	import org.openide.util.LookupEvent;

Lines 42-48 Link Here

(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/queries/spi/InjectionTargetQueryImplementation.java (-1 / +2 lines)
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44		44
45	package org.netbeans.modules.j2ee.common.queries.spi;	45	package org.netbeans.modules.j2ee.injection.spi;
		46
46	import javax.lang.model.element.TypeElement;	47	import javax.lang.model.element.TypeElement;
47	import org.netbeans.api.java.source.CompilationController;	48	import org.netbeans.api.java.source.CompilationController;
48		49

Lines 163-168 Link Here

(-)a/maven.j2ee/nbproject/project.xml (+8 lines)
163	</run-dependency>	163	</run-dependency>
164	</dependency>	164	</dependency>
165	<dependency>	165	<dependency>
		166	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		167	<build-prerequisite/>
		168	<compile-dependency/>
		169	<run-dependency>
		170	<specification-version>1.0</specification-version>
		171	</run-dependency>
		172	</dependency>
		173	<dependency>
166	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	174	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
167	<build-prerequisite/>	175	<build-prerequisite/>
168	<compile-dependency/>	176	<compile-dependency/>

Lines 70-76 Link Here

(-)a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/EntRefContainerImpl.java (-1 / +1 lines)
70	import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference;	70	import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference;
71	import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;	71	import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
72	import org.netbeans.modules.j2ee.common.dd.DDHelper;	72	import org.netbeans.modules.j2ee.common.dd.DDHelper;
73	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	73	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
74	import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;	74	import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
75	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;	75	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
76	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;	76	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;

Lines 163-168 Link Here

(-)a/maven.jaxws/nbproject/project.xml (+8 lines)
163	</run-dependency>	163	</run-dependency>
164	</dependency>	164	</dependency>
165	<dependency>	165	<dependency>
		166	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		167	<build-prerequisite/>
		168	<compile-dependency/>
		169	<run-dependency>
		170	<specification-version>1.0</specification-version>
		171	</run-dependency>
		172	</dependency>
		173	<dependency>
166	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	174	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
167	<build-prerequisite/>	175	<build-prerequisite/>
168	<compile-dependency/>	176	<compile-dependency/>

Lines 91-97 Link Here

(-)a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/JaxWsCodeGenerator.java (-1 / +1 lines)
91	import org.netbeans.api.project.Project;	91	import org.netbeans.api.project.Project;
92		92
93	import org.netbeans.modules.editor.NbEditorUtilities;	93	import org.netbeans.modules.editor.NbEditorUtilities;
94	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	94	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
95	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;	95	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
96	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;	96	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
97	import org.netbeans.modules.websvc.api.jaxws.wsdlmodel.WsdlOperation;	97	import org.netbeans.modules.websvc.api.jaxws.wsdlmodel.WsdlOperation;

Lines 643-648 Link Here

(-)a/nbbuild/cluster.properties (+1 lines)
643	j2ee.ejbrefactoring,\	643	j2ee.ejbrefactoring,\
644	j2ee.ejbverification,\	644	j2ee.ejbverification,\
645	j2ee.genericserver,\	645	j2ee.genericserver,\
		646	j2ee.injection,\
646	j2ee.jboss4,\	647	j2ee.jboss4,\
647	j2ee.kit,\	648	j2ee.kit,\
648	j2ee.platform,\	649	j2ee.platform,\

Lines 93-98 Link Here

(-)a/web.beans/nbproject/project.xml (+8 lines)
93	</run-dependency>	93	</run-dependency>
94	</dependency>	94	</dependency>
95	<dependency>	95	<dependency>
		96	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		97	<build-prerequisite/>
		98	<compile-dependency/>
		99	<run-dependency>
		100	<specification-version>1.0</specification-version>
		101	</run-dependency>
		102	</dependency>
		103	<dependency>
96	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	104	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
97	<build-prerequisite/>	105	<build-prerequisite/>
98	<compile-dependency/>	106	<compile-dependency/>

Lines 54-60 Link Here

(-)a/web.beans/src/org/netbeans/modules/web/beans/WebBeanInjectionTargetQueryImplementation.java (-2 / +2 lines)
54	import org.netbeans.api.java.source.ElementHandle;	54	import org.netbeans.api.java.source.ElementHandle;
55	import org.netbeans.api.project.FileOwnerQuery;	55	import org.netbeans.api.project.FileOwnerQuery;
56	import org.netbeans.api.project.Project;	56	import org.netbeans.api.project.Project;
57	import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation;	57	import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation;
58	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;	58	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
59	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;	59	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
60	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException;	60	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException;
Lines 68-74 Link Here
68	* @author ads	68	* @author ads
69	*	69	*
70	*/	70	*/
71	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class)	71	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class)
72	public class WebBeanInjectionTargetQueryImplementation implements	72	public class WebBeanInjectionTargetQueryImplementation implements
73	InjectionTargetQueryImplementation	73	InjectionTargetQueryImplementation
74	{	74	{

Lines 197-202 Link Here

(-)a/web.core/nbproject/project.xml (+8 lines)
197	</run-dependency>	197	</run-dependency>
198	</dependency>	198	</dependency>
199	<dependency>	199	<dependency>
		200	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		201	<build-prerequisite/>
		202	<compile-dependency/>
		203	<run-dependency>
		204	<specification-version>1.0</specification-version>
		205	</run-dependency>
		206	</dependency>
		207	<dependency>
200	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	208	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
201	<build-prerequisite/>	209	<build-prerequisite/>
202	<compile-dependency/>	210	<compile-dependency/>

Lines 47-53 Link Here

(-)a/web.core/src/org/netbeans/modules/web/core/WebInjectionTargetQueryImplementation.java (-2 / +2 lines)
47	import javax.lang.model.element.TypeElement;	47	import javax.lang.model.element.TypeElement;
48	import org.netbeans.api.j2ee.core.Profile;	48	import org.netbeans.api.j2ee.core.Profile;
49	import org.netbeans.api.java.source.CompilationController;	49	import org.netbeans.api.java.source.CompilationController;
50	import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation;	50	import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation;
51	import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;	51	import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
52	import org.netbeans.modules.web.api.webmodule.WebModule;	52	import org.netbeans.modules.web.api.webmodule.WebModule;
53		53
Lines 55-61 Link Here
55	*	55	*
56	* @author Martin Adamek	56	* @author Martin Adamek
57	*/	57	*/
58	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class)	58	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class)
59	public class WebInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation {	59	public class WebInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation {
60		60
61	public WebInjectionTargetQueryImplementation() {	61	public WebInjectionTargetQueryImplementation() {

Lines 216-221 Link Here

(-)a/web.jsf/nbproject/project.xml (+8 lines)
216	</run-dependency>	216	</run-dependency>
217	</dependency>	217	</dependency>
218	<dependency>	218	<dependency>
		219	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		220	<build-prerequisite/>
		221	<compile-dependency/>
		222	<run-dependency>
		223	<specification-version>1.0</specification-version>
		224	</run-dependency>
		225	</dependency>
		226	<dependency>
219	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	227	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
220	<build-prerequisite/>	228	<build-prerequisite/>
221	<compile-dependency/>	229	<compile-dependency/>

Lines 53-59 Link Here

(-)a/web.jsf/src/org/netbeans/modules/web/jsf/JSFInjectionTargetQueryImplementation.java (-2 / +2 lines)
53	import org.netbeans.api.java.source.CompilationController;	53	import org.netbeans.api.java.source.CompilationController;
54	import org.netbeans.api.project.FileOwnerQuery;	54	import org.netbeans.api.project.FileOwnerQuery;
55	import org.netbeans.api.project.Project;	55	import org.netbeans.api.project.Project;
56	import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation;	56	import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation;
57	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;	57	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
58	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;	58	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
59	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException;	59	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException;
Lines 69-75 Link Here
69	* @author Petr Pisl	69	* @author Petr Pisl
70	*/	70	*/
71		71
72	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class)	72	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class)
73	public class JSFInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation {	73	public class JSFInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation {
74		74
75	public JSFInjectionTargetQueryImplementation() {	75	public JSFInjectionTargetQueryImplementation() {

Lines 209-214 Link Here

(-)a/web.project/nbproject/project.xml (+8 lines)
209	</run-dependency>	209	</run-dependency>
210	</dependency>	210	</dependency>
211	<dependency>	211	<dependency>
		212	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		213	<build-prerequisite/>
		214	<compile-dependency/>
		215	<run-dependency>
		216	<specification-version>1.0</specification-version>
		217	</run-dependency>
		218	</dependency>
		219	<dependency>
212	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	220	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
213	<build-prerequisite/>	221	<build-prerequisite/>
214	<compile-dependency/>	222	<compile-dependency/>

Lines 78-84 Link Here

(-)a/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java (-1 / +1 lines)
78	import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference;	78	import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference;
79	import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;	79	import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
80	import org.netbeans.modules.j2ee.common.dd.DDHelper;	80	import org.netbeans.modules.j2ee.common.dd.DDHelper;
81	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	81	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
82	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;	82	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
83	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;	83	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
84	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;	84	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;

Lines 188-193 Link Here

(-)a/websvc.core/nbproject/project.xml (+8 lines)
188	</run-dependency>	188	</run-dependency>
189	</dependency>	189	</dependency>
190	<dependency>	190	<dependency>
		191	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
		192	<build-prerequisite/>
		193	<compile-dependency/>
		194	<run-dependency>
		195	<specification-version>1.0</specification-version>
		196	</run-dependency>
		197	</dependency>
		198	<dependency>
191	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>	199	<code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
192	<build-prerequisite/>	200	<build-prerequisite/>
193	<compile-dependency/>	201	<compile-dependency/>

Lines 53-59 Link Here

(-)a/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java (-2 / +2 lines)
53	import org.netbeans.modules.j2ee.common.Util;	53	import org.netbeans.modules.j2ee.common.Util;
54	import javax.lang.model.element.TypeElement;	54	import javax.lang.model.element.TypeElement;
55	import org.netbeans.api.java.source.CompilationController;	55	import org.netbeans.api.java.source.CompilationController;
56	import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation;	56	import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation;
57	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;	57	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
58	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
59		59
Lines 61-67 Link Here
61	*	61	*
62	* @author Martin Adamek, Milan Kuchtiak	62	* @author Martin Adamek, Milan Kuchtiak
63	*/	63	*/
64	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class)	64	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class)
65	public class WSInjectiontargetQueryImplementation implements InjectionTargetQueryImplementation {	65	public class WSInjectiontargetQueryImplementation implements InjectionTargetQueryImplementation {
66		66
67	/** Creates a new instance of WSInjectiontargetQueryImplementation */	67	/** Creates a new instance of WSInjectiontargetQueryImplementation */

Lines 57-63 Link Here

(-)a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/CompilerTask.java (-1 / +1 lines)
57	import org.netbeans.api.java.source.JavaSource.Phase;	57	import org.netbeans.api.java.source.JavaSource.Phase;
58	import org.netbeans.api.project.FileOwnerQuery;	58	import org.netbeans.api.project.FileOwnerQuery;
59	import org.netbeans.api.project.Project;	59	import org.netbeans.api.project.Project;
60	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	60	import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery;
61	import org.netbeans.modules.websvc.api.jaxws.wsdlmodel.WsdlOperation;	61	import org.netbeans.modules.websvc.api.jaxws.wsdlmodel.WsdlOperation;
62	import org.netbeans.modules.websvc.api.support.java.SourceUtils;	62	import org.netbeans.modules.websvc.api.support.java.SourceUtils;
63	import org.netbeans.modules.websvc.core.JaxWsUtils;	63	import org.netbeans.modules.websvc.core.JaxWsUtils;

Return to bug 230847

Line 0 Link Here

(-)a/j2ee.injection/nbproject/project.xml (+49 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<project xmlns="http://www.netbeans.org/ns/project/1">
	3	<type>org.netbeans.modules.apisupport.project</type>
	4	<configuration>
	5	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
	6	<code-name-base>org.netbeans.modules.j2ee.injection</code-name-base>
	7	<module-dependencies>
	8	<dependency>
	9	<code-name-base>org.netbeans.modules.java.source</code-name-base>
	10	<build-prerequisite/>
	11	<compile-dependency/>
	12	<run-dependency>
	13	<specification-version>0.127</specification-version>
	14	</run-dependency>
	15	</dependency>
	16	<dependency>
	17	<code-name-base>org.openide.filesystems</code-name-base>
	18	<build-prerequisite/>
	19	<compile-dependency/>
	20	<run-dependency>
	21	<specification-version>8.7</specification-version>
	22	</run-dependency>
	23	</dependency>
	24	<dependency>
	25	<code-name-base>org.openide.util.lookup</code-name-base>
	26	<build-prerequisite/>
	27	<compile-dependency/>
	28	<run-dependency>
	29	<specification-version>8.21</specification-version>
	30	</run-dependency>
	31	</dependency>
	32	</module-dependencies>
	33	<friend-packages>
	34	<friend>org.netbeans.modules.j2ee.clientproject</friend>
	35	<friend>org.netbeans.modules.j2ee.common</friend>
	36	<friend>org.netbeans.modules.j2ee.ejbcore</friend>
	37	<friend>org.netbeans.modules.maven.j2ee</friend>
	38	<friend>org.netbeans.modules.maven.jaxws</friend>
	39	<friend>org.netbeans.modules.web.beans</friend>
	40	<friend>org.netbeans.modules.web.core</friend>
	41	<friend>org.netbeans.modules.web.jsf</friend>
	42	<friend>org.netbeans.modules.web.project</friend>
	43	<friend>org.netbeans.modules.websvc.core</friend>
	44	<package>org.netbeans.modules.j2ee.injection.api</package>
	45	<package>org.netbeans.modules.j2ee.injection.spi</package>
	46	</friend-packages>
	47	</data>
	48	</configuration>
	49	</project>