diff --git a/j2ee.clientproject/nbproject/project.xml b/j2ee.clientproject/nbproject/project.xml --- a/j2ee.clientproject/nbproject/project.xml +++ b/j2ee.clientproject/nbproject/project.xml @@ -186,6 +186,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java @@ -49,13 +49,13 @@ 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.common.queries.spi.InjectionTargetQueryImplementation; +import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation; /** * * @author jungi */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class) +@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class) public class AppClientInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation { public AppClientInjectionTargetQueryImplementation() { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java @@ -65,7 +65,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceSupport; import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference; import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils; import org.netbeans.modules.j2ee.dd.api.client.AppClient; import org.netbeans.modules.j2ee.dd.api.client.DDProvider; diff --git a/j2ee.common/nbproject/project.xml b/j2ee.common/nbproject/project.xml --- a/j2ee.common/nbproject/project.xml +++ b/j2ee.common/nbproject/project.xml @@ -172,6 +172,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/EEInjectiontargetQueryImplementation.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/EEInjectiontargetQueryImplementation.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/EEInjectiontargetQueryImplementation.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/EEInjectiontargetQueryImplementation.java @@ -52,14 +52,14 @@ import org.netbeans.api.project.Project; import javax.lang.model.element.TypeElement; import org.netbeans.api.java.source.CompilationController; -import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; +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.common.queries.spi.InjectionTargetQueryImplementation.class) +@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 */ diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/EMGenStrategyResolverImpl.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/EMGenStrategyResolverImpl.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/EMGenStrategyResolverImpl.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/EMGenStrategyResolverImpl.java @@ -48,7 +48,7 @@ import org.netbeans.api.java.source.Task; import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier; import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils; import org.netbeans.modules.j2ee.persistence.api.PersistenceScope; diff --git a/j2ee.ejbcore/nbproject/project.xml b/j2ee.ejbcore/nbproject/project.xml --- a/j2ee.ejbcore/nbproject/project.xml +++ b/j2ee.ejbcore/nbproject/project.xml @@ -220,6 +220,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbInjectionTargetQueryImplementation.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbInjectionTargetQueryImplementation.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbInjectionTargetQueryImplementation.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbInjectionTargetQueryImplementation.java @@ -48,7 +48,7 @@ import javax.lang.model.element.TypeElement; import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.java.source.CompilationController; -import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; +import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction; import org.openide.util.Exceptions; @@ -57,7 +57,7 @@ * * @author Martin Adamek */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class) +@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class) public class EjbInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation { public EjbInjectionTargetQueryImplementation() { diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java @@ -76,7 +76,7 @@ import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities; import org.netbeans.modules.j2ee.common.method.MethodModel; import org.netbeans.modules.j2ee.common.method.MethodModelSupport; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier; import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils; import org.netbeans.modules.j2ee.dd.api.common.ResourceRef; diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java @@ -65,7 +65,7 @@ import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.method.MethodModel; import org.netbeans.modules.j2ee.common.method.MethodModelSupport; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.dd.api.common.ResourceRef; import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans; import org.netbeans.modules.j2ee.dd.api.ejb.Ejb; diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java @@ -74,7 +74,7 @@ import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.method.MethodModel; import org.netbeans.modules.j2ee.common.method.MethodModelSupport; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier; import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils; import org.netbeans.modules.j2ee.dd.api.ejb.Ejb; diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java --- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java +++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java @@ -68,7 +68,7 @@ import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.common.method.MethodModel; import org.netbeans.modules.j2ee.common.method.MethodModelSupport; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.dd.api.common.ResourceRef; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; diff --git a/j2ee.injection/build.xml b/j2ee.injection/build.xml new file mode 100644 --- /dev/null +++ b/j2ee.injection/build.xml @@ -0,0 +1,5 @@ + + + Builds, tests, and runs the project org.netbeans.modules.j2ee.injection + + diff --git a/j2ee.injection/manifest.mf b/j2ee.injection/manifest.mf new file mode 100644 --- /dev/null +++ b/j2ee.injection/manifest.mf @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +OpenIDE-Module: org.netbeans.modules.j2ee.injection +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/injection/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/j2ee.injection/nbproject/project.properties b/j2ee.injection/nbproject/project.properties new file mode 100644 --- /dev/null +++ b/j2ee.injection/nbproject/project.properties @@ -0,0 +1,2 @@ +javac.source=1.6 +javac.compilerargs=-Xlint -Xlint:-serial diff --git a/j2ee.injection/nbproject/project.xml b/j2ee.injection/nbproject/project.xml new file mode 100644 --- /dev/null +++ b/j2ee.injection/nbproject/project.xml @@ -0,0 +1,49 @@ + + + org.netbeans.modules.apisupport.project + + + org.netbeans.modules.j2ee.injection + + + org.netbeans.modules.java.source + + + + 0.127 + + + + org.openide.filesystems + + + + 8.7 + + + + org.openide.util.lookup + + + + 8.21 + + + + + org.netbeans.modules.j2ee.clientproject + org.netbeans.modules.j2ee.common + org.netbeans.modules.j2ee.ejbcore + org.netbeans.modules.maven.j2ee + org.netbeans.modules.maven.jaxws + org.netbeans.modules.web.beans + org.netbeans.modules.web.core + org.netbeans.modules.web.jsf + org.netbeans.modules.web.project + org.netbeans.modules.websvc.core + org.netbeans.modules.j2ee.injection.api + org.netbeans.modules.j2ee.injection.spi + + + + diff --git a/j2ee.injection/src/org/netbeans/modules/j2ee/injection/Bundle.properties b/j2ee.injection/src/org/netbeans/modules/j2ee/injection/Bundle.properties new file mode 100644 --- /dev/null +++ b/j2ee.injection/src/org/netbeans/modules/j2ee/injection/Bundle.properties @@ -0,0 +1,1 @@ +OpenIDE-Module-Name=Injection Query API/SPI diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/queries/api/InjectionTargetQuery.java b/j2ee.injection/src/org/netbeans/modules/j2ee/injection/api/InjectionTargetQuery.java rename from j2ee.common/src/org/netbeans/modules/j2ee/common/queries/api/InjectionTargetQuery.java rename to j2ee.injection/src/org/netbeans/modules/j2ee/injection/api/InjectionTargetQuery.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/queries/api/InjectionTargetQuery.java +++ b/j2ee.injection/src/org/netbeans/modules/j2ee/injection/api/InjectionTargetQuery.java @@ -42,7 +42,7 @@ * made subject to such option by the copyright holder. */ -package org.netbeans.modules.j2ee.common.queries.api; +package org.netbeans.modules.j2ee.injection.api; import java.io.IOException; import java.util.ArrayList; @@ -51,7 +51,7 @@ import org.netbeans.api.java.source.CompilationController; import org.netbeans.api.java.source.JavaSource; import org.netbeans.api.java.source.Task; -import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; +import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation; import org.openide.filesystems.FileObject; import org.openide.util.Lookup; import org.openide.util.LookupEvent; diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/queries/spi/InjectionTargetQueryImplementation.java b/j2ee.injection/src/org/netbeans/modules/j2ee/injection/spi/InjectionTargetQueryImplementation.java rename from j2ee.common/src/org/netbeans/modules/j2ee/common/queries/spi/InjectionTargetQueryImplementation.java rename to j2ee.injection/src/org/netbeans/modules/j2ee/injection/spi/InjectionTargetQueryImplementation.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/queries/spi/InjectionTargetQueryImplementation.java +++ b/j2ee.injection/src/org/netbeans/modules/j2ee/injection/spi/InjectionTargetQueryImplementation.java @@ -42,7 +42,8 @@ * made subject to such option by the copyright holder. */ -package org.netbeans.modules.j2ee.common.queries.spi; +package org.netbeans.modules.j2ee.injection.spi; + import javax.lang.model.element.TypeElement; import org.netbeans.api.java.source.CompilationController; diff --git a/maven.j2ee/nbproject/project.xml b/maven.j2ee/nbproject/project.xml --- a/maven.j2ee/nbproject/project.xml +++ b/maven.j2ee/nbproject/project.xml @@ -163,6 +163,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/EntRefContainerImpl.java b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/EntRefContainerImpl.java --- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/EntRefContainerImpl.java +++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/web/EntRefContainerImpl.java @@ -70,7 +70,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference; import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference; import org.netbeans.modules.j2ee.common.dd.DDHelper; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel; diff --git a/maven.jaxws/nbproject/project.xml b/maven.jaxws/nbproject/project.xml --- a/maven.jaxws/nbproject/project.xml +++ b/maven.jaxws/nbproject/project.xml @@ -163,6 +163,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/JaxWsCodeGenerator.java b/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/JaxWsCodeGenerator.java --- a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/JaxWsCodeGenerator.java +++ b/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/JaxWsCodeGenerator.java @@ -91,7 +91,7 @@ import org.netbeans.api.project.Project; import org.netbeans.modules.editor.NbEditorUtilities; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.websvc.api.jaxws.wsdlmodel.WsdlOperation; diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -643,6 +643,7 @@ j2ee.ejbrefactoring,\ j2ee.ejbverification,\ j2ee.genericserver,\ + j2ee.injection,\ j2ee.jboss4,\ j2ee.kit,\ j2ee.platform,\ diff --git a/web.beans/nbproject/project.xml b/web.beans/nbproject/project.xml --- a/web.beans/nbproject/project.xml +++ b/web.beans/nbproject/project.xml @@ -93,6 +93,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/web.beans/src/org/netbeans/modules/web/beans/WebBeanInjectionTargetQueryImplementation.java b/web.beans/src/org/netbeans/modules/web/beans/WebBeanInjectionTargetQueryImplementation.java --- a/web.beans/src/org/netbeans/modules/web/beans/WebBeanInjectionTargetQueryImplementation.java +++ b/web.beans/src/org/netbeans/modules/web/beans/WebBeanInjectionTargetQueryImplementation.java @@ -54,7 +54,7 @@ import org.netbeans.api.java.source.ElementHandle; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; +import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException; @@ -68,7 +68,7 @@ * @author ads * */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class) +@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class) public class WebBeanInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation { diff --git a/web.core/nbproject/project.xml b/web.core/nbproject/project.xml --- a/web.core/nbproject/project.xml +++ b/web.core/nbproject/project.xml @@ -197,6 +197,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/web.core/src/org/netbeans/modules/web/core/WebInjectionTargetQueryImplementation.java b/web.core/src/org/netbeans/modules/web/core/WebInjectionTargetQueryImplementation.java --- a/web.core/src/org/netbeans/modules/web/core/WebInjectionTargetQueryImplementation.java +++ b/web.core/src/org/netbeans/modules/web/core/WebInjectionTargetQueryImplementation.java @@ -47,7 +47,7 @@ import javax.lang.model.element.TypeElement; import org.netbeans.api.j2ee.core.Profile; import org.netbeans.api.java.source.CompilationController; -import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; +import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation; import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils; import org.netbeans.modules.web.api.webmodule.WebModule; @@ -55,7 +55,7 @@ * * @author Martin Adamek */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class) +@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class) public class WebInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation { public WebInjectionTargetQueryImplementation() { diff --git a/web.jsf/nbproject/project.xml b/web.jsf/nbproject/project.xml --- a/web.jsf/nbproject/project.xml +++ b/web.jsf/nbproject/project.xml @@ -216,6 +216,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/JSFInjectionTargetQueryImplementation.java b/web.jsf/src/org/netbeans/modules/web/jsf/JSFInjectionTargetQueryImplementation.java --- a/web.jsf/src/org/netbeans/modules/web/jsf/JSFInjectionTargetQueryImplementation.java +++ b/web.jsf/src/org/netbeans/modules/web/jsf/JSFInjectionTargetQueryImplementation.java @@ -53,7 +53,7 @@ import org.netbeans.api.java.source.CompilationController; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; +import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException; @@ -69,7 +69,7 @@ * @author Petr Pisl */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class) +@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class) public class JSFInjectionTargetQueryImplementation implements InjectionTargetQueryImplementation { public JSFInjectionTargetQueryImplementation() { diff --git a/web.project/nbproject/project.xml b/web.project/nbproject/project.xml --- a/web.project/nbproject/project.xml +++ b/web.project/nbproject/project.xml @@ -209,6 +209,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java b/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java --- a/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java +++ b/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java @@ -78,7 +78,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference; import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference; import org.netbeans.modules.j2ee.common.dd.DDHelper; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction; diff --git a/websvc.core/nbproject/project.xml b/websvc.core/nbproject/project.xml --- a/websvc.core/nbproject/project.xml +++ b/websvc.core/nbproject/project.xml @@ -188,6 +188,14 @@ + org.netbeans.modules.j2ee.injection + + + + 1.0 + + + org.netbeans.modules.j2ee.metadata diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java b/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/WSInjectiontargetQueryImplementation.java @@ -53,7 +53,7 @@ import org.netbeans.modules.j2ee.common.Util; import javax.lang.model.element.TypeElement; import org.netbeans.api.java.source.CompilationController; -import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; +import org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.openide.filesystems.FileObject; @@ -61,7 +61,7 @@ * * @author Martin Adamek, Milan Kuchtiak */ -@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation.class) +@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.j2ee.injection.spi.InjectionTargetQueryImplementation.class) public class WSInjectiontargetQueryImplementation implements InjectionTargetQueryImplementation { /** Creates a new instance of WSInjectiontargetQueryImplementation */ diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/CompilerTask.java b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/CompilerTask.java --- a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/CompilerTask.java +++ b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/CompilerTask.java @@ -57,7 +57,7 @@ import org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; -import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; +import org.netbeans.modules.j2ee.injection.api.InjectionTargetQuery; import org.netbeans.modules.websvc.api.jaxws.wsdlmodel.WsdlOperation; import org.netbeans.modules.websvc.api.support.java.SourceUtils; import org.netbeans.modules.websvc.core.JaxWsUtils;