# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /space/cvs/release55_dev/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: JarContainerImpl.java *** /space/cvs/release55_dev/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java Base (1.1.4.8.6.1) --- /space/cvs/release55_dev/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java Locally Modified (Based On 1.1.4.8.6.1) *************** *** 23,30 **** --- 23,33 ---- import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ant.AntArtifact; + import org.netbeans.jmi.javamodel.JavaClass; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; import org.netbeans.modules.j2ee.clientproject.ui.customizer.AntArtifactChooser; + import org.netbeans.modules.j2ee.common.JMIUtils; + import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery; import org.netbeans.modules.j2ee.dd.api.client.AppClient; import org.netbeans.modules.j2ee.dd.api.client.DDProvider; import org.netbeans.modules.j2ee.dd.api.common.EjbLocalRef; *************** *** 128,134 **** resourceRefName = getUniqueName(ac, "ResourceRef", "ResRefName", ref.getResRefName()); //NOI18N ref.setResRefName(resourceRefName); getAppClient().addResourceRef(ref); ! writeDD(); } return resourceRefName; } --- 131,137 ---- resourceRefName = getUniqueName(ac, "ResourceRef", "ResRefName", ref.getResRefName()); //NOI18N ref.setResRefName(resourceRefName); getAppClient().addResourceRef(ref); ! writeDD(referencingClass); } return resourceRefName; } *************** *** 139,145 **** * @see #addEjbReference(EjbRef, String, AntArtifact) */ public String addEjbLocalReference(EjbLocalRef localRef, String referencedClassName, AntArtifact target) throws IOException { ! return addReference(localRef, target); } /** --- 142,148 ---- * @see #addEjbReference(EjbRef, String, AntArtifact) */ public String addEjbLocalReference(EjbLocalRef localRef, String referencedClassName, AntArtifact target) throws IOException { ! return addReference(localRef, referencedClassName, target); } /** *************** *** 162,168 **** * @return actual jndi name used in deployment descriptor */ public String addEjbReferernce(EjbRef ref, String referenceClassName, AntArtifact target) throws IOException { ! return addReference(ref, target); } /** --- 165,171 ---- * @return actual jndi name used in deployment descriptor */ public String addEjbReferernce(EjbRef ref, String referenceClassName, AntArtifact target) throws IOException { ! return addReference(ref, referenceClassName, target); } /** *************** *** 178,184 **** ref.setMessageDestinationRefName(refName); try { getAppClient().addMessageDestinationRef(ref); ! writeDD(); } catch (VersionNotSupportedException ex){} return refName; } --- 181,187 ---- ref.setMessageDestinationRefName(refName); try { getAppClient().addMessageDestinationRef(ref); ! writeDD(referencingClass); } catch (VersionNotSupportedException ex){} return refName; } *************** *** 214,228 **** return proposedValue; } ! private void writeDD() throws IOException { CarImplementation jp = (CarImplementation) webProject.getLookup().lookup(CarImplementation.class); ! if (isDescriptorMandatory(jp.getJ2eePlatformVersion())) { FileObject fo = jp.getDeploymentDescriptor(); getAppClient().write(fo); } } ! private String addReference(Object ref, AntArtifact target) throws IOException { String refName = null; AppClient webApp = getAppClient(); if (ref instanceof EjbRef) { --- 217,232 ---- return proposedValue; } ! private void writeDD(String referencingClassName) throws IOException { CarImplementation jp = (CarImplementation) webProject.getLookup().lookup(CarImplementation.class); ! JavaClass jc = JMIUtils.findClass(referencingClassName); ! if (isDescriptorMandatory(jp.getJ2eePlatformVersion()) || !InjectionTargetQuery.isInjectionTarget(jc)) { FileObject fo = jp.getDeploymentDescriptor(); getAppClient().write(fo); } } ! private String addReference(Object ref, String referencingClass, AntArtifact target) throws IOException { String refName = null; AppClient webApp = getAppClient(); if (ref instanceof EjbRef) { *************** *** 282,288 **** ErrorManager.getDefault().log("WebProjectClassPathExtender not found in the project lookup of project: "+webProject.getProjectDirectory().getPath()); //NOI18N } ! writeDD(); return refName; } --- 286,292 ---- ErrorManager.getDefault().log("WebProjectClassPathExtender not found in the project lookup of project: "+webProject.getProjectDirectory().getPath()); //NOI18N } ! writeDD(referencingClass); return refName; }