Skip to content

Commit 087be3d

Browse files
author
Omur
committed
trying on another computer
1 parent 49e355d commit 087be3d

File tree

15 files changed

+1222
-66
lines changed

15 files changed

+1222
-66
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,3 +362,4 @@ jdk_8_maven/em/external/rest/spring-batch-rest/target
362362
/jdk_21_maven/em/external/rest-gui/webgoat/target
363363

364364
/jdk_8_maven/cs/rest/original/swagger-petstore/target
365+
/jdk_8_maven/em/embedded/rest/swagger-petstore/target

‎jdk_8_maven/cs/rest/original/swagger-petstore/pom.xml‎

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<parent>
3+
<groupId>org.springframework.boot</groupId>
4+
<artifactId>spring-boot-starter-parent</artifactId>
5+
<version>2.7.18</version>
6+
<relativePath/>
7+
</parent>
8+
29
<modelVersion>4.0.0</modelVersion>
310
<groupId>io.swagger</groupId>
411
<artifactId>swagger-petstore</artifactId>
@@ -40,36 +47,6 @@
4047
<directory>target</directory>
4148
<finalName>${project.artifactId}-sut</finalName>
4249
<plugins>
43-
<!-- MODIFIED-->
44-
<plugin>
45-
<groupId>org.apache.maven.plugins</groupId>
46-
<artifactId>maven-shade-plugin</artifactId>
47-
<version>3.5.1</version>
48-
<executions>
49-
<execution>
50-
<phase>package</phase>
51-
<goals><goal>shade</goal></goals>
52-
<configuration>
53-
<filters>
54-
<filter>
55-
<artifact>*:*</artifact>
56-
<excludes>
57-
<exclude>META-INF/*.SF</exclude>
58-
<exclude>META-INF/*.DSA</exclude>
59-
<exclude>META-INF/*.RSA</exclude>
60-
</excludes>
61-
</filter>
62-
</filters>
63-
<transformers>
64-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
65-
<mainClass>io.swagger.petstore.Main</mainClass>
66-
</transformer>
67-
</transformers>
68-
</configuration>
69-
</execution>
70-
</executions>
71-
</plugin>
72-
<!-- MODIFIED-->
7350
<plugin>
7451
<artifactId>maven-compiler-plugin</artifactId>
7552
<version>3.11.0</version>
@@ -203,10 +180,19 @@
203180
</execution>
204181
</executions>
205182
</plugin>
183+
<plugin>
184+
<groupId>org.springframework.boot</groupId>
185+
<artifactId>spring-boot-maven-plugin</artifactId>
186+
</plugin>
206187
</plugins>
207188
</build>
208189
<dependencies>
209190
<!--MODIFIED-->
191+
<dependency>
192+
<groupId>org.springframework.boot</groupId>
193+
<artifactId>spring-boot-starter-web</artifactId>
194+
</dependency>
195+
210196
<dependency>
211197
<groupId>org.apache.tomcat.embed</groupId>
212198
<artifactId>tomcat-embed-core</artifactId>
@@ -272,16 +258,18 @@
272258
<artifactId>jaxb-api</artifactId>
273259
<version>2.3.1</version>
274260
</dependency>
275-
<dependency>
276-
<groupId>com.sun.xml.bind</groupId>
277-
<artifactId>jaxb-core</artifactId>
278-
<version>2.3.0.1</version>
279-
</dependency>
280-
<dependency>
281-
<groupId>com.sun.xml.bind</groupId>
282-
<artifactId>jaxb-impl</artifactId>
283-
<version>2.3.1</version>
284-
</dependency>
261+
<!-- MODIFIED-->
262+
263+
<!-- <dependency>-->
264+
<!-- <groupId>com.sun.xml.bind</groupId>-->
265+
<!-- <artifactId>jaxb-core</artifactId>-->
266+
<!-- <version>2.3.0.1</version>-->
267+
<!-- </dependency>-->
268+
<!-- <dependency>-->
269+
<!-- <groupId>com.sun.xml.bind</groupId>-->
270+
<!-- <artifactId>jaxb-impl</artifactId>-->
271+
<!-- <version>2.3.1</version>-->
272+
<!-- </dependency>-->
285273
<dependency>
286274
<groupId>com.bugsnag</groupId>
287275
<version>[3.0,4.0)</version>

‎jdk_8_maven/cs/rest/original/swagger-petstore/src/main/java/io/swagger/petstore/Main.java‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,11 @@
1-
//MODIFIED: This code is a simple Java application that starts an embedded Tomcat server to serve the Swagger Petstore application.
2-
31
package io.swagger.petstore;
42

5-
import org.apache.catalina.startup.Tomcat;
6-
7-
import java.io.File;
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
85

6+
@SpringBootApplication
97
public class Main {
10-
public static void main(String[] args) throws Exception {
11-
int port = 8080;
12-
13-
if (args.length > 0) {
14-
try {
15-
port = Integer.parseInt(args[0]);
16-
} catch (NumberFormatException e) {
17-
System.err.println("Invalid port number: " + args[0] + ". Using default port 8080.");
18-
}
19-
}
20-
21-
Tomcat tomcat = new Tomcat();
22-
tomcat.setPort(port);
23-
tomcat.getConnector();
24-
25-
String webappDirLocation = "src/main/webapp";
26-
tomcat.addWebapp("", new File(webappDirLocation).getAbsolutePath());
27-
28-
System.out.println("Swagger Petstore running at http://localhost:" + port);
29-
tomcat.start();
30-
tomcat.getServer().await();
8+
public static void main(String[] args) {
9+
SpringApplication.run(Main.class, args);
3110
}
3211
}

‎jdk_8_maven/cs/rest/original/swagger-petstore/src/main/resources/index.html‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<!-- HTML for static distribution bundle build -->
2+
<!DOCTYPE html>
3+
<html lang="en">
4+
<head>
5+
<meta charset="UTF-8">
6+
<title>Swagger UI</title>
7+
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
8+
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
9+
<link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
10+
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
11+
<style>
12+
html
13+
{
14+
box-sizing: border-box;
15+
overflow: -moz-scrollbars-vertical;
16+
overflow-y: scroll;
17+
}
18+
*,
19+
*:before,
20+
*:after
21+
{
22+
box-sizing: inherit;
23+
}
24+
25+
body {
26+
margin:0;
27+
background: #fafafa;
28+
}
29+
</style>
30+
</head>
31+
32+
<body>
33+
34+
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
35+
<defs>
36+
<symbol viewBox="0 0 20 20" id="unlocked">
37+
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
38+
</symbol>
39+
40+
<symbol viewBox="0 0 20 20" id="locked">
41+
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
42+
</symbol>
43+
44+
<symbol viewBox="0 0 20 20" id="close">
45+
<path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
46+
</symbol>
47+
48+
<symbol viewBox="0 0 20 20" id="large-arrow">
49+
<path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
50+
</symbol>
51+
52+
<symbol viewBox="0 0 20 20" id="large-arrow-down">
53+
<path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
54+
</symbol>
55+
56+
57+
<symbol viewBox="0 0 24 24" id="jump-to">
58+
<path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
59+
</symbol>
60+
61+
<symbol viewBox="0 0 24 24" id="expand">
62+
<path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
63+
</symbol>
64+
65+
</defs>
66+
</svg>
67+
68+
<div id="swagger-ui"></div>
69+
70+
<script src="./swagger-ui-bundle.js"> </script>
71+
<script src="./swagger-ui-standalone-preset.js"> </script>
72+
<script>
73+
window.onload = function() {
74+
// Build a system
75+
apiUrl = window.location.protocol + "//" + window.location.host + "/api/v3/openapi.json";
76+
const ui = SwaggerUIBundle({
77+
oauth2RedirectUrl: window.location.protocol + '//' + window.location.host + '/oauth2-redirect.html',
78+
url: apiUrl,
79+
dom_id: '#swagger-ui',
80+
presets: [
81+
SwaggerUIBundle.presets.apis,
82+
SwaggerUIStandalonePreset
83+
],
84+
plugins: [
85+
SwaggerUIBundle.plugins.DownloadUrl
86+
],
87+
layout: "StandaloneLayout",
88+
queryConfigEnabled: true
89+
})
90+
91+
window.ui = ui
92+
}
93+
</script>
94+
</body>
95+
96+
</html>

‎jdk_8_maven/cs/rest/original/swagger-petstore/src/main/resources/static/index.html‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<!-- HTML for static distribution bundle build -->
2+
<!DOCTYPE html>
3+
<html lang="en">
4+
<head>
5+
<meta charset="UTF-8">
6+
<title>Swagger UI</title>
7+
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
8+
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
9+
<link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
10+
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
11+
<style>
12+
html
13+
{
14+
box-sizing: border-box;
15+
overflow: -moz-scrollbars-vertical;
16+
overflow-y: scroll;
17+
}
18+
*,
19+
*:before,
20+
*:after
21+
{
22+
box-sizing: inherit;
23+
}
24+
25+
body {
26+
margin:0;
27+
background: #fafafa;
28+
}
29+
</style>
30+
</head>
31+
32+
<body>
33+
34+
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
35+
<defs>
36+
<symbol viewBox="0 0 20 20" id="unlocked">
37+
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
38+
</symbol>
39+
40+
<symbol viewBox="0 0 20 20" id="locked">
41+
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
42+
</symbol>
43+
44+
<symbol viewBox="0 0 20 20" id="close">
45+
<path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
46+
</symbol>
47+
48+
<symbol viewBox="0 0 20 20" id="large-arrow">
49+
<path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
50+
</symbol>
51+
52+
<symbol viewBox="0 0 20 20" id="large-arrow-down">
53+
<path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
54+
</symbol>
55+
56+
57+
<symbol viewBox="0 0 24 24" id="jump-to">
58+
<path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
59+
</symbol>
60+
61+
<symbol viewBox="0 0 24 24" id="expand">
62+
<path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
63+
</symbol>
64+
65+
</defs>
66+
</svg>
67+
68+
<div id="swagger-ui"></div>
69+
70+
<script src="./swagger-ui-bundle.js"> </script>
71+
<script src="./swagger-ui-standalone-preset.js"> </script>
72+
<script>
73+
window.onload = function() {
74+
// Build a system
75+
apiUrl = window.location.protocol + "//" + window.location.host + "/api/v3/openapi.json";
76+
const ui = SwaggerUIBundle({
77+
oauth2RedirectUrl: window.location.protocol + '//' + window.location.host + '/oauth2-redirect.html',
78+
url: apiUrl,
79+
dom_id: '#swagger-ui',
80+
presets: [
81+
SwaggerUIBundle.presets.apis,
82+
SwaggerUIStandalonePreset
83+
],
84+
plugins: [
85+
SwaggerUIBundle.plugins.DownloadUrl
86+
],
87+
layout: "StandaloneLayout",
88+
queryConfigEnabled: true
89+
})
90+
91+
window.ui = ui
92+
}
93+
</script>
94+
</body>
95+
96+
</html>

0 commit comments

Comments
 (0)