Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add thymeleaf ref, few dependencies #28

Merged
merged 1 commit into from
Aug 26, 2020
Merged

add thymeleaf ref, few dependencies #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 26 additions & 16 deletions demo.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
<root url="file://$MODULE_DIR$/target/generated-sources/annotations" />
</sourceRoots>
</configuration>
</facet>
Expand All @@ -31,6 +32,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
Expand Down Expand Up @@ -73,28 +75,23 @@
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.3.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.4.18.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.24.0-GA" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.jboss:jandex:2.1.3.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.3" level="project" />
<orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.3.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:5.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.2.8.RELEASE" level="project" />
Expand Down Expand Up @@ -132,20 +129,14 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
<orderEntry type="library" name="Maven: org.seasar.doma.boot:doma-spring-boot-starter:1.2.1" level="project" />
<orderEntry type="library" name="Maven: org.seasar.doma.boot:doma-spring-boot-autoconfigure:1.2.1" level="project" />
<orderEntry type="library" name="Maven: org.seasar.doma.boot:doma-spring-boot-core:1.2.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:4.0.7" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:ibm-watson:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:assistant:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:common:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:compare-comply:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:discovery:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:language-translator:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:natural-language-classifier:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:natural-language-understanding:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:personality-insights:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:speech-to-text:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:text-to-speech:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:tone-analyzer:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:visual-recognition:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.cloud:sdk-core:8.1.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
Expand All @@ -165,5 +156,24 @@
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: io.reactivex.rxjava2:rxjava:2.2.19" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:common:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:compare-comply:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:discovery:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:language-translator:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:natural-language-classifier:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:natural-language-understanding:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:personality-insights:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:speech-to-text:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:text-to-speech:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:tone-analyzer:8.5.0" level="project" />
<orderEntry type="library" name="Maven: com.ibm.watson:visual-recognition:8.5.0" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:7.0.0.Alpha6" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
<orderEntry type="library" name="Maven: org.seasar.doma:doma:2.18.0" level="project" />
</component>
</module>
1 change: 0 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@
<artifactId>hibernate-commons-annotations</artifactId>
<version>5.1.0.Final</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/test_db
spring.datasource.username=postgres
spring.datasource.password=postgres

jsonStoreEnabled=true
jsonStoreEnabled=true

spring.thymeleaf.mode=HTML
2 changes: 1 addition & 1 deletion src/main/resources/templates/chat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="jp">
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>チャットページ</title>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/emologlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html lang="jp" dir="ltr">
<html xmlns:th="http://www.thymeleaf.org" lang="jp" dir="ltr">
<head>
<meta charset="utf-8">
<title>エモログリストページ</title>
<link href="css/style.css" rel="stylesheet">
<link href="../static/css/style.css" rel="stylesheet">
</head>
<body>
<!-- 戻るボタンと名前の表示-->
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="jp">
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>チャットページ</title>
Expand Down