From 437069c63ddb5bdb46e24e3e9a655f29838e84f6 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 25 Feb 2019 18:22:33 +0000 Subject: [PATCH] NLPHub added logs and servlet parameters git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/nlphub@177264 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.core.resources.prefs | 6 ++ .settings/org.eclipse.wst.common.component | 2 +- distro/LICENSE | 1 + distro/README | 68 ++++++++++++++++++ distro/changelog.xml | 5 ++ distro/descriptor.xml | 32 +++++++++ distro/profile.xml | 29 ++++++++ pom.xml | 71 ++++++++++++++++-- src/test/resources/logback.xml | 83 ++++++++++++++++++++++ 9 files changed, 292 insertions(+), 5 deletions(-) create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 distro/LICENSE create mode 100644 distro/README create mode 100644 distro/changelog.xml create mode 100644 distro/descriptor.xml create mode 100644 distro/profile.xml create mode 100644 src/test/resources/logback.xml diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..29abf99 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 28f0f16..dbb4d87 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + diff --git a/distro/LICENSE b/distro/LICENSE new file mode 100644 index 0000000..2d9616a --- /dev/null +++ b/distro/LICENSE @@ -0,0 +1 @@ +${gcube.license} \ No newline at end of file diff --git a/distro/README b/distro/README new file mode 100644 index 0000000..ccf330b --- /dev/null +++ b/distro/README @@ -0,0 +1,68 @@ +The gCube System - ${name} +-------------------------------------------------- + +${description} + + +${gcube.description} + +${gcube.funding} + + +Version +-------------------------------------------------- + +${version} (${buildDate}) + +Please see the file named "changelog.xml" in this directory for the release notes. + + +Authors +-------------------------------------------------- + +* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it), + Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT + + +Maintainers +----------- + +* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it), + Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT + + +Download information +-------------------------------------------------- + +Source code is available from SVN: + ${scm.url} + +Binaries can be downloaded from the gCube website: + ${gcube.website} + + +Installation +-------------------------------------------------- + +Installation documentation is available on-line in the gCube Wiki: + https://wiki.gcube-system.org/gcube/NLPHub + + +Documentation +-------------------------------------------------- + +Documentation is available on-line in the gCube Wiki: + https://wiki.gcube-system.org/gcube/NLPHub + + +Support +-------------------------------------------------- + +Bugs and support requests can be reported in the gCube issue tracking tool: + ${gcube.issueTracking} + + +Licensing +-------------------------------------------------- + +This software is licensed under the terms you may find in the file named "LICENSE" in this directory. diff --git a/distro/changelog.xml b/distro/changelog.xml new file mode 100644 index 0000000..a701ba5 --- /dev/null +++ b/distro/changelog.xml @@ -0,0 +1,5 @@ + + + First Release + + \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml new file mode 100644 index 0000000..b468e51 --- /dev/null +++ b/distro/descriptor.xml @@ -0,0 +1,32 @@ + + servicearchive + + tar.gz + + / + + + ${distroDirectory} + / + true + + README + LICENSE + changelog.xml + profile.xml + + 755 + true + + + + + target/${build.finalName}.${project.packaging} + /${artifactId} + + + + \ No newline at end of file diff --git a/distro/profile.xml b/distro/profile.xml new file mode 100644 index 0000000..13575d1 --- /dev/null +++ b/distro/profile.xml @@ -0,0 +1,29 @@ + + + + Service + + ${project.description} + PortletsUser + ${project.name} + 1.0.0 + + + ${project.description} + ${project.name} + ${version} + + ${project.groupId} + ${project.artifactId} + ${project.version} + + webapplication + + ${project.build.finalName}.${project.packaging} + + + + + + + diff --git a/pom.xml b/pom.xml index 30e0e74..f4ba73e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,38 @@ + + + maven-parent + org.gcube.tools + 1.0.0 + + + + 4.0.0 org.gcube.data.analysis nlphub 1.0.0-SNAPSHOT war + 7.0.70 1.1 + distro + config + ${project.build.directory}/${project.build.finalName} + + + + 1.8 + 1.8 + ${env.KEYS} + + UTF-8 + UTF-8 + + @@ -95,7 +119,6 @@ org.slf4j slf4j-api - 1.7.5 provided @@ -113,16 +136,56 @@ - nlphub + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + compile + + + + + ${webappDirectory} + ${project.build.finalName} + + + + + + maven-compiler-plugin 3.5.1 - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} + + org.apache.maven.plugins + maven-assembly-plugin + + + ${distroDirectory}/descriptor.xml + + + + + servicearchive + install + + single + + + + diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml new file mode 100644 index 0000000..d3931ec --- /dev/null +++ b/src/test/resources/logback.xml @@ -0,0 +1,83 @@ + + + /home/gcube/tomcat/logs/ghn.log + true + + %date [%thread] %-5level %logger{0}: %msg%n + + + /home/gcube/tomcat/logs/ghn.%d{yyyy-MM-dd}.%i.log + 30 + 10MB + 2GB + + + + + /home/gcube/tomcat/logs/accounting.log + true + + %date [%thread] %-5level %logger{0}: %msg%n + + + /home/gcube/tomcat/logs/accounting.%d{yyyy-MM-dd}.%i.log + 30 + 10MB + 2GB + + + + + /home/gcube/tomcat/logs/access.log + true + + %date [%thread] %-5level %logger{0}: %msg%n + + + /home/gcube/tomcat/logs/access.%d{yyyy-MM-dd}.%i.log + 30 + 10MB + 2GB + + + + + /home/gcube/tomcat/logs/nlphub.log + true + + %date [%thread] %-5level %logger{0}: %msg%n + + + /home/gcube/tomcat/logs/nlphub.%d{yyyy-MM-dd}.%i.log + 30 + 10MB + 2GB + + + + + + + + + + + + + + + + + + + + + + + + + + + + +