From 18d32ad45c1e33d30bd2478257ce113abdca47dc Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@hostsharing.net>
Date: Tue, 17 May 2011 19:33:48 +0200
Subject: [PATCH] missing queues
---
hsarback/webapp/META-INF/context.xml | 35 +++++++++++++++++++++++++++++++++++
hsarback/lib/activemq-core-5.4.2.jar | 0
hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java | 4 ++--
hsarback/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar | 0
4 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/hsarback/lib/activemq-core-5.4.2.jar b/hsarback/lib/activemq-core-5.4.2.jar
new file mode 100644
index 0000000..a077a5d
--- /dev/null
+++ b/hsarback/lib/activemq-core-5.4.2.jar
Binary files differ
diff --git a/hsarback/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar b/hsarback/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar
new file mode 100644
index 0000000..0701ae0
--- /dev/null
+++ b/hsarback/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar
Binary files differ
diff --git a/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java b/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java
index 64add79..0a72095 100644
--- a/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java
@@ -63,8 +63,8 @@
userdelProc = new ShellProcessor("userdel " + uid);
}
CompoundProcessor proc = new CompoundProcessor(userdelProc);
- proc.appendProcessor(new ShellProcessor("rm -f /var/spool/cron/crontabs/" + uid));
- proc.appendProcessor(new ShellProcessor("rm -f /var/mail/" + uid));
+ proc.appendProcessor(new ShellProcessor("rm -f '/var/spool/cron/crontabs/" + uid + "'"));
+ proc.appendProcessor(new ShellProcessor("rm -f '/var/mail/" + uid + "'"));
return proc;
}
return null;
diff --git a/hsarback/webapp/META-INF/context.xml b/hsarback/webapp/META-INF/context.xml
index 804eff7..4c33059 100644
--- a/hsarback/webapp/META-INF/context.xml
+++ b/hsarback/webapp/META-INF/context.xml
@@ -16,6 +16,41 @@
type="javax.jms.Queue"/>
<ResourceLink
+ name="jms/hsadminSystem-mail1"
+ global="jms/hsadminSystem-mail1"
+ type="javax.jms.Queue"/>
+
+ <ResourceLink
+ name="jms/hsadminSystem-mail2"
+ global="jms/hsadminSystem-mail2"
+ type="javax.jms.Queue"/>
+
+ <ResourceLink
+ name="jms/hsadminSystem-mail3"
+ global="jms/hsadminSystem-mail3"
+ type="javax.jms.Queue"/>
+
+ <ResourceLink
+ name="jms/hsadminSystem-dns1"
+ global="jms/hsadminSystem-dns1"
+ type="javax.jms.Queue"/>
+
+ <ResourceLink
+ name="jms/hsadminSystem-dns2"
+ global="jms/hsadminSystem-dns2"
+ type="javax.jms.Queue"/>
+
+ <ResourceLink
+ name="jms/hsadminSystem-dns3"
+ global="jms/hsadminSystem-dns3"
+ type="javax.jms.Queue"/>
+
+ <ResourceLink
+ name="jms/hsadminSystem-backupmx"
+ global="jms/hsadminSystem-backupmx"
+ type="javax.jms.Queue"/>
+
+ <ResourceLink
name="jms/hsadminStatus"
global="jms/hsadminStatus"
type="javax.jms.Queue"/>
--
Gitblit v1.9.3