esoe 1 year ago
parent
commit
00c18ab265
  1. 3
      .vscode/settings.json
  2. 32
      ear/pom.xml
  3. 10
      ear/target/application.xml
  4. BIN
      ear/target/ear-1.0-SNAPSHOT.ear
  5. 10
      ear/target/ear-1.0-SNAPSHOT/META-INF/application.xml
  6. BIN
      ear/target/ear-1.0-SNAPSHOT/ru.molokoin-servlet-1.0-SNAPSHOT.war
  7. 134
      pom.xml
  8. 16
      servlet/pom.xml
  9. 0
      servlet/src/main/webapp/WEB-INF/web.xml
  10. 5
      servlet/src/main/webapp/index.jsp
  11. 4
      servlet/target/maven-archiver/pom.properties
  12. 0
      servlet/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  13. 0
      servlet/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  14. BIN
      servlet/target/servlet-1.0-SNAPSHOT.war
  15. 0
      servlet/target/servlet-1.0-SNAPSHOT/WEB-INF/web.xml
  16. 5
      servlet/target/servlet-1.0-SNAPSHOT/index.jsp
  17. 7
      src/main/webapp/WEB-INF/web.xml
  18. 23
      src/main/webapp/index.html
  19. 138
      src/main/webapp/layout/styles.css
  20. BIN
      target/home.war
  21. BIN
      target/home/WEB-INF/lib/commonmark-0.21.0.jar
  22. BIN
      target/home/WEB-INF/lib/jakarta.activation-2.0.1.jar
  23. BIN
      target/home/WEB-INF/lib/jakarta.ejb-api-4.0.0.jar
  24. BIN
      target/home/WEB-INF/lib/jakarta.persistence-api-3.0.0.jar
  25. BIN
      target/home/WEB-INF/lib/jakarta.servlet-api-5.0.0.jar
  26. BIN
      target/home/WEB-INF/lib/jakarta.transaction-api-2.0.0.jar
  27. BIN
      target/home/WEB-INF/lib/jakarta.xml.bind-api-3.0.1.jar
  28. 7
      target/home/WEB-INF/web.xml
  29. 23
      target/home/index.html
  30. 138
      target/home/layout/styles.css
  31. 4
      target/maven-archiver/pom.properties

3
.vscode/settings.json vendored

@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}

32
ear/pom.xml

@ -1,32 +0,0 @@ @@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.molokoin</groupId>
<artifactId>home</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>ru.molokoin</groupId>
<artifactId>ear</artifactId>
<packaging>ear</packaging>
<name>ear</name>
<build>
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>

10
ear/target/application.xml

@ -1,10 +0,0 @@ @@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd" version="7">
<display-name>ear</display-name>
<module>
<web>
<web-uri>ru.molokoin-servlet-1.0-SNAPSHOT.war</web-uri>
<context-root>/servlet</context-root>
</web>
</module>
</application>

BIN
ear/target/ear-1.0-SNAPSHOT.ear

Binary file not shown.

10
ear/target/ear-1.0-SNAPSHOT/META-INF/application.xml

@ -1,10 +0,0 @@ @@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd" version="7">
<display-name>ear</display-name>
<module>
<web>
<web-uri>ru.molokoin-servlet-1.0-SNAPSHOT.war</web-uri>
<context-root>/servlet</context-root>
</web>
</module>
</application>

BIN
ear/target/ear-1.0-SNAPSHOT/ru.molokoin-servlet-1.0-SNAPSHOT.war

Binary file not shown.

134
pom.xml

@ -6,47 +6,67 @@ @@ -6,47 +6,67 @@
<groupId>ru.molokoin</groupId>
<artifactId>home</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<version>1.0</version>
<packaging>war</packaging>
<name>home</name>
<modules>
<module>servlet</module>
<module>ear</module>
</modules>
<distributionManagement>
<site>
<id>site</id>
<name>project website</name>
<url>scp://local.company.com/websites/project.company.com/</url>
</site>
</distributionManagement>
<!-- FIXME change it to the project's website -->
<url>http://www.molokoin.ru</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>ru.molokoin</groupId>
<artifactId>servlet</artifactId>
<version>1.0-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- markdown to html -->
<dependency>
<groupId>org.commonmark</groupId>
<artifactId>commonmark</artifactId>
<version>0.21.0</version>
</dependency>
<!-- xml-edit -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>3.0.1</version>
</dependency>
<!-- bean-container -->
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>4.0.0</version>
</dependency>
<!-- jdbc-access -->
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>3.0.0</version>
</dependency>
<!-- servlet -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>home</finalName>
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
<!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_war_packaging -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
@ -59,22 +79,10 @@ @@ -59,22 +79,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.2</version>
</plugin>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<artifactId>maven-ejb-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
@ -83,47 +91,29 @@ @@ -83,47 +91,29 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration>
<!-- отключаю плагин по умолчанию -->
<skip>true</skip>
<!-- отключаю плагин по умолчанию -->
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<!-- <hostname>${wildfly-hostname}</hostname>
<port>${wildfly-port}</port>
<username>${wildfly-username}</username>
<password>${wildfly-password}</password>
<name>${wildfly-name}</name> -->
<hostname>molokoin.ru</hostname>
<port>9990</port>
<username>esoe</username>
<password>psalm6912</password>
<name>home.ear</name>
</configuration>
<version>4.1.0.Final</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
<execution>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<hostname>molokoin.ru</hostname>
<port>9990</port>
<username>esoe</username>
<password>psalm6912</password>
<name>home.war</name>
</configuration>
</plugin>
</plugins>
</pluginManagement>

16
servlet/pom.xml

@ -1,16 +0,0 @@ @@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.molokoin</groupId>
<artifactId>home</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>servlet</artifactId>
<packaging>war</packaging>
<name>servlet</name>
</project>

0
servlet/src/main/webapp/WEB-INF/web.xml

5
servlet/src/main/webapp/index.jsp

@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
<html>
<body>
<h2>Hello World!</h2>
</body>
</html>

4
servlet/target/maven-archiver/pom.properties

@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
#Created by Apache Maven 3.8.5
groupId=ru.molokoin
artifactId=servlet
version=1.0-SNAPSHOT

0
servlet/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

0
servlet/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

BIN
servlet/target/servlet-1.0-SNAPSHOT.war

Binary file not shown.

0
servlet/target/servlet-1.0-SNAPSHOT/WEB-INF/web.xml

5
servlet/target/servlet-1.0-SNAPSHOT/index.jsp

@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
<html>
<body>
<h2>Hello World!</h2>
</body>
</html>

7
src/main/webapp/WEB-INF/web.xml

@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
<display-name>molokoin.ru</display-name>
</web-app>

23
src/main/webapp/index.html

@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<!-- <meta http-equiv="refresh" content="1; url=home" /> -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>home</title>
<link href="layout/styles.css" rel="stylesheet">
</head>
<body>
<header>
<h1>molokoin.ru : домашний портал</h1>
</header>
<aside>
<a href="hello">hello</a>
</aside>
<main>
<p >some info</p>
</main>
<footer></footer>
</body>
</html>

138
src/main/webapp/layout/styles.css

@ -0,0 +1,138 @@ @@ -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%;
}

BIN
target/home.war

Binary file not shown.

BIN
target/home/WEB-INF/lib/commonmark-0.21.0.jar

Binary file not shown.

BIN
target/home/WEB-INF/lib/jakarta.activation-2.0.1.jar

Binary file not shown.

BIN
target/home/WEB-INF/lib/jakarta.ejb-api-4.0.0.jar

Binary file not shown.

BIN
target/home/WEB-INF/lib/jakarta.persistence-api-3.0.0.jar

Binary file not shown.

BIN
target/home/WEB-INF/lib/jakarta.servlet-api-5.0.0.jar

Binary file not shown.

BIN
target/home/WEB-INF/lib/jakarta.transaction-api-2.0.0.jar

Binary file not shown.

BIN
target/home/WEB-INF/lib/jakarta.xml.bind-api-3.0.1.jar

Binary file not shown.

7
target/home/WEB-INF/web.xml

@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
<display-name>molokoin.ru</display-name>
</web-app>

23
target/home/index.html

@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<!-- <meta http-equiv="refresh" content="1; url=home" /> -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>home</title>
<link href="layout/styles.css" rel="stylesheet">
</head>
<body>
<header>
<h1>molokoin.ru : домашний портал</h1>
</header>
<aside>
<a href="hello">hello</a>
</aside>
<main>
<p >some info</p>
</main>
<footer></footer>
</body>
</html>

138
target/home/layout/styles.css

@ -0,0 +1,138 @@ @@ -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%;
}

4
ear/target/maven-archiver/pom.properties → target/maven-archiver/pom.properties

@ -1,4 +1,4 @@ @@ -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
Loading…
Cancel
Save