diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..0d73912
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/ear/pom.xml b/ear/pom.xml
deleted file mode 100644
index 9cd1d48..0000000
--- a/ear/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- 4.0.0
-
-
- ru.molokoin
- home
- 1.0-SNAPSHOT
-
-
- ru.molokoin
- ear
- ear
- ear
-
-
-
-
- maven-ear-plugin
-
-
-
- true
-
-
-
-
-
-
-
diff --git a/ear/target/application.xml b/ear/target/application.xml
deleted file mode 100644
index 3595071..0000000
--- a/ear/target/application.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- ear
-
-
- ru.molokoin-servlet-1.0-SNAPSHOT.war
- /servlet
-
-
-
\ No newline at end of file
diff --git a/ear/target/ear-1.0-SNAPSHOT.ear b/ear/target/ear-1.0-SNAPSHOT.ear
deleted file mode 100644
index 6d8f065..0000000
Binary files a/ear/target/ear-1.0-SNAPSHOT.ear and /dev/null differ
diff --git a/ear/target/ear-1.0-SNAPSHOT/META-INF/application.xml b/ear/target/ear-1.0-SNAPSHOT/META-INF/application.xml
deleted file mode 100644
index 3595071..0000000
--- a/ear/target/ear-1.0-SNAPSHOT/META-INF/application.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- ear
-
-
- ru.molokoin-servlet-1.0-SNAPSHOT.war
- /servlet
-
-
-
\ No newline at end of file
diff --git a/ear/target/ear-1.0-SNAPSHOT/ru.molokoin-servlet-1.0-SNAPSHOT.war b/ear/target/ear-1.0-SNAPSHOT/ru.molokoin-servlet-1.0-SNAPSHOT.war
deleted file mode 100644
index 27f065a..0000000
Binary files a/ear/target/ear-1.0-SNAPSHOT/ru.molokoin-servlet-1.0-SNAPSHOT.war and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 66ed081..8c57cb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,47 +6,67 @@
ru.molokoin
home
- 1.0-SNAPSHOT
- pom
+ 1.0
+ war
home
-
-
- servlet
- ear
-
-
-
-
- site
- project website
- scp://local.company.com/websites/project.company.com/
-
-
+
+ http://www.molokoin.ru
UTF-8
+ 1.7
+ 1.7
-
-
-
- ru.molokoin
- servlet
- 1.0-SNAPSHOT
- war
-
-
-
+
+
+
+ org.commonmark
+ commonmark
+ 0.21.0
+
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ 3.0.1
+
+
+
+ jakarta.ejb
+ jakarta.ejb-api
+ 4.0.0
+
+
+
+ jakarta.persistence
+ jakarta.persistence-api
+ 3.0.0
+
+
+
+ jakarta.servlet
+ jakarta.servlet-api
+ 5.0.0
+
+
+ junit
+ junit
+ 4.11
+ test
+
+
+ home
maven-clean-plugin
3.1.0
-
+
maven-resources-plugin
3.0.2
@@ -59,22 +79,10 @@
maven-surefire-plugin
2.22.1
-
- maven-jar-plugin
- 3.0.2
-
maven-war-plugin
3.2.2
-
- maven-ear-plugin
- 3.0.1
-
-
- maven-ejb-plugin
- 3.0.1
-
maven-install-plugin
2.5.2
@@ -83,47 +91,29 @@
maven-deploy-plugin
2.8.2
-
- true
+
+ true
-
-
- default-deploy
- deploy
-
- deploy
-
-
-
org.wildfly.plugins
wildfly-maven-plugin
-
-
- molokoin.ru
- 9990
- esoe
- psalm6912
- home.ear
-
+ 4.1.0.Final
-
- default-deploy
- deploy
-
- deploy
-
-
+
+ deploy
+
+ deploy
+
+
-
-
- maven-javadoc-plugin
- 3.0.0
+
+ molokoin.ru
+ 9990
+ esoe
+ psalm6912
+ home.war
+
diff --git a/servlet/pom.xml b/servlet/pom.xml
deleted file mode 100644
index 360bf1c..0000000
--- a/servlet/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- 4.0.0
-
-
- ru.molokoin
- home
- 1.0-SNAPSHOT
-
-
- servlet
- war
- servlet
-
diff --git a/servlet/src/main/webapp/WEB-INF/web.xml b/servlet/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/servlet/src/main/webapp/index.jsp b/servlet/src/main/webapp/index.jsp
deleted file mode 100644
index c38169b..0000000
--- a/servlet/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-Hello World!
-
-
diff --git a/servlet/target/maven-archiver/pom.properties b/servlet/target/maven-archiver/pom.properties
deleted file mode 100644
index 2e632e5..0000000
--- a/servlet/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.8.5
-groupId=ru.molokoin
-artifactId=servlet
-version=1.0-SNAPSHOT
diff --git a/servlet/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/servlet/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index e69de29..0000000
diff --git a/servlet/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/servlet/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29..0000000
diff --git a/servlet/target/servlet-1.0-SNAPSHOT.war b/servlet/target/servlet-1.0-SNAPSHOT.war
deleted file mode 100644
index 5903836..0000000
Binary files a/servlet/target/servlet-1.0-SNAPSHOT.war and /dev/null differ
diff --git a/servlet/target/servlet-1.0-SNAPSHOT/WEB-INF/web.xml b/servlet/target/servlet-1.0-SNAPSHOT/WEB-INF/web.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/servlet/target/servlet-1.0-SNAPSHOT/index.jsp b/servlet/target/servlet-1.0-SNAPSHOT/index.jsp
deleted file mode 100644
index c38169b..0000000
--- a/servlet/target/servlet-1.0-SNAPSHOT/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-Hello World!
-
-
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..cb782db
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,7 @@
+
+
+
+ molokoin.ru
+
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
new file mode 100644
index 0000000..75e6c3d
--- /dev/null
+++ b/src/main/webapp/index.html
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+ home
+
+
+
+
+ molokoin.ru : домашний портал
+
+
+
+ some info
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/layout/styles.css b/src/main/webapp/layout/styles.css
new file mode 100644
index 0000000..4944d23
--- /dev/null
+++ b/src/main/webapp/layout/styles.css
@@ -0,0 +1,138 @@
+* {
+ font-family: "Manrope", arial, sans-serif;
+ box-sizing: content-box;
+ margin: 0;
+ padding: 0;
+}
+
+a{
+ text-decoration: none;
+ color: #465df5;
+}
+
+header{
+ /* display: block; */
+ display: flex;
+ position: fixed;
+ align-self: flex-start;
+ /* justify-content: space-between; */
+ justify-content: right;
+ width: 100%;
+ padding-left: 20%;
+ align-items: center;
+ justify-content: space-between;
+ background-color: rgba(25, 25, 25, 0.8);
+ z-index: 10;
+ height: 7rem;
+ /* max-height: 7rem; */
+}
+
+aside{
+ display: block;
+ align-items: center;
+ position: fixed;
+ color: #fff;
+ background-color: rgba(25, 25, 25, 0.8);
+ width: 20%;
+ height: 700px;
+ margin-top: 7rem;
+ /* padding: 5px; */
+}
+aside a{
+ display: block;
+ /* display: flex; */
+ /* flex-flow: column; */
+ /* height: 100%; */
+ font-size: x-large;
+ background-color: rgba(25, 25, 25, 0.8);
+ text-align: center;
+ border: 1px solid #000;
+}
+aside a:hover{
+ background-color: rgba(25, 25, 25, 0.9);
+ border: 3px solid #fff;
+}
+
+main{
+ display: inline-block;
+ /* position: absolute; */
+ /* height: 700px; */
+ width: 80%;
+ background-color: rgba(25, 25, 25, 0.2);
+ /* padding-left: 10%; */
+ margin-top: 7rem;
+ margin-left: 20%;
+}
+div{
+ /* display: block; */
+ margin: 5%;
+}
+
+footer{
+ display: inline-block;
+ /* position: relative; */
+ /* height: 700px; */
+ width: 80%;
+ background-color: rgba(100, 25, 25, 0.8);
+ /* margin-top: 7rem; */
+ margin-left: 20%;
+}
+
+textarea{
+ display: block;
+ width: 100%;
+ margin-left: auto;
+ margin-right: auto;
+}
+embed{
+ display: flex;
+ flex-flow: column;
+ height: 100%;
+ width: 100%;
+ /* height: 700px; */
+}
+
+table {
+ display: flex;
+ margin-left: 10%;
+ margin-right: 10%;
+ /* font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif; */
+ /* font-size: 14px; */
+ max-width: 100%;
+ width: 80%;
+ border-collapse: collapse;
+ text-align: left;
+}
+th {
+ color: #039;
+ padding: 10px 15px;
+}
+td {
+ color: #669;
+ border-top: 1px solid #e8edff;
+ padding: 10px 15px;
+}
+
+tr:hover td {
+ background: #e8edff;
+}
+
+label{
+ width: 80%;
+ margin-left: 10%;
+}
+select{
+ width: 80%;
+ margin-left: 10%;
+}
+input{
+ width: 80%;
+ margin-left: 10%;
+}
+button{
+ width: 80%;
+ background-color: rgb(36, 2, 69);
+ color: #fff;
+ border-radius: 0%;
+ margin-left: 10%;
+}
diff --git a/target/home.war b/target/home.war
new file mode 100644
index 0000000..8a82307
Binary files /dev/null and b/target/home.war differ
diff --git a/target/home/WEB-INF/lib/commonmark-0.21.0.jar b/target/home/WEB-INF/lib/commonmark-0.21.0.jar
new file mode 100644
index 0000000..41cf652
Binary files /dev/null and b/target/home/WEB-INF/lib/commonmark-0.21.0.jar differ
diff --git a/target/home/WEB-INF/lib/jakarta.activation-2.0.1.jar b/target/home/WEB-INF/lib/jakarta.activation-2.0.1.jar
new file mode 100644
index 0000000..521c7c4
Binary files /dev/null and b/target/home/WEB-INF/lib/jakarta.activation-2.0.1.jar differ
diff --git a/target/home/WEB-INF/lib/jakarta.ejb-api-4.0.0.jar b/target/home/WEB-INF/lib/jakarta.ejb-api-4.0.0.jar
new file mode 100644
index 0000000..0ba8454
Binary files /dev/null and b/target/home/WEB-INF/lib/jakarta.ejb-api-4.0.0.jar differ
diff --git a/target/home/WEB-INF/lib/jakarta.persistence-api-3.0.0.jar b/target/home/WEB-INF/lib/jakarta.persistence-api-3.0.0.jar
new file mode 100644
index 0000000..2d4e532
Binary files /dev/null and b/target/home/WEB-INF/lib/jakarta.persistence-api-3.0.0.jar differ
diff --git a/target/home/WEB-INF/lib/jakarta.servlet-api-5.0.0.jar b/target/home/WEB-INF/lib/jakarta.servlet-api-5.0.0.jar
new file mode 100644
index 0000000..88b788a
Binary files /dev/null and b/target/home/WEB-INF/lib/jakarta.servlet-api-5.0.0.jar differ
diff --git a/target/home/WEB-INF/lib/jakarta.transaction-api-2.0.0.jar b/target/home/WEB-INF/lib/jakarta.transaction-api-2.0.0.jar
new file mode 100644
index 0000000..bbd70c3
Binary files /dev/null and b/target/home/WEB-INF/lib/jakarta.transaction-api-2.0.0.jar differ
diff --git a/target/home/WEB-INF/lib/jakarta.xml.bind-api-3.0.1.jar b/target/home/WEB-INF/lib/jakarta.xml.bind-api-3.0.1.jar
new file mode 100644
index 0000000..f890cba
Binary files /dev/null and b/target/home/WEB-INF/lib/jakarta.xml.bind-api-3.0.1.jar differ
diff --git a/target/home/WEB-INF/web.xml b/target/home/WEB-INF/web.xml
new file mode 100644
index 0000000..cb782db
--- /dev/null
+++ b/target/home/WEB-INF/web.xml
@@ -0,0 +1,7 @@
+
+
+
+ molokoin.ru
+
diff --git a/target/home/index.html b/target/home/index.html
new file mode 100644
index 0000000..75e6c3d
--- /dev/null
+++ b/target/home/index.html
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+ home
+
+
+
+
+ molokoin.ru : домашний портал
+
+
+
+ some info
+
+
+
+
\ No newline at end of file
diff --git a/target/home/layout/styles.css b/target/home/layout/styles.css
new file mode 100644
index 0000000..4944d23
--- /dev/null
+++ b/target/home/layout/styles.css
@@ -0,0 +1,138 @@
+* {
+ font-family: "Manrope", arial, sans-serif;
+ box-sizing: content-box;
+ margin: 0;
+ padding: 0;
+}
+
+a{
+ text-decoration: none;
+ color: #465df5;
+}
+
+header{
+ /* display: block; */
+ display: flex;
+ position: fixed;
+ align-self: flex-start;
+ /* justify-content: space-between; */
+ justify-content: right;
+ width: 100%;
+ padding-left: 20%;
+ align-items: center;
+ justify-content: space-between;
+ background-color: rgba(25, 25, 25, 0.8);
+ z-index: 10;
+ height: 7rem;
+ /* max-height: 7rem; */
+}
+
+aside{
+ display: block;
+ align-items: center;
+ position: fixed;
+ color: #fff;
+ background-color: rgba(25, 25, 25, 0.8);
+ width: 20%;
+ height: 700px;
+ margin-top: 7rem;
+ /* padding: 5px; */
+}
+aside a{
+ display: block;
+ /* display: flex; */
+ /* flex-flow: column; */
+ /* height: 100%; */
+ font-size: x-large;
+ background-color: rgba(25, 25, 25, 0.8);
+ text-align: center;
+ border: 1px solid #000;
+}
+aside a:hover{
+ background-color: rgba(25, 25, 25, 0.9);
+ border: 3px solid #fff;
+}
+
+main{
+ display: inline-block;
+ /* position: absolute; */
+ /* height: 700px; */
+ width: 80%;
+ background-color: rgba(25, 25, 25, 0.2);
+ /* padding-left: 10%; */
+ margin-top: 7rem;
+ margin-left: 20%;
+}
+div{
+ /* display: block; */
+ margin: 5%;
+}
+
+footer{
+ display: inline-block;
+ /* position: relative; */
+ /* height: 700px; */
+ width: 80%;
+ background-color: rgba(100, 25, 25, 0.8);
+ /* margin-top: 7rem; */
+ margin-left: 20%;
+}
+
+textarea{
+ display: block;
+ width: 100%;
+ margin-left: auto;
+ margin-right: auto;
+}
+embed{
+ display: flex;
+ flex-flow: column;
+ height: 100%;
+ width: 100%;
+ /* height: 700px; */
+}
+
+table {
+ display: flex;
+ margin-left: 10%;
+ margin-right: 10%;
+ /* font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif; */
+ /* font-size: 14px; */
+ max-width: 100%;
+ width: 80%;
+ border-collapse: collapse;
+ text-align: left;
+}
+th {
+ color: #039;
+ padding: 10px 15px;
+}
+td {
+ color: #669;
+ border-top: 1px solid #e8edff;
+ padding: 10px 15px;
+}
+
+tr:hover td {
+ background: #e8edff;
+}
+
+label{
+ width: 80%;
+ margin-left: 10%;
+}
+select{
+ width: 80%;
+ margin-left: 10%;
+}
+input{
+ width: 80%;
+ margin-left: 10%;
+}
+button{
+ width: 80%;
+ background-color: rgb(36, 2, 69);
+ color: #fff;
+ border-radius: 0%;
+ margin-left: 10%;
+}
diff --git a/ear/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
similarity index 56%
rename from ear/target/maven-archiver/pom.properties
rename to target/maven-archiver/pom.properties
index 237f74a..8576f49 100644
--- a/ear/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,4 +1,4 @@
#Created by Apache Maven 3.8.5
+artifactId=home
groupId=ru.molokoin
-artifactId=ear
-version=1.0-SNAPSHOT
+version=1.0