Attachment 241409 Details for Bug 430637 – Proposed patch for Java 8 facet support

[patch] Proposed patch for Java 8 facet support

bug430637.patch (text/plain), 8.68 KB, created by Carl Anderson

on 2014-03-28 22:00:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2014-03-28 22:00:58 EDT

Size: 8.68 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.common.fproj.enablement.jdt.feature.patch
>diff --git buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html
>index e98ba68..3d94d7f 100644
>--- buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html
>+++ buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html
>@@ -4,16 +4,16 @@
> <head>
> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
> <meta name="Build" content="Build">
>-<title>WTP 3.2.5 Patches</title>
>+<title>WTP 3.5.2 Patches</title>
> </head>
> 
> <body>
> 
>-	<h1>WTP 3.2.5 Patches</h1>
>+	<h1>WTP 3.5.2 Patches</h1>
> 
> 	<h2>org.eclipse.jst.common.fproj.enablement.jdt</h2>
> 	
>-	<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>
>+	<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>
>\ No newline at end of file
>diff --git feature.properties feature.properties
>index 1f3fb70..178c3a7 100644
>--- feature.properties
>+++ feature.properties
>@@ -27,7 +27,7 @@
> description=\
> Contains fixes described in the following bugzilla(s):\n\
> \n\
>-Bug https://bugs.eclipse.org/373666 Adopter-only patch for allowing Static web project facets to coexist with Java facet\n\
>+Bug https://bugs.eclipse.org/430637 [hotbug] Java Version 1.8 of project facet java does not exist in Kepler SR2\n\
> \n\
> # "copyright" property - text of the "Feature Update Copyright"
> copyright=\
>diff --git feature.xml feature.xml
>index 4595e6d..6bb64c9 100644
>--- feature.xml
>+++ feature.xml
>@@ -1,24 +1,31 @@
>-<?xml version="1.0" encoding="UTF-8"?>
>-<feature
>-      id="org.eclipse.jst.common.fproj.enablement.jdt.feature.patch"
>-      label="%featureName"
>-      version="3.2.5.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.2.2.v201008170019-377AB8s73533J5J759F " patch="true"/>
>-   </requires>
>-
>-</feature>
>+<?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>
>#P org.eclipse.jst.common.project.facet.core
>diff --git META-INF/MANIFEST.MF META-INF/MANIFEST.MF
>index 09931a0..1682b85 100644
>--- META-INF/MANIFEST.MF
>+++ META-INF/MANIFEST.MF
>@@ -3,7 +3,7 @@
> Bundle-Vendor: %providerName
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true
>-Bundle-Version: 1.4.201.qualifier
>+Bundle-Version: 1.4.300.qualifier
> Bundle-ClassPath: .
> Bundle-Localization: plugin
> Export-Package: org.eclipse.jst.common.project.facet.core,
>diff --git plugin.xml plugin.xml
>index d0aafaf..559a733 100644
>--- plugin.xml
>+++ plugin.xml
>@@ -25,6 +25,7 @@
>     <runtime-component-version type="standard.jre" version="1.5"/>
>     <runtime-component-version type="standard.jre" version="1.6"/>
>     <runtime-component-version type="standard.jre" version="1.7"/>
>+    <runtime-component-version type="standard.jre" version="1.8"/>
> 
>     <supported>
>       <facet id="java" version="1.3"/>
>@@ -49,6 +50,11 @@
>     <supported>
>       <facet id="java" version="1.7"/>
>       <runtime-component id="standard.jre" version="[1.7"/>
>+    </supported>
>+
>+    <supported>
>+      <facet id="java" version="1.8"/>
>+      <runtime-component id="standard.jre" version="[1.8"/>
>     </supported>
> 
>     <adapter>
>@@ -77,6 +83,8 @@
> 
>     <project-facet-version facet="java" version="1.7"/>
> 
>+    <project-facet-version facet="java" version="1.8"/>
>+
>     <action facet="java" type="install" id="java.install">
>       <delegate class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallDelegate"/>
>       <config-factory class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallConfigFactory"/>
>diff --git src/org/eclipse/jst/common/project/facet/core/JavaFacet.java src/org/eclipse/jst/common/project/facet/core/JavaFacet.java
>index 850112e..552a1e0 100644
>--- src/org/eclipse/jst/common/project/facet/core/JavaFacet.java
>+++ src/org/eclipse/jst/common/project/facet/core/JavaFacet.java
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2010 Oracle
>+ * Copyright (c) 2010, 2014 Oracle
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -33,6 +33,7 @@
>     public static final IProjectFacetVersion VERSION_1_5 = FACET.getVersion( "1.5" ); //$NON-NLS-1$
>     public static final IProjectFacetVersion VERSION_1_6 = FACET.getVersion( "1.6" ); //$NON-NLS-1$
>     public static final IProjectFacetVersion VERSION_1_7 = FACET.getVersion( "1.7" ); //$NON-NLS-1$
>+    public static final IProjectFacetVersion VERSION_1_8 = FACET.getVersion( "1.8" ); //$NON-NLS-1$
> 
>     @Deprecated
>     public static final IProjectFacetVersion JAVA_13 = VERSION_1_3;
>diff --git src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java
>index 99490af..3f70bf2 100644
>--- src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java
>+++ src/org/eclipse/jst/common/project/facet/core/StandardJreRuntimeComponent.java
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2010 Oracle
>+ * Copyright (c) 2010, 2014 Oracle
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -34,6 +34,7 @@
>     public static final IRuntimeComponentVersion VERSION_1_5 = TYPE.getVersion( "1.5" ); //$NON-NLS-1$
>     public static final IRuntimeComponentVersion VERSION_1_6 = TYPE.getVersion( "1.6" ); //$NON-NLS-1$
>     public static final IRuntimeComponentVersion VERSION_1_7 = TYPE.getVersion( "1.7" ); //$NON-NLS-1$
>+    public static final IRuntimeComponentVersion VERSION_1_8 = TYPE.getVersion( "1.8" ); //$NON-NLS-1$
> 
>     @Deprecated
>     public static final IRuntimeComponentVersion VERSION_5_0 = VERSION_1_5;
>@@ -80,9 +81,13 @@
>         {
>             rcv = StandardJreRuntimeComponent.VERSION_1_7;
>         }
>+        else if( jvmver.startsWith( "1.8" ) ) //$NON-NLS-1$
>+        {
>+            rcv = StandardJreRuntimeComponent.VERSION_1_8;
>+        }
>         else 
>         {
>-            rcv = StandardJreRuntimeComponent.VERSION_1_7;
>+            rcv = StandardJreRuntimeComponent.VERSION_1_8;
>         }
>         
>         final Map<String,String> properties = new HashMap<String,String>();
>diff --git src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java
>index 576a6b0..414799d 100644
>--- src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java
>+++ src/org/eclipse/jst/common/project/facet/core/internal/JavaFacetUtil.java
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2010 Oracle
>+ * Copyright (c) 2010, 2014 Oracle
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -60,6 +60,7 @@
>         FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_5, "J2SE-1.5" ); //$NON-NLS-1$
>         FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_6, "JavaSE-1.6" ); //$NON-NLS-1$
>         FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_7, "JavaSE-1.7" ); //$NON-NLS-1$
>+        FACET_VER_TO_EXEC_ENV.put( JavaFacet.VERSION_1_8, "JavaSE-1.8" ); //$NON-NLS-1$
>     }
>     
>     public static String getCompilerLevel()

Actions: View | Diff

Attachments on bug 430637: 241354 | 241355 | 241409