Attachment #241409 for bug #430637

View | Details | Raw Unified | Return to bug 430637
Collapse All | Expand All




<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
<title>WTP 3.5.2 Patches</title>
</head>

<body>

	<h1>WTP 3.5.2 Patches</h1>

	<h2>org.eclipse.jst.common.fproj.enablement.jdt</h2>
	
	<p>Bug <a href='https://bugs.eclipse.org/430637'>430637</a>. [hotbug] Java Version 1.8 of project facet java does not exist in Kepler SR2</p>

</body>
</html>

Lines 27-33 Link Here

(-)feature.properties (-1 / +1 lines)
27	description=\	27	description=\
28	Contains fixes described in the following bugzilla(s):\n\	28	Contains fixes described in the following bugzilla(s):\n\
29	\n\	29	\n\
30	Bug https://bugs.eclipse.org/373666 Adopter-only patch for allowing Static web project facets to coexist with Java facet\n\	30	Bug https://bugs.eclipse.org/430637 [hotbug] Java Version 1.8 of project facet java does not exist in Kepler SR2\n\
31	\n\	31	\n\
32	# "copyright" property - text of the "Feature Update Copyright"	32	# "copyright" property - text of the "Feature Update Copyright"
33	copyright=\	33	copyright=\




<?xml version="1.0" encoding="UTF-8"?>
<feature
      id="org.eclipse.jst.common.fproj.enablement.jdt.feature.patch"
      label="%featureName"
      version="3.5.2.qualifier"
      provider-name="%providerName">

   <description>
      %description
   </description>

   <copyright>
      %copyright
   </copyright>

   <license url="%licenseURL">
      %license
   </license>

   <requires>
      <import feature="org.eclipse.jst.common.fproj.enablement.jdt" version="3.4.0.v201108231500-377DG8s73543J5H6D66" patch="true"/>
   </requires>

   <plugin
         id="org.eclipse.jst.common.project.facet.core"
         download-size="0"
         install-size="0"
         version="0.0.0"
         unpack="false"/>

</feature>

Lines 3-9 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
3	Bundle-Vendor: %providerName	3	Bundle-Vendor: %providerName
4	Bundle-Name: %pluginName	4	Bundle-Name: %pluginName
5	Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true	5	Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true
6	Bundle-Version: 1.4.201.qualifier	6	Bundle-Version: 1.4.300.qualifier
7	Bundle-ClassPath: .	7	Bundle-ClassPath: .
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin
9	Export-Package: org.eclipse.jst.common.project.facet.core,	9	Export-Package: org.eclipse.jst.common.project.facet.core,

Lines 25-30 Link Here

(-)plugin.xml (+8 lines)
25	<runtime-component-version type="standard.jre" version="1.5"/>	25	<runtime-component-version type="standard.jre" version="1.5"/>
26	<runtime-component-version type="standard.jre" version="1.6"/>	26	<runtime-component-version type="standard.jre" version="1.6"/>
27	<runtime-component-version type="standard.jre" version="1.7"/>	27	<runtime-component-version type="standard.jre" version="1.7"/>
		28	<runtime-component-version type="standard.jre" version="1.8"/>
28		29
29	<supported>	30	<supported>
30	<facet id="java" version="1.3"/>	31	<facet id="java" version="1.3"/>
Lines 49-54 Link Here
49	<supported>	50	<supported>
50	<facet id="java" version="1.7"/>	51	<facet id="java" version="1.7"/>
51	<runtime-component id="standard.jre" version="[1.7"/>	52	<runtime-component id="standard.jre" version="[1.7"/>
		53	</supported>
		54
		55	<supported>
		56	<facet id="java" version="1.8"/>
		57	<runtime-component id="standard.jre" version="[1.8"/>
52	</supported>	58	</supported>
53		59
54	<adapter>	60	<adapter>
Lines 77-82 Link Here
77		83
78	<project-facet-version facet="java" version="1.7"/>	84	<project-facet-version facet="java" version="1.7"/>
79		85
		86	<project-facet-version facet="java" version="1.8"/>
		87
80	<action facet="java" type="install" id="java.install">	88	<action facet="java" type="install" id="java.install">
81	<delegate class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallDelegate"/>	89	<delegate class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallDelegate"/>
82	<config-factory class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallConfigFactory"/>	90	<config-factory class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallConfigFactory"/>

Lines 1-5 Link Here

(-)src/org/eclipse/jst/common/project/facet/core/JavaFacet.java (-1 / +2 lines)
1	/******************************************************************************	1	/******************************************************************************
2	* Copyright (c) 2010 Oracle	2	* Copyright (c) 2010, 2014 Oracle
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 33-38 Link Here
33	public static final IProjectFacetVersion VERSION_1_5 = FACET.getVersion( "1.5" ); //$NON-NLS-1$	33	public static final IProjectFacetVersion VERSION_1_5 = FACET.getVersion( "1.5" ); //$NON-NLS-1$
34	public static final IProjectFacetVersion VERSION_1_6 = FACET.getVersion( "1.6" ); //$NON-NLS-1$	34	public static final IProjectFacetVersion VERSION_1_6 = FACET.getVersion( "1.6" ); //$NON-NLS-1$
35	public static final IProjectFacetVersion VERSION_1_7 = FACET.getVersion( "1.7" ); //$NON-NLS-1$	35	public static final IProjectFacetVersion VERSION_1_7 = FACET.getVersion( "1.7" ); //$NON-NLS-1$
		36	public static final IProjectFacetVersion VERSION_1_8 = FACET.getVersion( "1.8" ); //$NON-NLS-1$
36		37
37	@Deprecated	38	@Deprecated
38	public static final IProjectFacetVersion JAVA_13 = VERSION_1_3;	39	public static final IProjectFacetVersion JAVA_13 = VERSION_1_3;

Lines 1-5 Link Here

(-)src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java (-2 / +7 lines)
1	/******************************************************************************	1	/******************************************************************************
2	* Copyright (c) 2010 Oracle	2	* Copyright (c) 2010, 2014 Oracle
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 34-39 Link Here
34	public static final IRuntimeComponentVersion VERSION_1_5 = TYPE.getVersion( "1.5" ); //$NON-NLS-1$	34	public static final IRuntimeComponentVersion VERSION_1_5 = TYPE.getVersion( "1.5" ); //$NON-NLS-1$
35	public static final IRuntimeComponentVersion VERSION_1_6 = TYPE.getVersion( "1.6" ); //$NON-NLS-1$	35	public static final IRuntimeComponentVersion VERSION_1_6 = TYPE.getVersion( "1.6" ); //$NON-NLS-1$
36	public static final IRuntimeComponentVersion VERSION_1_7 = TYPE.getVersion( "1.7" ); //$NON-NLS-1$	36	public static final IRuntimeComponentVersion VERSION_1_7 = TYPE.getVersion( "1.7" ); //$NON-NLS-1$
		37	public static final IRuntimeComponentVersion VERSION_1_8 = TYPE.getVersion( "1.8" ); //$NON-NLS-1$
37		38
38	@Deprecated	39	@Deprecated
39	public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5;	40	public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5;
Lines 80-88 Link Here
80	{	81	{
81	rcv = StandardJreRuntimeComponent.VERSION_1_7;	82	rcv = StandardJreRuntimeComponent.VERSION_1_7;
82	}	83	}
		84	else if( jvmver.startsWith( "1.8" ) ) //$NON-NLS-1$
		85	{
		86	rcv = StandardJreRuntimeComponent.VERSION_1_8;
		87	}
83	else	88	else
84	{	89	{
85	rcv = StandardJreRuntimeComponent.VERSION_1_7;	90	rcv = StandardJreRuntimeComponent.VERSION_1_8;
86	}	91	}
87		92
88	final Map<String,String> properties = new HashMap<String,String>();	93	final Map<String,String> properties = new HashMap<String,String>();

Lines 1-5 Link Here

(-)src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java (-1 / +2 lines)
1	/******************************************************************************	1	/******************************************************************************
2	* Copyright (c) 2010 Oracle	2	* Copyright (c) 2010, 2014 Oracle
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 60-65 Link Here
60	FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_5, "J2SE-1.5" ); //$NON-NLS-1$	60	FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_5, "J2SE-1.5" ); //$NON-NLS-1$
61	FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_6, "JavaSE-1.6" ); //$NON-NLS-1$	61	FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_6, "JavaSE-1.6" ); //$NON-NLS-1$
62	FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_7, "JavaSE-1.7" ); //$NON-NLS-1$	62	FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_7, "JavaSE-1.7" ); //$NON-NLS-1$
		63	FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_8, "JavaSE-1.8" ); //$NON-NLS-1$
63	}	64	}
64		65
65	public static String getCompilerLevel()	66	public static String getCompilerLevel()

Return to bug 430637

Lines 4-19 Link Here

(-)buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html (-3 / +3 lines)
4	<head>	4	<head>
5	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">	5	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
6	<meta name="Build" content="Build">	6	<meta name="Build" content="Build">
7	<title>WTP 3.2.5 Patches</title>	7	<title>WTP 3.5.2 Patches</title>
8	</head>	8	</head>
9		9
10	<body>	10	<body>
11		11
12	<h1>WTP 3.2.5 Patches</h1>	12	<h1>WTP 3.5.2 Patches</h1>
13		13
14	<h2>org.eclipse.jst.common.fproj.enablement.jdt</h2>	14	<h2>org.eclipse.jst.common.fproj.enablement.jdt</h2>
15		15
16	<p>Bug <a href='https://bugs.eclipse.org/373666'>373666</a>. Adopter-only patch for allowing Static web project facets to coexist with Java facet</p>	16	<p>Bug <a href='https://bugs.eclipse.org/430637'>430637</a>. [hotbug] Java Version 1.8 of project facet java does not exist in Kepler SR2</p>
17		17
18	</body>	18	</body>
19	</html>	19	</html>

Lines 1-24 Link Here

(-)feature.xml (-24 / +31 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<feature	2	<feature
3	id="org.eclipse.jst.common.fproj.enablement.jdt.feature.patch"	3	id="org.eclipse.jst.common.fproj.enablement.jdt.feature.patch"
4	label="%featureName"	4	label="%featureName"
5	version="3.2.5.qualifier"	5	version="3.5.2.qualifier"
6	provider-name="%providerName">	6	provider-name="%providerName">
7		7
8	<description>	8	<description>
9	%description	9	%description
10	</description>	10	</description>
11		11
12	<copyright>	12	<copyright>
13	%copyright	13	%copyright
14	</copyright>	14	</copyright>
15		15
16	<license url="%licenseURL">	16	<license url="%licenseURL">
17	%license	17	%license
18	</license>	18	</license>
19		19
20	<requires>	20	<requires>
21	<import feature="org.eclipse.jst.common.fproj.enablement.jdt" version="3.2.2.v201008170019-377AB8s73533J5J759F " patch="true"/>	21	<import feature="org.eclipse.jst.common.fproj.enablement.jdt" version="3.4.0.v201108231500-377DG8s73543J5H6D66" patch="true"/>
22	</requires>	22	</requires>
23		23
24	</feature>	24	<plugin
		25	id="org.eclipse.jst.common.project.facet.core"
		26	download-size="0"
		27	install-size="0"
		28	version="0.0.0"
		29	unpack="false"/>
		30
		31	</feature>