From 37f49f7419bb662f1a24ae7ffd3b72e3f84a4561 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Sun, 15 Oct 2017 21:03:39 +0200 Subject: [PATCH] removed pnews module --- pnews/.gitignore | 3 - pnews/pom.xml | 105 -------------------------------- pnews/run.sh | 21 ------- pnews/src/main/java/pnews/Article.java | 23 ------- pnews/src/main/java/pnews/Category.java | 22 ------- pnews/src/main/java/pnews/HTML.java | 100 ------------------------------ pnews/src/main/resources/style.css | 69 --------------------- pnews/src/main/scripts/pnews.sh | 7 --- war/pom.xml | 5 -- war/src/main/java/pnews/Article.java | 23 +++++++ war/src/main/java/pnews/Category.java | 22 +++++++ war/src/main/java/pnews/HTML.java | 100 ++++++++++++++++++++++++++++++ war/src/main/resources/style.css | 69 +++++++++++++++++++++ 13 files changed, 214 insertions(+), 355 deletions(-) delete mode 100644 pnews/.gitignore delete mode 100644 pnews/pom.xml delete mode 100755 pnews/run.sh delete mode 100644 pnews/src/main/java/pnews/Article.java delete mode 100644 pnews/src/main/java/pnews/Category.java delete mode 100644 pnews/src/main/java/pnews/HTML.java delete mode 100644 pnews/src/main/resources/style.css delete mode 100755 pnews/src/main/scripts/pnews.sh create mode 100644 war/src/main/java/pnews/Article.java create mode 100644 war/src/main/java/pnews/Category.java create mode 100644 war/src/main/java/pnews/HTML.java create mode 100644 war/src/main/resources/style.css diff --git a/pnews/.gitignore b/pnews/.gitignore deleted file mode 100644 index 2061c9e..0000000 --- a/pnews/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target -.classpath -.project diff --git a/pnews/pom.xml b/pnews/pom.xml deleted file mode 100644 index 89277c0..0000000 --- a/pnews/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - 4.0.0 - pnews - pnews-core - 1.0 - jar - pnews-core - - - UTF-8 - 1.7 - 1.7 - - - - - com.rometools - rome - 1.8.0 - - - org.jsoup - jsoup - 1.10.3 - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory} - false - - - - - - maven-resources-plugin - 3.0.1 - - - copy-resources - process-resources - - copy-resources - - - ${basedir}/target/ - - - src/main/scripts - true - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - true - pnews.Main - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.6 - - - fix-shell-permissions - process-resources - - - - - - - run - - - - - - - diff --git a/pnews/run.sh b/pnews/run.sh deleted file mode 100755 index ede7e9b..0000000 --- a/pnews/run.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -e - -DEST_DIR=`realpath $1` -TMP_DIR="/tmp/$$.tmp" - -mkdir -p "$TMP_DIR" - -cd $TMP_DIR -git clone https://git.wpitchoune.net/pnews.git - -cd pnews - -mvn clean install - -target/pnews.sh - -cp -p *html style.css $DEST_DIR - -rm -rf "$TMP_DIR" diff --git a/pnews/src/main/java/pnews/Article.java b/pnews/src/main/java/pnews/Article.java deleted file mode 100644 index 0b54205..0000000 --- a/pnews/src/main/java/pnews/Article.java +++ /dev/null @@ -1,23 +0,0 @@ -package pnews; - -import java.util.Date; - -public class Article { - public final String title; - public final String description; - public final String thumbnail; - public final String link; - public final Category category; - public final Date publicationDate; - public final String website; - - public Article(String link, Category category, String title, String description, String thumbnail, Date publicationDate, String website) { - this.link = link; - this.title = title; - this.description = description; - this.thumbnail = thumbnail; - this.category = category; - this.publicationDate = publicationDate; - this.website = website; - } -} diff --git a/pnews/src/main/java/pnews/Category.java b/pnews/src/main/java/pnews/Category.java deleted file mode 100644 index 7a8106f..0000000 --- a/pnews/src/main/java/pnews/Category.java +++ /dev/null @@ -1,22 +0,0 @@ -package pnews; - -public enum Category { - TOP("top"), - FRANCE("france"), - SPORT("sport"), - EUROPE("europe"), - ECO("eco"), - ESSONNE("essonne"), - TECHNOLOGIE("technologie"), - PEOPLE("people"); - - private final String id; - - private Category(String id) { - this.id = id; - } - - public String getId() { - return id; - } -} diff --git a/pnews/src/main/java/pnews/HTML.java b/pnews/src/main/java/pnews/HTML.java deleted file mode 100644 index 74df5e7..0000000 --- a/pnews/src/main/java/pnews/HTML.java +++ /dev/null @@ -1,100 +0,0 @@ -package pnews; - -import java.util.List; - -public class HTML { - private static void appendA(StringBuffer buf, String child, String href, String cl) { - buf.append("'); - buf.append(child); - buf.append(""); - } - - private static void appendDiv(StringBuffer buf, String child) { - buf.append("
"); - buf.append(child); - buf.append("
\n"); - } - - private static void appendP(StringBuffer buf, String child) { - buf.append("

"); - buf.append(child); - buf.append("

\n"); - } - - private static void append(StringBuffer buf, Article a) { - buf.append("
\n"); - - buf.append("

"); - if (a.thumbnail != null) { - buf.append("\n"); - } - appendA(buf, a.title, "redirect?url="+a.link, null); - buf.append("

\n"); - - buf.append("
" + a.website + " - " + a.publicationDate + "
"); - - if (a.description != null) { - buf.append("

"); - buf.append(a.description); - buf.append("

"); - } - - buf.append("
\n"); - } - - private static void appendMenu(StringBuffer buf, Category catActive) { - String cl; - - buf.append("\n"); - } - - public static String toHTML(List
articles, Category catActive) { - StringBuffer buf; - - buf = new StringBuffer(); - buf.append("\n"); - buf.append("\n"); - buf.append("\n"); - buf.append("\n"); - buf.append("\n"); - buf.append("PNews\n"); - buf.append("\n"); - buf.append("\n"); - - appendMenu(buf, catActive); - - for (Article e: articles) - append(buf, e); - - buf.append("\n"); - buf.append("\n"); - - return buf.toString(); - } -} diff --git a/pnews/src/main/resources/style.css b/pnews/src/main/resources/style.css deleted file mode 100644 index 85a880d..0000000 --- a/pnews/src/main/resources/style.css +++ /dev/null @@ -1,69 +0,0 @@ -a { - text-decoration: none; - color: black; -} - -body { - margin: 0 0 0 0; - padding: 1em 1em 1em 1em; - background-color: #eee; - font-family: sans-serif; -} - -nav { - font-size: 125%; - margin: 0 0 0 0; - padding: 0 0 0 0; -} - -a.active { - text-decoration: none; - border-bottom: 4px solid black; -} - -div { - margin: 0em 0em 0em 0em; - padding: 0 0 0 0; -} - -div.article { - margin-bottom: 1em; -} - -.article-info { - font-size: 80%; - color: #bbb; -} - -img { - margin: 0em 1em 1em 0em; - padding: 0 0 0 0; - width: 8em; -} - -p { - margin: 1em 1em 1em 1em; - padding: 0 0 0 0; -} - -.left { - float: left; -} - -h2 { - clear: left; - margin: 0 0 0 0; - padding: 0 0 0 0; -} - -nav ul { - list-style-type: none; - padding: 0 0 0 0; -} - -nav ul li { - display: inline; - margin: 0em 1em 0 0; - padding: 0 0 0 0; - text-transform: uppercase; -} diff --git a/pnews/src/main/scripts/pnews.sh b/pnews/src/main/scripts/pnews.sh deleted file mode 100755 index fbad98b..0000000 --- a/pnews/src/main/scripts/pnews.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -e - -SDIR=`dirname $0` - -java -classpath rome-1.8.0.jar -jar $SDIR/pnews-1.0.jar diff --git a/war/pom.xml b/war/pom.xml index 379bbc3..3b1f825 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -20,11 +20,6 @@ provided - pnews - pnews-core - 1.0 - - com.rometools rome 1.8.0 diff --git a/war/src/main/java/pnews/Article.java b/war/src/main/java/pnews/Article.java new file mode 100644 index 0000000..0b54205 --- /dev/null +++ b/war/src/main/java/pnews/Article.java @@ -0,0 +1,23 @@ +package pnews; + +import java.util.Date; + +public class Article { + public final String title; + public final String description; + public final String thumbnail; + public final String link; + public final Category category; + public final Date publicationDate; + public final String website; + + public Article(String link, Category category, String title, String description, String thumbnail, Date publicationDate, String website) { + this.link = link; + this.title = title; + this.description = description; + this.thumbnail = thumbnail; + this.category = category; + this.publicationDate = publicationDate; + this.website = website; + } +} diff --git a/war/src/main/java/pnews/Category.java b/war/src/main/java/pnews/Category.java new file mode 100644 index 0000000..7a8106f --- /dev/null +++ b/war/src/main/java/pnews/Category.java @@ -0,0 +1,22 @@ +package pnews; + +public enum Category { + TOP("top"), + FRANCE("france"), + SPORT("sport"), + EUROPE("europe"), + ECO("eco"), + ESSONNE("essonne"), + TECHNOLOGIE("technologie"), + PEOPLE("people"); + + private final String id; + + private Category(String id) { + this.id = id; + } + + public String getId() { + return id; + } +} diff --git a/war/src/main/java/pnews/HTML.java b/war/src/main/java/pnews/HTML.java new file mode 100644 index 0000000..74df5e7 --- /dev/null +++ b/war/src/main/java/pnews/HTML.java @@ -0,0 +1,100 @@ +package pnews; + +import java.util.List; + +public class HTML { + private static void appendA(StringBuffer buf, String child, String href, String cl) { + buf.append("'); + buf.append(child); + buf.append(""); + } + + private static void appendDiv(StringBuffer buf, String child) { + buf.append("
"); + buf.append(child); + buf.append("
\n"); + } + + private static void appendP(StringBuffer buf, String child) { + buf.append("

"); + buf.append(child); + buf.append("

\n"); + } + + private static void append(StringBuffer buf, Article a) { + buf.append("
\n"); + + buf.append("

"); + if (a.thumbnail != null) { + buf.append("\n"); + } + appendA(buf, a.title, "redirect?url="+a.link, null); + buf.append("

\n"); + + buf.append("
" + a.website + " - " + a.publicationDate + "
"); + + if (a.description != null) { + buf.append("

"); + buf.append(a.description); + buf.append("

"); + } + + buf.append("
\n"); + } + + private static void appendMenu(StringBuffer buf, Category catActive) { + String cl; + + buf.append("\n"); + } + + public static String toHTML(List
articles, Category catActive) { + StringBuffer buf; + + buf = new StringBuffer(); + buf.append("\n"); + buf.append("\n"); + buf.append("\n"); + buf.append("\n"); + buf.append("\n"); + buf.append("PNews\n"); + buf.append("\n"); + buf.append("\n"); + + appendMenu(buf, catActive); + + for (Article e: articles) + append(buf, e); + + buf.append("\n"); + buf.append("\n"); + + return buf.toString(); + } +} diff --git a/war/src/main/resources/style.css b/war/src/main/resources/style.css new file mode 100644 index 0000000..85a880d --- /dev/null +++ b/war/src/main/resources/style.css @@ -0,0 +1,69 @@ +a { + text-decoration: none; + color: black; +} + +body { + margin: 0 0 0 0; + padding: 1em 1em 1em 1em; + background-color: #eee; + font-family: sans-serif; +} + +nav { + font-size: 125%; + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +a.active { + text-decoration: none; + border-bottom: 4px solid black; +} + +div { + margin: 0em 0em 0em 0em; + padding: 0 0 0 0; +} + +div.article { + margin-bottom: 1em; +} + +.article-info { + font-size: 80%; + color: #bbb; +} + +img { + margin: 0em 1em 1em 0em; + padding: 0 0 0 0; + width: 8em; +} + +p { + margin: 1em 1em 1em 1em; + padding: 0 0 0 0; +} + +.left { + float: left; +} + +h2 { + clear: left; + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +nav ul { + list-style-type: none; + padding: 0 0 0 0; +} + +nav ul li { + display: inline; + margin: 0em 1em 0 0; + padding: 0 0 0 0; + text-transform: uppercase; +} -- 2.7.4