HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2020-05-12 a197b4b8af788d3d3251ee97ba17ec1a300d0e62
refactorings, extract core.util package
36 files modified
1 files added
1 files renamed
7 files deleted
422 ■■■■ changed files
hsarback/.classpath 8 ●●●● patch | view | raw | blame | history
hsarback/lib/hsadmin-util-4.0.1-SNAPSHOT.jar patch | view | raw | blame | history
hsarback/lib/jpwgen-1.2.0.jar patch | view | raw | blame | history
hsarback/src/de/hsadmin/autoconfig/AutoconfigAutodiscoverServlet.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/AbstractEntity.java 1 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/AbstractModuleImpl.java 6 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/AuthenticationException.java 2 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/AuthorisationException.java 1 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/EntitySessionHelper.java 5 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/GenericModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/HSAdminException.java 19 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/LoginUser.java 25 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/ModuleInterface.java 2 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/PrivilegesModuleImpl.java 1 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/ReflectionUtil.java 10 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/SecureDefaultModuleImpl.java 1 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/qserv/EntityProcessorFactory.java 7 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/qserv/ProcessorException.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/qserv/SmtpHelper.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/util/Config.java 58 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/util/IPv6Trick.java 87 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/util/PasswordTool.java 25 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/util/TextUtil.java 87 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/db/MySqlDatabaseModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/db/MySqlUserModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/db/PgSqlUserModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/email/EMailAddress.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/email/EMailAddressModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/email/EMailAliasModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/pac/INetAddress.java 4 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java 4 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java 17 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/qstat/QTaskModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/user/UnixUserModuleImpl.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java 6 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/remote/AbstractRemote.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/remote/GenericAbstractRemote.java 4 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/remote/IRemote.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/remote/ModulePropertiesRemote.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/remote/PacRemote.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/remote/PropertyRemote.java 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/remote/RoleRemote.java 2 ●●● patch | view | raw | blame | history
hsarback/.classpath
@@ -2,7 +2,11 @@
<classpath>
    <classpathentry kind="src" path="src"/>
    <classpathentry kind="src" path="test"/>
    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
        <attributes>
            <attribute name="module" value="true"/>
        </attributes>
    </classpathentry>
    <classpathentry kind="lib" path="lib/activemq-core-5.4.2.jar"/>
    <classpathentry kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
    <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
@@ -17,7 +21,6 @@
    <classpathentry kind="lib" path="lib/geronimo-jpa_2.0_spec-1.1.jar"/>
    <classpathentry kind="lib" path="lib/geronimo-jta_1.1_spec-1.1.1.jar"/>
    <classpathentry kind="lib" path="lib/geronimo-validation_1.0_spec-1.1.jar"/>
    <classpathentry kind="lib" path="lib/jpwgen-1.2.0.jar"/>
    <classpathentry kind="lib" path="lib/mail.jar"/>
    <classpathentry kind="lib" path="lib/openjpa-2.1.1.jar"/>
    <classpathentry kind="lib" path="lib/org.apache.bval.bundle-0.2-incubating.jar"/>
@@ -31,5 +34,6 @@
    <classpathentry kind="lib" path="lib/velocity-1.7.jar"/>
    <classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
    <classpathentry kind="lib" path="lib/commons-logging-api-1.1.1.jar"/>
    <classpathentry kind="lib" path="lib/hsadmin-util-4.0.1-SNAPSHOT.jar"/>
    <classpathentry kind="output" path="bin"/>
</classpath>
hsarback/lib/hsadmin-util-4.0.1-SNAPSHOT.jar
Binary files differ
hsarback/lib/jpwgen-1.2.0.jar
Binary files differ
hsarback/src/de/hsadmin/autoconfig/AutoconfigAutodiscoverServlet.java
@@ -25,8 +25,8 @@
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.mods.email.EMailAddress;
import de.hsadmin.mods.user.UnixUser;
hsarback/src/de/hsadmin/core/model/AbstractEntity.java
@@ -2,6 +2,7 @@
import javax.persistence.EntityManager;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.mods.user.UnixUser;
public abstract class AbstractEntity {
hsarback/src/de/hsadmin/core/model/AbstractModuleImpl.java
@@ -1,5 +1,6 @@
package de.hsadmin.core.model;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
@@ -13,6 +14,7 @@
import de.hsadmin.core.qserv.NullProcessor;
import de.hsadmin.core.qserv.Processor;
import de.hsadmin.core.qserv.QueueTask;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.mods.user.UnixUser;
/**
@@ -174,7 +176,7 @@
        try {
            procFactClass = Class.forName(procFactName);
            if (procFactClass != null) {
                procFact = (EntityProcessorFactory) procFactClass.newInstance();
                procFact = (EntityProcessorFactory) procFactClass.getDeclaredConstructor().newInstance();
            }
        } catch (ClassNotFoundException e) {
            // no processor defined
@@ -182,6 +184,8 @@
            throw new HSAdminException(e);
        } catch (IllegalAccessException e) {
            throw new HSAdminException(e);
        } catch (IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
            // no processor defined
        }
        return procFact;
    }
hsarback/src/de/hsadmin/core/model/AuthenticationException.java
@@ -1,5 +1,7 @@
package de.hsadmin.core.model;
import de.hsadmin.core.util.HSAdminException;
public class AuthenticationException extends HSAdminException {
    private static final long serialVersionUID = 6242824365822822456L;
hsarback/src/de/hsadmin/core/model/AuthorisationException.java
@@ -1,5 +1,6 @@
package de.hsadmin.core.model;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.mods.user.UnixUser;
public class AuthorisationException extends HSAdminException {
hsarback/src/de/hsadmin/core/model/EntitySessionHelper.java
@@ -1,6 +1,5 @@
package de.hsadmin.core.model;
public class EntitySessionHelper {
    /**
@@ -24,9 +23,9 @@
    }
    private static AbstractModuleImpl instantiateModuleImpl(Transaction tx, Class<?> wrapperClass) 
            throws InstantiationException, IllegalAccessException {
            throws ReflectiveOperationException {
        AbstractModuleImpl impl;
        impl = (AbstractModuleImpl) wrapperClass.newInstance();
        impl = (AbstractModuleImpl) wrapperClass.getDeclaredConstructor().newInstance();
        impl.construct(tx);
        return impl;
    }
hsarback/src/de/hsadmin/core/model/GenericModuleImpl.java
@@ -4,7 +4,7 @@
import java.util.List;
import java.util.regex.Pattern;
import de.hsadmin.core.util.ReflectionUtil;
import de.hsadmin.core.util.HSAdminException;
public class GenericModuleImpl implements ModuleInterface {
hsarback/src/de/hsadmin/core/model/HSAdminException.java
File was deleted
hsarback/src/de/hsadmin/core/model/LoginUser.java
File was deleted
hsarback/src/de/hsadmin/core/model/ModuleInterface.java
@@ -2,6 +2,8 @@
import java.util.List;
import de.hsadmin.core.util.HSAdminException;
/**
 * Represents a CRUD (Create, Retrieve, Update, Delete) interface for generic
 * entity instances.
hsarback/src/de/hsadmin/core/model/PrivilegesModuleImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.mods.user.UnixUser;
public class PrivilegesModuleImpl extends AbstractModuleImpl implements PrivilegesInterface {
hsarback/src/de/hsadmin/core/model/ReflectionUtil.java
File was renamed from hsarback/src/de/hsadmin/core/util/ReflectionUtil.java
@@ -1,4 +1,4 @@
package de.hsadmin.core.util;
package de.hsadmin.core.model;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -8,9 +8,7 @@
import java.util.Set;
import java.util.TreeSet;
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AnnFieldIO;
import de.hsadmin.core.model.TechnicalException;
import de.hsadmin.core.util.TextUtil;
public class ReflectionUtil {
@@ -81,7 +79,7 @@
                if (valueObject != null && valueObject instanceof Object[]) {
                    for (Object item : ((Object[]) valueObject)) {
                        if (item instanceof String && referTo.getDeclaredField("name") != null) {
                            Object instance = referTo.newInstance();
                            Object instance = referTo.getDeclaredConstructor().newInstance();
                            if (instance instanceof AbstractEntity) {
                                invokeSetter((AbstractEntity) instance, referTo, referTo.getDeclaredField("name"), item);
                                newSet.add(instance);
@@ -90,7 +88,7 @@
                    }
                }
            } else {
                Object newInstance = type.newInstance();
                Object newInstance = type.getDeclaredConstructor().newInstance();
                clasz.getMethod(setterName(f), type).invoke(entity, newInstance);
                type.getMethod("setName", String.class).invoke(newInstance, valueObject);
            }
hsarback/src/de/hsadmin/core/model/SecureDefaultModuleImpl.java
@@ -5,6 +5,7 @@
import javax.persistence.EntityManager;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.mods.user.UnixUser;
/**
hsarback/src/de/hsadmin/core/qserv/EntityProcessorFactory.java
@@ -3,16 +3,17 @@
import javax.persistence.EntityManager;
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.util.HSAdminException;
public interface EntityProcessorFactory 
{
    public <T extends AbstractEntity> Processor 
        createCreateProcessor(EntityManager em, T entity) throws ProcessorException;
        createCreateProcessor(EntityManager em, T entity) throws HSAdminException;
    public <T extends AbstractEntity> Processor 
        createUpdateProcessor(EntityManager em, T newEntity) throws ProcessorException;
        createUpdateProcessor(EntityManager em, T newEntity) throws HSAdminException;
    public <T extends AbstractEntity> Processor 
        createDeleteProcessor(EntityManager em, T entity) throws ProcessorException;
        createDeleteProcessor(EntityManager em, T entity) throws HSAdminException;
}
hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java
@@ -60,7 +60,7 @@
                System.out.println("SQL: " + sqlStatement);
                s.execute(sqlStatement);
            }
            return new Integer(0);
            return 0;
        } catch (SQLException aSqlExc) {
            Exception exc = aSqlExc.getNextException();
            if (exc == null) {
hsarback/src/de/hsadmin/core/qserv/ProcessorException.java
@@ -1,6 +1,6 @@
package de.hsadmin.core.qserv;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.util.HSAdminException;
public class ProcessorException extends HSAdminException {
    
hsarback/src/de/hsadmin/core/qserv/SmtpHelper.java
@@ -11,8 +11,8 @@
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.commons.net.smtp.SimpleSMTPHeader;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.util.Config;
import de.hsadmin.core.util.HSAdminException;
public class SmtpHelper {
hsarback/src/de/hsadmin/core/util/Config.java
File was deleted
hsarback/src/de/hsadmin/core/util/IPv6Trick.java
File was deleted
hsarback/src/de/hsadmin/core/util/PasswordTool.java
File was deleted
hsarback/src/de/hsadmin/core/util/TextUtil.java
File was deleted
hsarback/src/de/hsadmin/mods/db/MySqlDatabaseModuleImpl.java
@@ -8,8 +8,8 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.hostsharing.MultiOption;
import de.hsadmin.mods.pac.Pac;
hsarback/src/de/hsadmin/mods/db/MySqlUserModuleImpl.java
@@ -8,8 +8,8 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.hostsharing.MultiOption;
import de.hsadmin.mods.pac.Pac;
hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseModuleImpl.java
@@ -8,8 +8,8 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.hostsharing.MultiOption;
import de.hsadmin.mods.pac.Pac;
hsarback/src/de/hsadmin/mods/db/PgSqlUserModuleImpl.java
@@ -8,7 +8,7 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.hostsharing.MultiOption;
import de.hsadmin.mods.pac.Pac;
hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
@@ -13,7 +13,7 @@
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.GenericModuleImpl;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.mods.email.EMailAddress;
import de.hsadmin.mods.pac.Pac;
hsarback/src/de/hsadmin/mods/email/EMailAddress.java
@@ -19,9 +19,9 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AnnFieldIO;
import de.hsadmin.core.model.AnnModuleImpl;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.ReadWriteAccess;
import de.hsadmin.core.model.SearchFilter;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.mods.dom.Domain;
import de.hsadmin.mods.user.UnixUser;
hsarback/src/de/hsadmin/mods/email/EMailAddressModuleImpl.java
@@ -8,8 +8,8 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.mods.dom.Domain;
import de.hsadmin.mods.dom.DomainOption;
hsarback/src/de/hsadmin/mods/email/EMailAliasModuleImpl.java
@@ -8,8 +8,8 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.hostsharing.MultiOption;
import de.hsadmin.mods.pac.Pac;
hsarback/src/de/hsadmin/mods/pac/INetAddress.java
@@ -13,7 +13,7 @@
import javax.persistence.Table;
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.qserv.ProcessorException;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.core.util.IPv6Trick;
import de.hsadmin.mods.user.UnixUser;
@@ -73,7 +73,7 @@
        return name;
    }
    public String getInet6Addr() throws ProcessorException {
    public String getInet6Addr() throws HSAdminException {
        return IPv6Trick.convertIPv4ToIPv6(name);
    }
hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java
@@ -14,7 +14,7 @@
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.GenericModuleImpl;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.core.util.TextUtil;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.mods.cust.Contact;
@@ -136,7 +136,7 @@
        for (PacComponent c : oldPacComponents) {
            String feature = c.getBaseComponent().getFeature();
            int quantity = c.getQuantity();
            oldQuantities.put(feature, new Integer(quantity));
            oldQuantities.put(feature, quantity);
            em.remove(c);
        }
        oldPacComponents.clear();
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
@@ -21,6 +21,7 @@
import de.hsadmin.core.qserv.VelocityProcessor;
import de.hsadmin.core.qserv.WaitingTasksProcessor;
import de.hsadmin.core.util.Config;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.core.util.PasswordTool;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.hostsharing.QuotaLimit;
@@ -32,7 +33,7 @@
    @Override
    public <T extends AbstractEntity> Processor createCreateProcessor(
            EntityManager em, T entity) throws ProcessorException {
            EntityManager em, T entity) throws HSAdminException {
        Pac pac = (Pac) entity;
        String basepacName = pac.getBasepac().getName();
        if (basepacName.equals(BasePacType.PAC_WEB)) {
@@ -67,7 +68,7 @@
    @Override
    public <T extends AbstractEntity> Processor createUpdateProcessor(EntityManager em, T entity)
            throws ProcessorException {
            throws HSAdminException {
        Pac pac = (Pac) entity;
        String basepacName = pac.getBasepac().getName();
        if (basepacName.equals(BasePacType.PAC_WEB)) {
@@ -91,7 +92,7 @@
    }
    @Override
    public <T extends AbstractEntity> Processor createDeleteProcessor(EntityManager em, T entity) throws ProcessorException {
    public <T extends AbstractEntity> Processor createDeleteProcessor(EntityManager em, T entity) throws HSAdminException {
        Pac pac = (Pac) entity;
        String basepacName = pac.getBasepac().getName();
        if (basepacName.equals(BasePacType.PAC_WEB)) {
@@ -130,7 +131,7 @@
        return new ShellProcessor("mk-iptables-rules Accounting");
    }
    private Processor createHttpdVirtualProc(Hive hive) throws ProcessorException {
    private Processor createHttpdVirtualProc(Hive hive) throws HSAdminException {
        Processor domSetupProcessor = new CompoundProcessor(
                new CreateFileProcessor("/de/hsadmin/mods/pac/httpd-virtual.vm", hive,
                        "/etc/apache2/conf.d/virtual.conf.tmp", "root", "root", "644", true),
@@ -145,7 +146,7 @@
        return new VelocityProcessor("/de/hsadmin/mods/pac/hosts.vm", hive, "/etc/hosts", true);
    }
    private Processor createNetworkInterfacesProc(final Hive hive) throws ProcessorException {
    private Processor createNetworkInterfacesProc(final Hive hive) throws HSAdminException {
        return
            new CompoundProcessor(
                new VelocityProcessor("/de/hsadmin/mods/pac/pac-addr-ipv4.vm", hive, "/etc/network/pac-addr-ipv4", true),
@@ -180,7 +181,7 @@
        zonefileTemplateVars.put("inet4Addr", pac.getCurINetAddr().getInet4Addr()); 
        try {
            zonefileTemplateVars.put("inet6Addr", pac.getCurINetAddr().getInet6Addr());
        } catch (ProcessorException e) {
        } catch (HSAdminException e) {
            // dont care
        } 
        final String domName = pac.getName() + ".hostsharing.net";
@@ -288,7 +289,7 @@
                );
    }
    private Processor createIfUp(final Pac pac) throws ProcessorException {
    private Processor createIfUp(final Pac pac) throws HSAdminException {
        return new CompoundProcessor(
            new ShellProcessor("ip addr add "
                + pac.getCurINetAddr().getInet4Addr()
@@ -301,7 +302,7 @@
        );
    }
    private Processor createIfDown(final Pac pac) throws ProcessorException {
    private Processor createIfDown(final Pac pac) throws HSAdminException {
        return new CompoundProcessor(
            new ShellProcessor("ip addr del "
                + pac.getCurINetAddr().getInet4Addr()
hsarback/src/de/hsadmin/mods/qstat/QTaskModuleImpl.java
@@ -4,7 +4,7 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.util.HSAdminException;
public class QTaskModuleImpl extends AbstractModuleImpl {
hsarback/src/de/hsadmin/mods/user/UnixUserModuleImpl.java
@@ -9,8 +9,8 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AbstractModuleImpl;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.hostsharing.BasePacType;
import de.hsadmin.hostsharing.MultiOption;
import de.hsadmin.mods.pac.Pac;
hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java
@@ -17,7 +17,7 @@
import org.apache.commons.httpclient.HttpStatus;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.qserv.ProcessorException;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.core.util.IPv6Trick;
import de.hsadmin.mods.dom.Domain;
import de.hsadmin.mods.pac.Hive;
@@ -61,7 +61,7 @@
        writer.println("  , \"hiveipv4\": \"" + hive.getInetAddr().getInet4Addr() + "\"");
        try {
            writer.println("  , \"hiveipv6\": \"" + hive.getInetAddr().getInet6Addr() + "\"");
        } catch (ProcessorException e) {
        } catch (HSAdminException e) {
            // dont care
        }
        final long currentTimeSeconds = System.currentTimeMillis() / 1000L;
@@ -86,7 +86,7 @@
            writer.println("      , \"ipv4\": \"" + curINetAddr.getInet4Addr() + "\"");
            try {
                writer.println("      , \"ipv6\": \"" + curINetAddr.getInet6Addr() + "\"");
            } catch (ProcessorException e) {
            } catch (HSAdminException e) {
                // dont care
            }
            final PacComponent pacQuota = pac.getPacComponent("QUOTA");
hsarback/src/de/hsadmin/remote/AbstractRemote.java
@@ -12,9 +12,9 @@
import de.hsadmin.core.model.AuthenticationException;
import de.hsadmin.core.model.AuthorisationException;
import de.hsadmin.core.model.GenericModuleImpl;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.ModuleInterface;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.mods.user.UnixUser;
public abstract class AbstractRemote implements IRemote {
hsarback/src/de/hsadmin/remote/GenericAbstractRemote.java
@@ -7,11 +7,11 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AnnFieldIO;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.ReadWriteAccess;
import de.hsadmin.core.model.ReflectionUtil;
import de.hsadmin.core.model.TechnicalException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.ReflectionUtil;
import de.hsadmin.core.util.HSAdminException;
public abstract class GenericAbstractRemote extends AbstractRemote {
hsarback/src/de/hsadmin/remote/IRemote.java
@@ -3,7 +3,7 @@
import java.util.List;
import java.util.Map;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.util.HSAdminException;
public interface IRemote {
hsarback/src/de/hsadmin/remote/ModulePropertiesRemote.java
@@ -12,11 +12,11 @@
import de.hsadmin.core.model.AnnFieldIO;
import de.hsadmin.core.model.AuthenticationException;
import de.hsadmin.core.model.DefaultSelectableValues;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.KindOfSelectableValue;
import de.hsadmin.core.model.ReadWriteAccess;
import de.hsadmin.core.model.SelectableValue;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
public class ModulePropertiesRemote implements IRemote {
hsarback/src/de/hsadmin/remote/PacRemote.java
@@ -6,8 +6,8 @@
import java.util.Set;
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.core.util.TextUtil;
import de.hsadmin.mods.cust.Customer;
import de.hsadmin.mods.pac.BasePac;
hsarback/src/de/hsadmin/remote/PropertyRemote.java
@@ -11,9 +11,9 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AnnFieldIO;
import de.hsadmin.core.model.AuthenticationException;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.ReadWriteAccess;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.HSAdminException;
public class PropertyRemote implements IRemote {
hsarback/src/de/hsadmin/remote/RoleRemote.java
@@ -8,9 +8,9 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.model.AuthenticationException;
import de.hsadmin.core.model.GenericModuleImpl;
import de.hsadmin.core.model.HSAdminException;
import de.hsadmin.core.model.Transaction;
import de.hsadmin.core.util.Config;
import de.hsadmin.core.util.HSAdminException;
import de.hsadmin.mods.dom.Domain;
import de.hsadmin.mods.pac.Pac;