Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 399524 | Differences between
and this patch

Collapse All | Expand All

(-)a/plugins/org.eclipse.jst.j2ee.ejb/.settings/org.eclipse.jdt.core.prefs (-87 / +24 lines)
Lines 1-95 Link Here
1 
#Wed Jun 10 15:59:22 EDT 2009
 1 
eclipse.preferences.version=1
2 
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 2 
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
3 
org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
4 
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
5 
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
6 
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
7 
org.eclipse.jdt.core.compiler.problem.emptyStatement=error
8 
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
9 
org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
10 
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
11 
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
12 
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
13 
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
14 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
15 
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 3 
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
16 
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 4 
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
17 
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 5 
org.eclipse.jdt.core.builder.invalidClasspath=abort
18 
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
19 
org.eclipse.jdt.core.compiler.problem.deprecation=warning
20 
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
21 
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
22 
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
23 
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
24 
org.eclipse.jdt.core.compiler.problem.unusedImport=error
25 
org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
 6 
org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
26 
org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
 7 
org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
27 
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
28 
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
29 
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
30 
org.eclipse.jdt.core.builder.invalidClasspath=abort
31 
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
32 
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
33 
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
34 
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
35 
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
36 
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
37 
org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
38 
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
39 
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
40 
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
41 
org.eclipse.jdt.core.compiler.problem.nullReference=error
42 
org.eclipse.jdt.core.compiler.source=1.5
43 
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
44 
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
45 
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
46 
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
47 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
48 
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
49 
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
50 
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
51 
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
52 
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
53 
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
54 
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
55 
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
56 
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
57 
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
58 
eclipse.preferences.version=1
59 
org.eclipse.jdt.core.incompleteClasspath=error
60 
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
61 
org.eclipse.jdt.core.compiler.problem.deadCode=error
62 
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
63 
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
64 
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
65 
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
66 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
67 
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
68 
org.eclipse.jdt.core.codeComplete.fieldPrefixes=
69 
org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
70 
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
71 
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
72 
org.eclipse.jdt.core.compiler.problem.autoboxing=warning
73 
org.eclipse.jdt.core.circularClasspath=error
 8 
org.eclipse.jdt.core.circularClasspath=error
74 
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 9 
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
75 
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
 10 
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
11 
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
12 
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
13 
org.eclipse.jdt.core.codeComplete.fieldPrefixes=
76 
org.eclipse.jdt.core.codeComplete.fieldSuffixes=
 14 
org.eclipse.jdt.core.codeComplete.fieldSuffixes=
77 
org.eclipse.jdt.core.codeComplete.localSuffixes=
78 
org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
79 
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
80 
org.eclipse.jdt.core.codeComplete.localPrefixes=
 15 
org.eclipse.jdt.core.codeComplete.localPrefixes=
81 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 16 
org.eclipse.jdt.core.codeComplete.localSuffixes=
82 
org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
83 
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
84 
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
85 
org.eclipse.jdt.core.compiler.compliance=1.5
86 
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
87 
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
 17 
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
88 
org.eclipse.jdt.core.compiler.debug.localVariable=generate
89 
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
90 
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
91 
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
92 
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
93 
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
94 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
95 
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 18 
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
19 
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
20 
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
21 
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
22 
org.eclipse.jdt.core.compiler.compliance=1.5
23 
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
24 
org.eclipse.jdt.core.compiler.debug.localVariable=generate
25 
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
26 
org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
27 
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
28 
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
29 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
30 
org.eclipse.jdt.core.compiler.source=1.5
31 
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
32 
org.eclipse.jdt.core.incompleteClasspath=error
(-)a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java (-2 / +4 lines)
Lines 102-108 Link Here
102 
				}
 102 
				}
103 
			}
 103 
			}
104
104
105 
			if( fv == IJ2EEFacetConstants.EJB_31 || fv == IJ2EEFacetConstants.EJB_30)
 105 
			if( fv == IJ2EEFacetConstants.EJB_32 || fv == IJ2EEFacetConstants.EJB_31 || fv == IJ2EEFacetConstants.EJB_30)
106 
            {
 106 
            {
107 
                if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
 107 
                if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
108 
                    // Create the deployment descriptor (ejb-jar.xml) if one doesn't exist
 108 
                    // Create the deployment descriptor (ejb-jar.xml) if one doesn't exist
Lines 110-116 Link Here
110 
                    if (!ejbJarXmlFile.exists()) {
 110 
                    if (!ejbJarXmlFile.exists()) {
111 
                        try {
 111 
                        try {
112 
                        	String ejbJarXmlContents = null;
 112 
                        	String ejbJarXmlContents = null;
113 
                        	if(fv == IJ2EEFacetConstants.EJB_31) {
 113 
                        	if(fv == IJ2EEFacetConstants.EJB_32) {
114 
	                            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$
115 
                        	} else if(fv == IJ2EEFacetConstants.EJB_31) {
114 
	                            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$
 116 
	                            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$
115 
                        	} else {
 117 
                        	} else {
116 
                        		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$
 118 
                        		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$
(-)a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml (-3 / +13 lines)
Lines 198-213 Link Here
198 
      	<group-member id="modules"/>
 198 
      	<group-member id="modules"/>
199 
    </project-facet-version>
 199 
    </project-facet-version>
200
200
201 
    <action facet="jst.ejb" version="[1.1-3.1]" type="INSTALL" id="jst.ejb.install">
 201 
	<project-facet-version facet="jst.ejb" version="3.2">
202 
		<constraint>
203 
 	       <and>
204 
 		       	<requires facet="jst.java" version="[7.0"/>
205 
 	         	<conflicts group="modules"/>
206 
 	       </and>
207 
    	</constraint>
208 
      	<group-member id="modules"/>
209 
    </project-facet-version>
210
211 
    <action facet="jst.ejb" type="INSTALL" id="jst.ejb.install">
202 
      <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
 212 
      <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
203 
      <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
 213 
      <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
204 
    </action>
 214 
    </action>
205
215
206 
    <event-handler facet="jst.ejb" version="[1.1-3.1]" type="POST_INSTALL">
 216 
    <event-handler facet="jst.ejb" type="POST_INSTALL">
207 
      <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetPostInstallDelegate"/>
 217 
      <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetPostInstallDelegate"/>
208 
    </event-handler>
 218 
    </event-handler>
209
219
210 
    <event-handler facet="jst.ejb" version="[1.1-3.1]" type="RUNTIME_CHANGED">
 220 
    <event-handler facet="jst.ejb" type="RUNTIME_CHANGED">
211 
      <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
 221 
      <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
212 
    </event-handler>
 222 
    </event-handler>
213
223

Return to bug 399524