Attachment 226474 Details for Bug 399524 – EJB Tools Patch v1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] EJB Tools Patch v1

Bug399524.EjbToolsPatch.v1.txt (text/plain), 11.85 KB, created by Konstantin Komissarchik

on 2013-02-01 17:18:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Komissarchik

Created: 2013-02-01 17:18:42 EST

Size: 11.85 KB

patch

obsolete

>diff --git a/plugins/org.eclipse.jst.j2ee.ejb/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.ejb/.settings/org.eclipse.jdt.core.prefs
>index 9205d11..2ba2c18 100644
>--- a/plugins/org.eclipse.jst.j2ee.ejb/.settings/org.eclipse.jdt.core.prefs
>+++ b/plugins/org.eclipse.jst.j2ee.ejb/.settings/org.eclipse.jdt.core.prefs
>@@ -1,95 +1,32 @@
>-#Wed Jun 10 15:59:22 EDT 2009
>-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
>-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
>-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
>-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
>-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
>-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
>-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
>-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
>-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
>-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
>-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
>-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
>+eclipse.preferences.version=1
>+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
> org.eclipse.jdt.core.builder.cleanOutputFolder=clean
>-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
>-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
>-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
>-org.eclipse.jdt.core.compiler.problem.deprecation=warning
>-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
>-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
>-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
>-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
>-org.eclipse.jdt.core.compiler.problem.unusedImport=error
>+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
>+org.eclipse.jdt.core.builder.invalidClasspath=abort
> org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
> org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
>-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
>-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
>-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
>-org.eclipse.jdt.core.builder.invalidClasspath=abort
>-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
>-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
>-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
>-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
>-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
>-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
>-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
>-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
>-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
>-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
>-org.eclipse.jdt.core.compiler.problem.nullReference=error
>-org.eclipse.jdt.core.compiler.source=1.5
>-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
>-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
>-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
>-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
>-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
>-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
>-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
>-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
>-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
>-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
>-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
>-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
>-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
>-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
>-eclipse.preferences.version=1
>-org.eclipse.jdt.core.incompleteClasspath=error
>-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
>-org.eclipse.jdt.core.compiler.problem.deadCode=error
>-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
>-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
>-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
>-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
>-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
>-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
>-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
>-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
>-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
> org.eclipse.jdt.core.circularClasspath=error
>-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
>-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
>+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
>+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
>+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
>+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
>+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
> org.eclipse.jdt.core.codeComplete.fieldSuffixes=
>-org.eclipse.jdt.core.codeComplete.localSuffixes=
>-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
>-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
> org.eclipse.jdt.core.codeComplete.localPrefixes=
>-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
>-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
>-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
>-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
>-org.eclipse.jdt.core.compiler.compliance=1.5
>-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
>+org.eclipse.jdt.core.codeComplete.localSuffixes=
> org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
>-org.eclipse.jdt.core.compiler.debug.localVariable=generate
>-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
>-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
>-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
>-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
>-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
>-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
> org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
>+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
>+org.eclipse.jdt.core.compiler.compliance=1.5
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
>+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
>+org.eclipse.jdt.core.compiler.source=1.5
>+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
>+org.eclipse.jdt.core.incompleteClasspath=error
>diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
>index 7b425fd..b47cca3 100644
>--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
>+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
>@@ -102,7 +102,7 @@
> 				}
> 			}
> 			
>-			if( fv == IJ2EEFacetConstants.EJB_31 || fv == IJ2EEFacetConstants.EJB_30)
>+			if( fv == IJ2EEFacetConstants.EJB_32 || fv == IJ2EEFacetConstants.EJB_31 || fv == IJ2EEFacetConstants.EJB_30)
>             {
>                 if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
>                     // Create the deployment descriptor (ejb-jar.xml) if one doesn't exist
>@@ -110,7 +110,9 @@
>                     if (!ejbJarXmlFile.exists()) {
>                         try {
>                         	String ejbJarXmlContents = null;
>-                        	if(fv == IJ2EEFacetConstants.EJB_31) {
>+                        	if(fv == IJ2EEFacetConstants.EJB_32) {
>+	                            ejbJarXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ejb-jar version=\"3.2\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_2.xsd\">\n  <display-name>" + XMLWriter.getEscaped(project.getName()) +" </display-name> \n </ejb-jar>"; //$NON-NLS-1$ //$NON-NLS-2$
>+                        	} else if(fv == IJ2EEFacetConstants.EJB_31) {
> 	                            ejbJarXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ejb-jar version=\"3.1\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd\">\n  <display-name>" + XMLWriter.getEscaped(project.getName()) +" </display-name> \n </ejb-jar>"; //$NON-NLS-1$ //$NON-NLS-2$
>                         	} else {
>                         		ejbJarXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ejb-jar version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\">\n  <display-name>" + XMLWriter.getEscaped(project.getName()) +" </display-name> \n </ejb-jar>"; //$NON-NLS-1$ //$NON-NLS-2$
>diff --git a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
>index 75ef855..ae85a43 100644
>--- a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
>+++ b/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
>@@ -198,16 +198,26 @@
>       	<group-member id="modules"/>
>     </project-facet-version>
>     
>-    <action facet="jst.ejb" version="[1.1-3.1]" type="INSTALL" id="jst.ejb.install">
>+	<project-facet-version facet="jst.ejb" version="3.2">
>+		<constraint>
>+ 	       <and>
>+ 		       	<requires facet="jst.java" version="[7.0"/>
>+ 	         	<conflicts group="modules"/>
>+ 	       </and>
>+    	</constraint>
>+      	<group-member id="modules"/>
>+    </project-facet-version>
>+    
>+    <action facet="jst.ejb" type="INSTALL" id="jst.ejb.install">
>       <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
>       <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
>     </action>
>     
>-    <event-handler facet="jst.ejb" version="[1.1-3.1]" type="POST_INSTALL">
>+    <event-handler facet="jst.ejb" type="POST_INSTALL">
>       <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetPostInstallDelegate"/>
>     </event-handler>
>     
>-    <event-handler facet="jst.ejb" version="[1.1-3.1]" type="RUNTIME_CHANGED">
>+    <event-handler facet="jst.ejb" type="RUNTIME_CHANGED">
>       <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
>     </event-handler>
>

Actions: View | Diff

Attachments on bug 399524: 226470 | 226472 | 226473 | 226474 | 226543 | 226544 | 227758 | 227759 | 227761 | 227762 | 227763 | 227764 | 227770 | 227772 | 228033 | 228379 | 228382 | 228456