diff --git a/j2ee.core.utilities/manifest.mf b/j2ee.core.utilities/manifest.mf
--- a/j2ee.core.utilities/manifest.mf
+++ b/j2ee.core.utilities/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.core.utilities/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/core/utilities/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.24
+OpenIDE-Module-Specification-Version: 1.25
diff --git a/j2ee.core.utilities/nbproject/project.xml b/j2ee.core.utilities/nbproject/project.xml
--- a/j2ee.core.utilities/nbproject/project.xml
+++ b/j2ee.core.utilities/nbproject/project.xml
@@ -67,6 +67,15 @@
+ org.netbeans.modules.java.sourceui
+
+
+
+ 1
+ 1.33
+
+
+
org.netbeans.modules.projectapi
@@ -93,6 +102,14 @@
+ org.openide.awt
+
+
+
+ 7.59
+
+
+
org.openide.dialogs
@@ -202,11 +219,14 @@
org.netbeans.modules.web.project
org.netbeans.modules.web.refactoring
org.netbeans.modules.websocket
+ org.netbeans.modules.websvc.core
+ org.netbeans.modules.websvc.jaxrpc
org.netbeans.modules.websvc.rest
org.netbeans.modules.websvc.wsitconf
org.netbeans.modules.j2ee.core.api.support
org.netbeans.modules.j2ee.core.api.support.classpath
org.netbeans.modules.j2ee.core.api.support.java
+ org.netbeans.modules.j2ee.core.api.support.java.method
org.netbeans.modules.j2ee.core.api.support.progress
org.netbeans.modules.j2ee.core.api.support.wizard
diff --git a/j2ee.ejbcore/manifest.mf b/j2ee.ejbcore/manifest.mf
--- a/j2ee.ejbcore/manifest.mf
+++ b/j2ee.ejbcore/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/ejbcore/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbcore/Bundle.properties
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
AutoUpdate-Show-In-Client: false
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java
@@ -55,8 +55,8 @@
import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
import org.netbeans.modules.j2ee.api.ejbjar.EjbReference;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule.Type;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/AbstractMethodGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/AbstractMethodGenerator.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/AbstractMethodGenerator.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/AbstractMethodGenerator.java
@@ -59,8 +59,8 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.WorkingCopy;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGenerator.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGenerator.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGenerator.java
@@ -58,7 +58,7 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.EntityAndSession;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java
@@ -60,8 +60,8 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.WorkingCopy;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.j2ee.dd.api.ejb.CmpField;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGenerator.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGenerator.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGenerator.java
@@ -51,7 +51,7 @@
import java.util.List;
import java.util.Map;
import javax.lang.model.element.Modifier;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGenerator.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGenerator.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGenerator.java
@@ -50,7 +50,7 @@
import java.util.List;
import java.util.Map;
import javax.lang.model.element.Modifier;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerator.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerator.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerator.java
@@ -50,7 +50,7 @@
import java.util.List;
import java.util.Map;
import javax.lang.model.element.Modifier;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.EntityAndSession;
import org.netbeans.modules.j2ee.ejbcore.util._RetoucheUtil;
import org.openide.filesystems.FileObject;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java
@@ -50,7 +50,7 @@
import java.util.List;
import java.util.Set;
import javax.lang.model.element.Modifier;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
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
@@ -74,8 +74,8 @@
import org.netbeans.modules.j2ee.api.ejbjar.MessageDestinationReference;
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
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.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
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
@@ -63,8 +63,8 @@
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
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.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
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
@@ -72,8 +72,8 @@
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
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.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier;
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGenerator.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGenerator.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGenerator.java
@@ -67,7 +67,7 @@
import org.netbeans.api.project.libraries.Library;
import org.netbeans.api.project.libraries.LibraryManager;
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.AssemblyDescriptor;
import org.netbeans.modules.j2ee.dd.api.ejb.ContainerTransaction;
import org.netbeans.modules.j2ee.ejbcore.action.BusinessMethodGenerator;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java
@@ -44,8 +44,8 @@
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
import javax.lang.model.type.DeclaredType;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.MethodTree;
import com.sun.source.util.Trees;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
@@ -50,7 +50,7 @@
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.modules.j2ee.common.J2eeProjectCapabilities;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromImplVisitor.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromImplVisitor.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromImplVisitor.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromImplVisitor.java
@@ -45,7 +45,7 @@
import java.util.Collection;
import java.util.Set;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.BusinessMethodType;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.CreateMethodType;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.FinderMethodType;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromIntfVisitor.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromIntfVisitor.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromIntfVisitor.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromIntfVisitor.java
@@ -51,7 +51,7 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.api.java.source.Task;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
import org.netbeans.modules.j2ee.ejbcore.Utils;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
@@ -44,7 +44,7 @@
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import java.io.IOException;
import java.rmi.RemoteException;
import java.util.Collections;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/MethodType.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/MethodType.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/MethodType.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/MethodType.java
@@ -44,7 +44,7 @@
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
/**
* Provide simple instance of the visitor pattern to use for code generation.
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromImplVisitor.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromImplVisitor.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromImplVisitor.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromImplVisitor.java
@@ -45,7 +45,7 @@
import java.util.Collections;
import javax.lang.model.element.Modifier;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.BusinessMethodType;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.CreateMethodType;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.FinderMethodType;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromIntfVisitor.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromIntfVisitor.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromIntfVisitor.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromIntfVisitor.java
@@ -45,7 +45,7 @@
import java.util.Collections;
import javax.lang.model.element.Modifier;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.BusinessMethodType;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.CreateMethodType;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType.FinderMethodType;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionMethodController.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionMethodController.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionMethodController.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionMethodController.java
@@ -45,7 +45,7 @@
package org.netbeans.modules.j2ee.ejbcore.api.methodcontroller;
import java.io.IOException;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/ui/CallEjb.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/ui/CallEjb.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/ui/CallEjb.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/ui/CallEjb.java
@@ -45,7 +45,6 @@
package org.netbeans.modules.j2ee.ejbcore.api.ui;
import java.io.IOException;
-import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddCmpFieldAction;
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddFinderMethodStrategy;
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddSelectMethodStrategy;
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entries.CallEjbDialog;
@@ -67,10 +66,6 @@
}
}
- public static boolean addCmpField(FileObject fileObject, String className, FileObject ddFile) {
- return AddCmpFieldAction.addCmpField(fileObject, className, ddFile);
- }
-
public static void addFinderMethod(FileObject fileObject, String beanClass) throws IOException {
new AddFinderMethodStrategy().addMethod(fileObject, beanClass);
}
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpFromDbGenerator.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpFromDbGenerator.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpFromDbGenerator.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpFromDbGenerator.java
@@ -60,7 +60,7 @@
import java.util.List;
import javax.lang.model.element.Modifier;
import org.netbeans.api.db.explorer.DatabaseConnection;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.CmrField;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbRelation;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodStrategy.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodStrategy.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodStrategy.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodStrategy.java
@@ -45,22 +45,18 @@
package org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action;
import java.io.IOException;
-import java.security.Policy;
-import java.util.List;
import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.TypeMirror;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.ui.ScanDialog;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.MethodType;
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.shared.MethodsNode;
import org.openide.filesystems.FileObject;
import org.openide.nodes.Node;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
-import org.openide.util.NbBundle;
import org.openide.util.Parameters;
import org.openide.util.Utilities;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddActionGroup.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddActionGroup.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddActionGroup.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddActionGroup.java
@@ -66,8 +66,7 @@
new AddCreateMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_CreateMethodAction")),
new AddFinderMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_FinderMethodAction")),
new AddHomeMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_HomeMethodAction")),
- new AddSelectMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_SelectMethodAction")),
- SystemAction.get(AddCmpFieldAction.class)
+ new AddSelectMethodAction(NbBundle.getMessage(AddActionGroup.class, "LBL_SelectMethodAction"))
};
}
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodStrategy.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodStrategy.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodStrategy.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodStrategy.java
@@ -59,9 +59,9 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCmpFieldAction.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCmpFieldAction.java
deleted file mode 100644
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCmpFieldAction.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle 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]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * 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.
- */
-
-package org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action;
-
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.lang.model.element.TypeElement;
-import org.netbeans.api.java.source.ElementHandle;
-import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.Util;
-import org.netbeans.modules.j2ee.common.method.FieldCustomizer;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
-import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
-import org.netbeans.modules.j2ee.ejbcore.Utils;
-import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EjbMethodController;
-import org.netbeans.modules.j2ee.ejbcore.util._RetoucheUtil;
-import org.netbeans.modules.j2ee.ejbcore.action.CmFieldGenerator;
-import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EntityMethodController;
-import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
-import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
-import org.omg.CORBA.Request;
-import org.openide.filesystems.FileObject;
-import org.openide.nodes.Node;
-import org.openide.util.Exceptions;
-import org.openide.util.HelpCtx;
-import org.openide.util.Lookup;
-import org.openide.util.NbBundle;
-import org.openide.util.RequestProcessor;
-import org.openide.util.actions.NodeAction;
-import sun.print.RasterPrinterJob;
-
-/**
- * Action that can always be invoked and work procedurally.
- * @author Chris Webster
- */
-public class AddCmpFieldAction extends NodeAction {
-
- private final String NAME = NbBundle.getMessage(AddCmpFieldAction.class, "LBL_AddCmpFieldAction");
-
- public String getName() {
- return NAME;
- }
-
- public HelpCtx getHelpCtx() {
- return HelpCtx.DEFAULT_HELP;
- }
-
- protected boolean asynchronous() {
- return false;
- }
-
- protected boolean enable(org.openide.nodes.Node[] activatedNodes) {
- if (activatedNodes == null || activatedNodes.length < 1) {
- return false;
- }
- EjbMethodController ejbMethodController;
- ElementHandle elementHandle = null;
- try {
- elementHandle = _RetoucheUtil.getJavaClassFromNode(activatedNodes[0]);
- if (elementHandle == null) {
- return false;
- }
- } catch (IOException ioe) {
- Exceptions.printStackTrace(ioe);
- return false;
- }
- FileObject fileObject = activatedNodes[0].getLookup().lookup(FileObject.class);
- if (fileObject == null) {
- return false;
- }
- return activatedNodes.length == 1 &&
- (ejbMethodController = EjbMethodController.createFromClass(fileObject, elementHandle.getQualifiedName())) != null &&
- ejbMethodController instanceof EntityMethodController &&
- ((EntityMethodController) ejbMethodController).isCMP();
- }
-
- protected void performAction(org.openide.nodes.Node[] activatedNodes) {
- if (activatedNodes == null || activatedNodes.length < 1) {
- return;
- }
- try {
- ElementHandle elementHandle = _RetoucheUtil.getJavaClassFromNode(activatedNodes[0]);
- if (elementHandle != null) {
- FileObject fileObject = activatedNodes[0].getLookup().lookup(FileObject.class);
- FileObject ddFile = EjbJar.getEjbJar(fileObject).getDeploymentDescriptor();
- EntityMethodController emc = (EntityMethodController) EjbMethodController.createFromClass(fileObject, elementHandle.getQualifiedName());
- MethodModel.Variable field = MethodModel.Variable.create("java.lang.String", "cmpField");
- addCmpField(emc, ddFile, field);
- }
- } catch (IOException ioe) {
- Exceptions.printStackTrace(ioe);
- }
- }
-
- public static boolean addCmpField(FileObject fileObject, String className, FileObject ddFile) {
- MethodModel.Variable field = MethodModel.Variable.create("java.lang.String", "cmpField");
- EntityMethodController emc = (EntityMethodController) EntityMethodController.createFromClass(fileObject, className);
- try {
- return addCmpField(emc, ddFile, field);
- } catch (IOException ioe) {
- Exceptions.printStackTrace(ioe);
- }
- return false;
- }
-
- private static boolean addCmpField(EntityMethodController emc, FileObject ddFile, MethodModel.Variable field) throws IOException {
-
- final String ejbClass = emc.getBeanClass();
- final Entity[] entity = new Entity[1];
- final FileObject[] ejbClassFO = new FileObject[1];
-
- MetadataModel metadataModel = EjbJar.getEjbJar(ddFile).getMetadataModel();
- metadataModel.runReadAction(new MetadataModelAction() {
- public Void run(EjbJarMetadata metadata) {
- entity[0] = (Entity) metadata.findByEjbClass(ejbClass);
- ejbClassFO[0] = metadata.findResource(Utils.toResourceName(ejbClass));
- return null;
- }
- });
-
- final FieldCustomizer customizer = new FieldCustomizer(entity[0], field, "",
- emc.getLocal() != null, emc.getRemote() != null, true, true, false, false);
- if (customizer.customizeField()) {
- final MethodModel.Variable customizedField = customizer.getField();
- final CmFieldGenerator generator = CmFieldGenerator.create(emc.getBeanClass(), ejbClassFO[0]);
-
- RequestProcessor.getDefault().post(new Runnable() {
- public void run() {
- try {
- generator.addCmpField(customizedField, customizer.isLocalGetter(), customizer.isLocalSetter(),
- customizer.isRemoteGetter(), customizer.isRemoteSetter(), customizer.getDescription());
- } catch (IOException ioe) {
- Logger.getLogger(AddCmpFieldAction.class.getName()).log(Level.WARNING, null, ioe);
- }
- }
- });
-
- return true;
- }
- return false;
- }
-
- public javax.swing.Action createContextAwareInstance(org.openide.util.Lookup actionContext) {
- boolean enable = enable(actionContext.lookup(new Lookup.Template(Node.class)).allInstances().toArray(new Node[0]));
- return enable ? super.createContextAwareInstance(actionContext) : null;
- }
-
-}
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodStrategy.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodStrategy.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodStrategy.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodStrategy.java
@@ -56,9 +56,9 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodStrategy.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodStrategy.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodStrategy.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodStrategy.java
@@ -57,9 +57,9 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodStrategy.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodStrategy.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodStrategy.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodStrategy.java
@@ -57,9 +57,9 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java
@@ -59,9 +59,9 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EJBActionGroup.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EJBActionGroup.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EJBActionGroup.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EJBActionGroup.java
@@ -91,8 +91,7 @@
new AddCreateMethodAction(),
new AddFinderMethodAction(),
new AddHomeMethodAction(),
- new AddSelectMethodAction(),
- SystemAction.get(AddCmpFieldAction.class)
+ new AddSelectMethodAction()
};
}
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldsNode.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldsNode.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldsNode.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldsNode.java
@@ -50,7 +50,6 @@
import org.openide.loaders.DataObject;
import org.openide.util.actions.SystemAction;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
-import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.action.AddCmpFieldAction;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EntityMethodController;
import org.netbeans.modules.j2ee.dd.api.common.DDEditorNavigator;
import org.openide.actions.OpenAction;
@@ -87,9 +86,7 @@
}
public Action[] getActions(boolean context) {
- return new SystemAction[] {
- SystemAction.get(AddCmpFieldAction.class)
- };
+ return new SystemAction[] {};
}
public Action getPreferredAction() {
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/MethodChildren.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/MethodChildren.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/MethodChildren.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/MethodChildren.java
@@ -59,9 +59,9 @@
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.ui.ElementOpen;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.j2ee.dd.api.common.DDEditorNavigator;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
import org.netbeans.modules.j2ee.dd.api.ejb.Query;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.EntityMethodController;
@@ -74,7 +74,6 @@
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.util.Exceptions;
import org.openide.util.ImageUtilities;
-import org.openide.util.Utilities;
/**
*
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/MethodChildren.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/MethodChildren.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/MethodChildren.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/MethodChildren.java
@@ -62,8 +62,8 @@
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.ui.ElementOpen;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.j2ee.ejbcore.api.methodcontroller.SessionMethodController;
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.shared.ComponentMethodModel;
import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.ejb.shared.ComponentMethodViewStrategy;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodModel.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodModel.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodModel.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodModel.java
@@ -70,8 +70,8 @@
import org.netbeans.api.java.source.ElementUtilities.ElementAcceptor;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Session;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodViewStrategy.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodViewStrategy.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodViewStrategy.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodViewStrategy.java
@@ -47,7 +47,7 @@
import java.awt.Image;
import java.io.IOException;
import java.util.Collection;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.openide.filesystems.FileObject;
/**
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodNode.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodNode.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodNode.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodNode.java
@@ -62,7 +62,7 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.SourceUtils;
import org.netbeans.api.java.source.Task;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.openide.filesystems.FileObject;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
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
@@ -66,8 +66,8 @@
import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
import org.netbeans.modules.j2ee.api.ejbjar.ResourceReference;
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.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.javaee.injection.api.InjectionTargetQuery;
import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategy.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategy.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategy.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategy.java
@@ -66,8 +66,8 @@
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.Sources;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.spi.java.classpath.ClassPathProvider;
import org.netbeans.spi.java.classpath.PathResourceImplementation;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java
--- a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java
+++ b/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java
@@ -69,8 +69,8 @@
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.TreeMaker;
import org.netbeans.api.java.source.WorkingCopy;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
import org.openide.filesystems.FileObject;
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGeneratorTest.java b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGeneratorTest.java
--- a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGeneratorTest.java
+++ b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGeneratorTest.java
@@ -55,8 +55,8 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.WorkingCopy;
import org.netbeans.api.java.source.Task;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
import org.netbeans.modules.j2ee.ejbcore.test.TestBase;
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGeneratorTest.java b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGeneratorTest.java
--- a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGeneratorTest.java
+++ b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGeneratorTest.java
@@ -54,7 +54,7 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.CmpField;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
import org.netbeans.modules.j2ee.dd.api.ejb.Entity;
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGeneratorTest.java b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGeneratorTest.java
--- a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGeneratorTest.java
+++ b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGeneratorTest.java
@@ -56,7 +56,7 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.WorkingCopy;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
import org.netbeans.modules.j2ee.ejbcore.test.TestBase;
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGeneratorTest.java b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGeneratorTest.java
--- a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGeneratorTest.java
+++ b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGeneratorTest.java
@@ -55,7 +55,7 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.WorkingCopy;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerstorTest.java b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerstorTest.java
--- a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerstorTest.java
+++ b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerstorTest.java
@@ -56,7 +56,7 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.WorkingCopy;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
import org.netbeans.modules.j2ee.ejbcore.test.TestBase;
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGeneratorTest.java b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGeneratorTest.java
--- a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGeneratorTest.java
+++ b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGeneratorTest.java
@@ -56,7 +56,7 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.WorkingCopy;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGeneratorTest.java b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGeneratorTest.java
--- a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGeneratorTest.java
+++ b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGeneratorTest.java
@@ -60,7 +60,7 @@
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.WorkingCopy;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/Util.java b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/Util.java
--- a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/Util.java
+++ b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/Util.java
@@ -58,8 +58,8 @@
import org.netbeans.api.java.source.CancellableTask;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.JavaSource;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.openide.filesystems.FileObject;
/**
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestBase.java b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestBase.java
--- a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestBase.java
+++ b/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestBase.java
@@ -62,8 +62,8 @@
import org.netbeans.api.project.Project;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.java.source.usages.IndexUtil;
import org.netbeans.modules.parsing.api.indexing.IndexingManager;
import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
diff --git a/maven.jaxws/manifest.mf b/maven.jaxws/manifest.mf
--- a/maven.jaxws/manifest.mf
+++ b/maven.jaxws/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven.jaxws
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/jaxws/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.22
+OpenIDE-Module-Specification-Version: 1.23
diff --git a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/AddWsOperationHelper.java b/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/AddWsOperationHelper.java
--- a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/AddWsOperationHelper.java
+++ b/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/AddWsOperationHelper.java
@@ -85,7 +85,6 @@
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.TreeMaker;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
import org.netbeans.modules.websvc.api.support.java.GenerationUtils;
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
@@ -97,10 +96,11 @@
import org.netbeans.api.java.source.WorkingCopy;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
//import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
diff --git a/web.jsf/nbproject/project.properties b/web.jsf/nbproject/project.properties
--- a/web.jsf/nbproject/project.properties
+++ b/web.jsf/nbproject/project.properties
@@ -41,7 +41,7 @@
# made subject to such option by the copyright holder.
javac.source=1.6
-spec.version.base=1.55.0
+spec.version.base=1.56
test.config.stable.includes=\
**/JSFSupportSuite.class
diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java
--- a/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java
+++ b/web.jsf/src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java
@@ -88,8 +88,8 @@
import org.netbeans.api.project.Sources;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.editor.indent.api.Reformat;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
import org.netbeans.modules.j2ee.core.api.support.java.SourceUtils;
import org.netbeans.modules.j2ee.dd.api.common.InitParam;
diff --git a/websvc.core/nbproject/project.properties b/websvc.core/nbproject/project.properties
--- a/websvc.core/nbproject/project.properties
+++ b/websvc.core/nbproject/project.properties
@@ -42,7 +42,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=1.34.0
+spec.version.base=1.35
javadoc.arch=${basedir}/arch.xml
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
@@ -171,6 +171,15 @@
+ org.netbeans.modules.j2ee.core.utilities
+
+
+
+ 0
+ 1.24
+
+
+
org.netbeans.modules.j2ee.dd
@@ -188,14 +197,6 @@
- org.netbeans.modules.javaee.injection
-
-
-
- 1.0
-
-
-
org.netbeans.modules.j2ee.metadata
@@ -266,6 +267,14 @@
+ org.netbeans.modules.javaee.injection
+
+
+
+ 1.0
+
+
+
org.netbeans.modules.javaee.specs.support
diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java b/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java
--- a/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java
+++ b/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java
@@ -84,9 +84,7 @@
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.ModificationResult;
-import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.TreeMaker;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
import org.netbeans.modules.websvc.api.support.java.GenerationUtils;
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
@@ -100,9 +98,10 @@
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizer;
-import org.netbeans.modules.j2ee.common.method.MethodCustomizerFactory;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
diff --git a/websvc.jaxrpc/manifest.mf b/websvc.jaxrpc/manifest.mf
--- a/websvc.jaxrpc/manifest.mf
+++ b/websvc.jaxrpc/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Install: org/netbeans/modules/websvc/jaxrpc/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/websvc/jaxrpc/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxrpc/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
AutoUpdate-Show-In-Client: false
diff --git a/websvc.jaxrpc/nbproject/project.xml b/websvc.jaxrpc/nbproject/project.xml
--- a/websvc.jaxrpc/nbproject/project.xml
+++ b/websvc.jaxrpc/nbproject/project.xml
@@ -127,6 +127,15 @@
+ org.netbeans.modules.j2ee.core.utilities
+
+
+
+ 0
+ 1.24
+
+
+
org.netbeans.modules.j2ee.dd
diff --git a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcAddOperation.java b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcAddOperation.java
--- a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcAddOperation.java
+++ b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/actions/JaxRpcAddOperation.java
@@ -46,7 +46,6 @@
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.MethodTree;
-import org.netbeans.modules.websvc.api.support.java.SourceUtils;
import org.netbeans.modules.websvc.core.AddWsOperationHelper;
import org.netbeans.modules.websvc.api.support.AddOperationCookie;
import java.io.IOException;
@@ -67,8 +66,6 @@
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;
-import org.netbeans.modules.j2ee.common.method.MethodModel;
-import org.netbeans.modules.j2ee.common.method.MethodModelSupport;
import org.netbeans.modules.j2ee.dd.api.webservices.PortComponent;
import org.netbeans.modules.j2ee.dd.api.webservices.DDProvider;
import org.netbeans.modules.j2ee.dd.api.webservices.Webservices;
@@ -78,6 +75,8 @@
import org.netbeans.modules.websvc.api.support.java.SourceUtils;
import org.openide.util.Lookup;
import static org.netbeans.api.java.source.JavaSource.Phase;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModel;
+import org.netbeans.modules.j2ee.core.api.support.java.method.MethodModelSupport;
import org.openide.ErrorManager;
import org.openide.cookies.SaveCookie;
import org.openide.filesystems.FileObject;