Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Windows Java SE runtime #850

Merged
merged 5 commits into from
Oct 14, 2019
Merged

Support Windows Java SE runtime #850

merged 5 commits into from
Oct 14, 2019

Conversation

Flanker32
Copy link
Member

Support Windows Java SE runtime, remove old workaround(web.config)

@Flanker32 Flanker32 requested a review from andxu October 12, 2019 06:53
@codecov-io
Copy link

codecov-io commented Oct 12, 2019

Codecov Report

Merging #850 into develop will increase coverage by 0.19%.
The diff coverage is 0%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop     #850      +/-   ##
=============================================
+ Coverage      44.55%   44.75%   +0.19%     
  Complexity       765      765              
=============================================
  Files            134      134              
  Lines           5169     5146      -23     
  Branches         742      737       -5     
=============================================
  Hits            2303     2303              
+ Misses          2692     2669      -23     
  Partials         174      174
Impacted Files Coverage Δ Complexity Δ
...webapp/handlers/artifact/ArtifactHandlerUtils.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...icrosoft/azure/maven/webapp/utils/WebAppUtils.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...a/com/microsoft/azure/maven/webapp/ConfigMojo.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...bapp/handlers/artifact/JarArtifactHandlerImpl.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...ebapp/handlers/artifact/ArtifactHandlerImplV2.java 0% <0%> (ø) 0 <0> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 032f250...5a50a3f. Read the comment docs.

Files.copy(jar, new File(parent, jar.getName()));
WebAppUtils.generateWebConfigFile(deployTarget, jar.getName(), stagingDirectoryPath, log);
}
Files.copy(jar, new File(parent, DEFAULT_LINUX_JAR_NAME));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DEFAULT_LINUX_JAR_NAME should be renamed to DEFAULT_JAR_NAME ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DEFAULT_LINUX_JAR_NAME and DEFAULT_JAVA_SE_JAR_NAME are same?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we need rename the executable jar file to app.jar, both for windows and linux

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed to DEFAULT_APP_SERVICE_JAR_NAME

@@ -27,6 +27,10 @@

public static final String RUNTIME_CONFIG_REFERENCE = "https://aka.ms/maven_webapp_runtime";

static {
WebContainer.fromString("java 11"); // Add Java 11 Enum as Fluent SDK had not added it yet
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JAVA_11_STRING ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@Flanker32 Flanker32 merged commit 0f2835b into develop Oct 14, 2019
@Flanker32 Flanker32 deleted the hanxiao/javase branch October 14, 2019 06:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants