Skip to content

Commit 97f3697

Browse files
committed
Merge branch 'main' into completed
2 parents bb04973 + f375ccd commit 97f3697

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

2-0-servlet-api/2-0-1-date-servlet-api/README.MD renamed to 2-0-servlet-api/2-0-1-hello-servlet-api/README.MD

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/>Welcome Date Servlet
2-
Your first acquaintance with Servlets, JSP and servlet Container 👀
3-
4-
[Servlets are the Java platform technology of choice for extending and enhancing Web servers.](https://www.oracle.com/java/technologies/servlet-technology.html)
1+
# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/>Hello Servlet API
2+
Start learning Servlet API – the foundation of Java web applications 💪
53

64
### Pre-conditions ❗
7-
You're supposed to be familiar with [Java Fundamentals](https://github.com/bobocode-projects/java-fundamentals-course)
5+
You're supposed to be familiar with [Java Fundamentals](https://github.com/bobocode-projects/java-fundamentals-course#welcome-to-the-java-fundamentals-course)
86

97
### Objectives
10-
* **install** [Apache Tomcat Container](https://tomcat.apache.org/download-90.cgi) if you didn't
8+
* **install** [Apache Tomcat Container](https://tomcat.apache.org/download-90.cgi) locally (if you don't have it yet)
119

12-
-*Servlets don’t have any main() method. Instead, are used Containers to control Servlets.
10+
*Servlets don’t have any main() method. Instead, are used Containers to control Servlets.
1311
Containers are other Java applications such as Tomcat, GlassFish or Jetty. You have to install one of it if you didn't.
1412
We suggest to use Tomcat as more lightweight and easier in configuration.*
15-
***configure a Container** depending on your environment
13+
***configure a Container** depending on your IDE
1614
- [IntelliJ IDEA:](https://www.jetbrains.com/help/idea/run-debug-configuration-tomcat-server.html)
1715
1. Create a new server configuration:
1816

@@ -22,7 +20,7 @@ You're supposed to be familiar with [Java Fundamentals](https://github.com/boboc
2220
**Server** tab ▶ **Configure** ▶ (➕)**Add Application Server** ▶ Add a path to folder with Tomcat
2321
3. Deploy welcome-servlet application into Container in **Run/Debug Configurations**:
2422

25-
**Deployment** tab ▶ (➕)Artifact ▶ `welcome-servlet:war exploded` ▶ ❗ Clear **Application Context** field
23+
**Deployment** tab ▶ (➕)Artifact ▶ `2-0-1-hello-servlet-api:war exploded` ▶ ❗ Clear **Application Context** field
2624

2725
- Eclipse
2826
- Open Eclipse Java EE (Enterprise edition ) environment. Click on Servers tab at bottom. Click on No servers are available.
File renamed without changes.

2-0-servlet-api/2-0-1-date-servlet-api/src/main/java/com/bobocode/servlet/DateServlet.java renamed to 2-0-servlet-api/2-0-1-hello-servlet-api/src/main/java/com/bobocode/servlet/DateServlet.java

File renamed without changes.

2-0-servlet-api/2-0-1-date-servlet-api/src/main/java/com/bobocode/servlet/WelcomeServlet.java renamed to 2-0-servlet-api/2-0-1-hello-servlet-api/src/main/java/com/bobocode/servlet/WelcomeServlet.java

File renamed without changes.

2-0-servlet-api/2-0-1-date-servlet-api/src/test/java/com/bobocode/DateServletTest.java renamed to 2-0-servlet-api/2-0-1-hello-servlet-api/src/test/java/com/bobocode/DateServletTest.java

File renamed without changes.

2-0-servlet-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<artifactId>2-0-servlet-api</artifactId>
1313
<packaging>pom</packaging>
1414
<modules>
15-
<module>2-0-1-date-servlet-api</module>
15+
<module>2-0-1-hello-servlet-api</module>
1616
</modules>
1717

1818

0 commit comments

Comments
 (0)