Merge pull request #8 from gjwatts/add-java-21-test

gjwatts · web-flow · commit e049cb47d832 · 2023-07-19T13:38:35.000-05:00
Create Java 21 specific WAR
diff --git a/io.openliberty.java.internal_fat_21/.classpath b/io.openliberty.java.internal_fat_21/.classpath
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin/main" path="src/main/java">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/io.openliberty.java.internal_fat_21/.gitignore b/io.openliberty.java.internal_fat_21/.gitignore
@@ -0,0 +1,6 @@
+.gradle/
+/bin/
+/build/
+/generated/
+/gradle/
+/wlp
diff --git a/io.openliberty.java.internal_fat_21/.project b/io.openliberty.java.internal_fat_21/.project
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.openliberty.java.internal_fat_21</name>
+	<comment>Project basic-liberty created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/io.openliberty.java.internal_fat_21/.settings/org.eclipse.buildship.core.prefs b/io.openliberty.java.internal_fat_21/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/io.openliberty.java.internal_fat_21/.settings/org.eclipse.jdt.core.prefs b/io.openliberty.java.internal_fat_21/.settings/org.eclipse.jdt.core.prefs
diff --git a/io.openliberty.java.internal_fat_21/.settings/org.eclipse.jdt.ui.prefs b/io.openliberty.java.internal_fat_21/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,63 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=false
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/io.openliberty.java.internal_fat_21/.settings/org.eclipse.ltk.core.refactoring.prefs b/io.openliberty.java.internal_fat_21/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/io.openliberty.java.internal_fat_21/.settings/org.eclipse.wst.common.component b/io.openliberty.java.internal_fat_21/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+	<wb-module deploy-name="io.openliberty.java.internal_fat_21">
+		<property name="context-root" value="io.openliberty.java.internal_fat_21"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
+		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
+	</wb-module>
+</project-modules>
diff --git a/io.openliberty.java.internal_fat_21/.settings/org.eclipse.wst.common.project.facet.core.xml b/io.openliberty.java.internal_fat_21/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Getting started Liberty Server"/>
+  <fixed facet="jst.java"/>
+  <fixed facet="jst.web"/>
+  <installed facet="jst.java" version="21"/>
+  <installed facet="jst.web" version="4.0"/>
+</faceted-project>
diff --git a/io.openliberty.java.internal_fat_21/.settings/org.eclipse.wst.ws.service.policy.prefs b/io.openliberty.java.internal_fat_21/.settings/org.eclipse.wst.ws.service.policy.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.wst.ws.service.policy.projectEnabled=false
diff --git a/io.openliberty.java.internal_fat_21/README.md b/io.openliberty.java.internal_fat_21/README.md
@@ -0,0 +1,89 @@
+# Repo for quick testing of Liberty apps
+Especially useful for new Java versions
+
+### For versions of Java that already have gradle support
+
+To build the WAR file locally, from the root directory of the open-liberty-misc repository run:
+
+```
+./gradlew io.openliberty.java.internal_fat_21:build
+```
+
+To build+run locally, this currently requires some manual effort:
+* Note, the **build.gradle** file is configured to look for a Liberty install under `/wlp`. You might need to change it to point it to your local test Liberty install instead.
+* Copy the `jvm.options` file and the contents of the `server.env` file from the project's `run` directory and add them to your `/wlp/usr/servers/io.openliberty.java.internal_fat_21Server/server.env` file (or equivalent location).
+* Change to the root directory of this local `io.openliberty.java.internal_fat_21` repository and run:
+
+```
+./gradlew io.openliberty.java.internal_fat_21:start
+```
+
+---
+
+### For versions of Java that do not have gradle support yet
+Make the following updates in the following files (example given here as if you were working with pre-gradle support for Java 21):
+
+- In **build.gradle**, set:
+
+```
+   languageVersion = JavaLanguageVersion.of(21)
+```
+
+- And then set the environment variable JDK21 to your Java 21 JDK home, for example:
+
+```
+(Mac)      export JDK21="/path/to/your/jdk21/home"
+(Unix)     JDK21="/path/to/your/jdk21/home"
+(Win DOS)  set JDK21="C:\path\to\your\jdk21\home"
+(Win PS)   $env:JDK21="C:\path\to\your\jdk21\home"
+```
+
+- To build the WAR file locally, from the root directory of the open-liberty-misc repository run:
+
+```
+./gradlew io.openliberty.java.internal_fat_21:build -P"org.gradle.java.installations.fromEnv=JDK21"
+```
+where **JDK21** is a system environment variable that reflects the location of your Java XX JDK you wish the source to be complied at (see last step).
+
+
+To build+run locally, this currently requires some manual effort:
+* Note, the **build.gradle** file is configured to look for a Liberty install under `/wlp`. You might need to change it to point it to your local test Liberty install instead.
+* Copy the `jvm.options` file and the contents of the `server.env` file from the project's `run` directory and add them to your `/wlp/usr/servers/io.openliberty.java.internal_fat_21Server/server.env` file (or equivalent location).
+* Change to the root directory of this local `io.openliberty.java.internal_fat_21` repository and run:
+
+```
+./gradlew io.openliberty.java.internal_fat_21:start -P"org.gradle.java.installations.fromEnv=JDK21"
+```
+where **JDK21** is a system environment variable that reflects the location of your Java XX JDK you wish the source to be complied at (see last step).
+
+
+If testing with the `io.openliberty.java.internal_fat` FAT from OpenLiberty, copy the file gradle builds (in build/libs) `io.openliberty.java.internal_fat_21.war` to the `io.openliberty.java.internal_fat/publish/servers/java21-server/apps` directory.
+
+---
+
+### When moving to a new release of Java
+
+Here are the locations where you might want to update up the Java release number to the current Java version
+
+- **org.eclipse.wst.common.component** (in the `.settings` directory)
+
+```
+<wb-module deploy-name="io.openliberty.java.internal_fat_21">
+		<property name="context-root" value="io.openliberty.java.internal_fat_21"/>
+```
+
+- **build.gradle**
+
+```
+    appUrl = 'http://localhost:9080/io.openliberty.java.internal_fat_21/'
+
+    <Make sure to add any new dependencies or update existing ones to the proper levels>
+```
+
+- **gradle-wrapper.properties** (might as well bump up to the latest supported version of gradle)
+
+```
+	distributionUrl=https\://services.gradle.org/distributions/gradle-X.Y-bin.zip
+```
+
+Then add new code to **TestServices.java** either directly or via another class and make sure **TestApp.java** is in the same directory as it.
diff --git a/io.openliberty.java.internal_fat_21/build.gradle b/io.openliberty.java.internal_fat_21/build.gradle
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+// To create this WAR file (ex: ./gradlew build...) for newer versions of Java (typically early access ones) before gradle supports it
+// See the README.md file
+// Change the installDir setting if your Liberty is located outside of /wlp
+
+apply plugin: 'war'
+
+description = "Basic Liberty repo"
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+compileJava {
+    //inputs.property("moduleName", moduleName)
+    doFirst {
+        options.compilerArgs = [
+            '--module-path', classpath.asPath,
+            '--enable-preview'
+        ]
+        classpath = files()
+        options.warnings = true
+        options.deprecation = true
+        options.debug = true
+        options.incremental = false
+    }
+}
+test {
+  useJUnitPlatform()
+}
+
+java {
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(21)
+  }
+}
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'io.openliberty.tools:liberty-gradle-plugin:3.0'
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+configurations {
+    serverLibs
+}
+
+dependencies {
+    compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.1.1'
+//    compileOnly group: 'javax.persistence', name: 'javax.persistence-api', version: '2.2'
+    compileOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+    compileOnly group: 'javax.enterprise', name: 'cdi-api', version: '2.0'
+//    compileOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
+//    compileOnly group: 'javax.transaction', name: 'javax.transaction-api', version: '1.3'
+//    libertyRuntime group: 'io.openliberty', name: 'openliberty-runtime', version: '22.0.0.12'
+//    serverLibs group: 'org.apache.derby', name: 'derby', version: '10.14.2.0' // '10.15.1.3'
+}
+
+ext {
+	appUrl = 'http://localhost:9080/io.openliberty.java.internal_fat_21/'
+}
+
+task copyServerLibs(type: Copy) {
+    from configurations.serverLibs
+    // Default location of local Liberty server
+    into "/wlp/usr/servers/${project.name}Server/lib"
+}
+
+// Not currently working, must manually handle
+tasks.register('copyEnvFiles', Copy) {
+    println "Start of copyEnvFiles"
+    from file('run/jvm.options')
+// Default location of local Liberty server
+    into new File("/wlp/usr/servers/${project.name}Server")
+    from file('run/server.env')
+// Default location of local Liberty server
+    into new File("/wlp/usr/servers/${project.name}Server")
+    println "End of copyEnvFiles"
+}
+
+task openBrowser {
+    description = "Open browser to ${appUrl}"
+    doLast {
+        java.awt.Desktop.desktop.browse "${appUrl}".toURI()
+    }
+}
+
diff --git a/io.openliberty.java.internal_fat_21/run/jvm.options b/io.openliberty.java.internal_fat_21/run/jvm.options
@@ -0,0 +1,5 @@
+# Enable Java preview features
+--enable-preview
+
+# Enable Java incubator modules
+--add-modules=jdk.incubator.foreign
diff --git a/io.openliberty.java.internal_fat_21/run/server.env b/io.openliberty.java.internal_fat_21/run/server.env
@@ -0,0 +1,2 @@
+# Need to update the JAVA_HOME environment variable to point to your Java 21 JDK
+JAVA_HOME=/jdk/hotspot/jdk21
diff --git a/io.openliberty.java.internal_fat_21/src/main/java/io/openliberty/java/internal/TestApp.java b/io.openliberty.java.internal_fat_21/src/main/java/io/openliberty/java/internal/TestApp.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package io.openliberty.java.internal;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class TestApp extends Application {
+}
diff --git a/io.openliberty.java.internal_fat_21/src/main/java/io/openliberty/java/internal/TestService.java b/io.openliberty.java.internal_fat_21/src/main/java/io/openliberty/java/internal/TestService.java
diff --git a/io.openliberty.java.internal_fat_21/src/main/java/io/openliberty/java/internal/package-info.java b/io.openliberty.java.internal_fat_21/src/main/java/io/openliberty/java/internal/package-info.java
diff --git a/io.openliberty.java.internal_fat_21/src/main/java/module-info.java b/io.openliberty.java.internal_fat_21/src/main/java/module-info.java
diff --git a/io.openliberty.java.internal_fat_21/src/main/liberty/config/server.xml b/io.openliberty.java.internal_fat_21/src/main/liberty/config/server.xml
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+connection.project.dir=`
	`2`	`+eclipse.preferences.version=1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+eclipse.preferences.version=1`
	`2`	`+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+eclipse.preferences.version=1`
	`2`	`+org.eclipse.wst.ws.service.policy.projectEnabled=false`