Skip to content

Commit

Permalink
Simplify server example (Hakky54#90)
Browse files Browse the repository at this point in the history
* Removed sun server and grizzly server example

* Renamed server-with-spring-boot to server
  • Loading branch information
Hakky54 authored Oct 14, 2021
1 parent 52f1052 commit ce3ff74
Show file tree
Hide file tree
Showing 56 changed files with 13 additions and 1,255 deletions.
6 changes: 3 additions & 3 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ The server depends on the other components of the project, so run `mvn install`
```bash
mvn install
```
Start the server by running the main method of the [App Class](server-with-spring-boot/src/main/java/nl/altindag/server/App.java) in the server project or by running the following command from the terminal in the root directory:
Start the server by running the main method of the [App Class](server/src/main/java/nl/altindag/server/App.java) in the server project or by running the following command from the terminal in the root directory:
```bash
cd server-with-spring-boot/ && mvn spring-boot:run
cd server/ && mvn spring-boot:run
```
Or with the maven wrapper
```bash
cd server-with-spring-boot/ && ./../mvnw spring-boot:run
cd server/ && ./../mvnw spring-boot:run
```

## Saying hello to the server (without encryption)
Expand Down
4 changes: 2 additions & 2 deletions client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@

<dependency>
<groupId>nl.altindag</groupId>
<artifactId>server-with-spring-boot</artifactId>
<artifactId>server</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -370,7 +370,7 @@
<goal>start</goal>
</goals>
<configuration>
<classesDirectory>../server-with-spring-boot/target/classes</classesDirectory>
<classesDirectory>../server/target/classes</classesDirectory>
</configuration>
</execution>
<execution>
Expand Down
94 changes: 0 additions & 94 deletions common-server-utils/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file removed common-server-utils/src/test/resources/identity.jks
Binary file not shown.
Binary file not shown.
5 changes: 1 addition & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@
<version>1.0-SNAPSHOT</version>

<modules>
<module>common-server-utils</module>
<module>shared-server-resources</module>
<module>server-with-spring-boot</module>
<module>server-with-jersey-grizzly</module>
<module>server-with-sun-httpserver</module>
<module>server</module>
<module>client</module>
</modules>

Expand Down
4 changes: 2 additions & 2 deletions script/configure-one-way-authentication.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ createCertificates() {
configureApplicationProperties() {
echo
echo 'Configuring application properties of the server'
rm server-with-spring-boot/src/main/resources/application.yml
echo -e 'spring:\n banner:\n location: classpath:banner.txt\n\nserver:\n port: 8443\n ssl:\n enabled: true\n key-store: classpath:identity.jks\n key-password: secret\n key-store-password: secret' >> server-with-spring-boot/src/main/resources/application.yml
rm server/src/main/resources/application.yml
echo -e 'spring:\n banner:\n location: classpath:banner.txt\n\nserver:\n port: 8443\n ssl:\n enabled: true\n key-store: classpath:identity.jks\n key-password: secret\n key-store-password: secret' >> server/src/main/resources/application.yml

echo 'Configuring application properties of the client'
rm client/src/test/resources/application.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ createCertificates() {
configureApplicationProperties() {
echo
echo 'Configuring application properties of the server'
rm server-with-spring-boot/src/main/resources/application.yml
echo -e 'spring:\n banner:\n location: classpath:banner.txt\n\nserver:\n port: 8443\n ssl:\n enabled: true\n key-store: classpath:identity.jks\n key-password: secret\n key-store-password: secret\n trust-store: classpath:truststore.jks\n trust-store-password: secret\n client-auth: need' >> server-with-spring-boot/src/main/resources/application.yml
rm server/src/main/resources/application.yml
echo -e 'spring:\n banner:\n location: classpath:banner.txt\n\nserver:\n port: 8443\n ssl:\n enabled: true\n key-store: classpath:identity.jks\n key-password: secret\n key-store-password: secret\n trust-store: classpath:truststore.jks\n trust-store-password: secret\n client-auth: need' >> server/src/main/resources/application.yml

echo 'Configuring application properties of the client'
rm client/src/test/resources/application.yml
Expand Down
Loading

0 comments on commit ce3ff74

Please sign in to comment.