Compare commits
No commits in common. "432904eef17df74afda85818c369f671485332cb" and "52b5d74561cf7ee6d9238837270a0708df6cb3cd" have entirely different histories.
432904eef1
...
52b5d74561
@ -5,7 +5,7 @@
|
||||
<groupId>de.hsadmin</groupId>
|
||||
<artifactId>hsar</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<version>4.0.12</version>
|
||||
<version>4.0.10</version>
|
||||
<name>HSAdmin Stable Backend Webapp</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
<properties>
|
||||
@ -36,12 +36,12 @@
|
||||
<dependency>
|
||||
<groupId>de.hsadmin.core</groupId>
|
||||
<artifactId>hsadmin-util</artifactId>
|
||||
<version>4.0.12</version>
|
||||
<version>4.0.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>de.hsadmin.core</groupId>
|
||||
<artifactId>hsadmin-qserv</artifactId>
|
||||
<version>4.0.12</version>
|
||||
<version>4.0.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-httpclient</groupId>
|
||||
|
@ -3,8 +3,8 @@
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.hsadmin</groupId>
|
||||
<artifactId>hsadmin-qserv</artifactId>
|
||||
<version>4.0.12</version>
|
||||
<artifactId>hsadmin-deploy</artifactId>
|
||||
<version>4.0.10</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>HSAdmin-QServ</name>
|
||||
@ -20,7 +20,7 @@
|
||||
<dependency>
|
||||
<groupId>de.hsadmin.core</groupId>
|
||||
<artifactId>hsadmin-qserv</artifactId>
|
||||
<version>4.0.12</version>
|
||||
<version>4.0.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.activemq</groupId>
|
||||
@ -71,7 +71,8 @@
|
||||
<verbose>true</verbose>
|
||||
<dataSet>
|
||||
<data>
|
||||
<src>${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</src>
|
||||
<src>
|
||||
${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</src>
|
||||
<dst>hsadmin-qserv-full.jar</dst>
|
||||
<type>file</type>
|
||||
<mapper>
|
||||
@ -79,6 +80,15 @@
|
||||
<prefix>/usr/local/lib/hostsharing/hsadmin</prefix>
|
||||
</mapper>
|
||||
</data>
|
||||
<data>
|
||||
<src>src/deb/etc/logging.properties</src>
|
||||
<type>file</type>
|
||||
<mapper>
|
||||
<type>perm</type>
|
||||
<prefix>/etc/hsadmin/qserv</prefix>
|
||||
<filemode>640</filemode>
|
||||
</mapper>
|
||||
</data>
|
||||
<data>
|
||||
<src>src/deb/systemd/hsadmin-qserv.service</src>
|
||||
<type>file</type>
|
||||
|
3
qserv-deploy/src/deb/etc/jndi.properties
Normal file
3
qserv-deploy/src/deb/etc/jndi.properties
Normal file
@ -0,0 +1,3 @@
|
||||
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
|
||||
java.naming.provider.url=ssl://hsh02.hostsharing.net:61617
|
||||
connectionFactoryNames=QueueCF
|
33
qserv-deploy/src/deb/etc/logging.properties
Normal file
33
qserv-deploy/src/deb/etc/logging.properties
Normal file
@ -0,0 +1,33 @@
|
||||
# Der ConsoleHandler gibt die Nachrichten auf std.err aus
|
||||
.handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler
|
||||
|
||||
# Festlegen des Standard Loglevels
|
||||
.level=INFO
|
||||
|
||||
|
||||
############################################################
|
||||
# Handler specific properties.
|
||||
# Describes specific configuration info for Handlers.
|
||||
############################################################
|
||||
|
||||
# Die Nachrichten in eine Datei im Log-Verzeichnis schreiben
|
||||
java.util.logging.FileHandler.pattern=/var/log/hostsharing/hsadmin/hsar-qserv.log
|
||||
java.util.logging.FileHandler.limit=500000
|
||||
java.util.logging.FileHandler.count=5
|
||||
java.util.logging.FileHandler.level=ALL
|
||||
java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
|
||||
|
||||
# Zusätzlich zu den normalen Logleveln kann für jeden Handler noch ein eigener Filter
|
||||
# vergeben werden. Das ist nützlich wenn beispielsweise alle Nachrichten auf der Konsole ausgeben werden sollen
|
||||
# aber nur ab INFO in das Logfile geschrieben werden soll.
|
||||
java.util.logging.ConsoleHandler.level=INFO
|
||||
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
|
||||
|
||||
|
||||
############################################################
|
||||
# Extraeinstellungen für einzelne Logger
|
||||
############################################################
|
||||
|
||||
# Für einzelne Logger kann ein eigenes Loglevel festgelegt werden.
|
||||
de.hsadmin.core.qserv.level = FINEST
|
||||
|
8
qserv-deploy/src/deb/etc/qserv.properties
Normal file
8
qserv-deploy/src/deb/etc/qserv.properties
Normal file
@ -0,0 +1,8 @@
|
||||
hsadmin.jms.factory=QueueCF
|
||||
hsadmin.jms.status-queue=hsadminStatus
|
||||
hsadmin.jms.system-queue=hsadminSystem-h98
|
||||
hsadmin.jms.username=user-h98
|
||||
hsadmin.jms.password=acmq
|
||||
hsadmin.log.config=/etc/hsadmin/qserv/logging.properties
|
||||
hsadmin.log.email=service@hostsharing.net
|
||||
hsadmin.log.from=qserv@h98.hostsharing.net
|
@ -4,7 +4,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.hsadmin.core</groupId>
|
||||
<artifactId>hsadmin-qserv</artifactId>
|
||||
<version>4.0.12</version>
|
||||
<version>4.0.10</version>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<java.version>11</java.version>
|
||||
@ -13,7 +13,7 @@
|
||||
<dependency>
|
||||
<groupId>de.hsadmin.core</groupId>
|
||||
<artifactId>hsadmin-util</artifactId>
|
||||
<version>4.0.12</version>
|
||||
<version>4.0.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
|
@ -108,12 +108,8 @@ public class Transaction {
|
||||
}
|
||||
|
||||
public void commitTransaction() {
|
||||
try {
|
||||
entityManager.getTransaction().commit();
|
||||
} catch (Exception e) {
|
||||
throw new TechnicalException(e);
|
||||
}
|
||||
sendAll();
|
||||
entityManager.getTransaction().commit();
|
||||
transactionActive = false;
|
||||
}
|
||||
|
||||
@ -123,7 +119,7 @@ public class Transaction {
|
||||
try {
|
||||
entityManager.getTransaction().rollback();
|
||||
} catch (IllegalStateException e) {
|
||||
throw new TechnicalException(e);
|
||||
// can't rollback
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@ import javax.naming.InitialContext;
|
||||
|
||||
public class QueueServer extends QueueCommons implements MessageListener, ExceptionListener {
|
||||
|
||||
private static final String VERSION_NO = "4.0.11";
|
||||
private static final String VERSION_NO = "4.0.9";
|
||||
|
||||
private Logger logger;
|
||||
private QueueConnection conn;
|
||||
|
@ -4,7 +4,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.hsadmin.core</groupId>
|
||||
<artifactId>hsadmin-util</artifactId>
|
||||
<version>4.0.12</version>
|
||||
<version>4.0.10</version>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<java.version>11</java.version>
|
||||
|
Loading…
Reference in New Issue
Block a user