HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2012-04-05 6f7e29ea05be963df46fb64f9dbaebb65e6b3305
test configuration
1 files modified
2 files renamed
2 files added
1 files deleted
595 ■■■■■ changed files
hsarback/build.xml 4 ●●● patch | view | raw | blame | history
hsarback/conf/META-INF/prod-context.xml 20 ●●●●● patch | view | raw | blame | history
hsarback/conf/META-INF/test-context.xml 33 ●●●●● patch | view | raw | blame | history
hsarback/conf/WEB-INF/prod-web.xml 10 ●●●● patch | view | raw | blame | history
hsarback/conf/WEB-INF/test-web.xml 195 ●●●●● patch | view | raw | blame | history
hsarback/conf/WEB-INF/web.xml 333 ●●●●● patch | view | raw | blame | history
hsarback/build.xml
@@ -55,7 +55,7 @@
    </target>
    
    <target name="war" depends="enhance">
        <copy file="conf/WEB-INF/web.xml" todir="webapp/WEB-INF/">
        <copy file="conf/WEB-INF/${target}-web.xml" todir="webapp/WEB-INF/">
            <filterset>
                <filter token="LOGIN_HOST" value="${cas.domain.name}"/>
                <filter token="LOGIN_PORT" value="${cas.https.port}"/>
@@ -63,6 +63,8 @@
                <filter token="CONFIG_PORT" value="${hsar.https.port}"/>
            </filterset>
        </copy>
        <copy file="conf/WEB-INF/${target}-context.xml" todir="webapp/META-INF/">
        </copy>
        <war destfile="build/hsar.war" basedir="webapp">
            <lib dir="lib">
                <include name="**/*.jar"/>
hsarback/conf/META-INF/prod-context.xml
File was renamed from hsarback/webapp/META-INF/context.xml
@@ -11,11 +11,6 @@
        type="javax.jms.QueueConnectionFactory"/>
    <ResourceLink
        name="jms/hsadminSystem-h81"
        global="jms/hsadminSystem-h81"
        type="javax.jms.Queue"/>
    <ResourceLink
        name="jms/hsadminSystem-h01"
        global="jms/hsadminSystem-h01"
        type="javax.jms.Queue"/>
@@ -71,16 +66,6 @@
        type="javax.jms.Queue"/>
    <ResourceLink
        name="jms/hsadminSystem-h53"
        global="jms/hsadminSystem-h53"
        type="javax.jms.Queue"/>
    <ResourceLink
        name="jms/hsadminSystem-h54"
        global="jms/hsadminSystem-h54"
        type="javax.jms.Queue"/>
    <ResourceLink
        name="jms/hsadminSystem-h55"
        global="jms/hsadminSystem-h55"
        type="javax.jms.Queue"/>
@@ -128,11 +113,6 @@
    <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
hsarback/conf/META-INF/test-context.xml
New file
@@ -0,0 +1,33 @@
<Context path="/hsar" reloadable="true" crossContext="true">
    <ResourceLink
        name="jdbc/HSAdminDB"
        global="jdbc/HSAdminDB"
        type="javax.sql.DataSource"/>
    <ResourceLink
        name="jms/QueueCF"
        global="jms/QueueCF"
        type="javax.jms.QueueConnectionFactory"/>
    <ResourceLink
        name="jms/hsadminSystem-h99"
        global="jms/hsadminSystem-h99"
        type="javax.jms.Queue"/>
    <ResourceLink
        name="jms/hsadminSystem-testmail"
        global="jms/hsadminSystem-testmail"
        type="javax.jms.Queue"/>
    <ResourceLink
        name="jms/hsadminSystem-testdns"
        global="jms/hsadminSystem-testdns"
        type="javax.jms.Queue"/>
    <ResourceLink
        name="jms/hsadminStatus"
        global="jms/hsadminStatus"
        type="javax.jms.Queue"/>
</Context>
hsarback/conf/WEB-INF/prod-web.xml
File was renamed from hsarback/webapp/WEB-INF/web.xml
@@ -19,11 +19,11 @@
          <servlet-class>de.hsadmin.cliClientConnector.CLIClientConnectorServlet</servlet-class>
          <init-param>
              <param-name>proxyValidateUrl</param-name>
              <param-value>https://${cas.domain.name}:${cas.https.port}/cas/proxyValidate</param-value>
              <param-value>https://@LOGIN_HOST@:@LOGIN_PORT@/cas/proxyValidate</param-value>
          </init-param>
          <init-param>
              <param-name>proxyServiceUrl</param-name>
              <param-value>https://${hsar.domain.name}:${hsar.https.port}/hsar/backend</param-value>
              <param-value>https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend</param-value>
          </init-param>
          <init-param>
              <param-name>Components</param-name>
@@ -157,12 +157,6 @@
        <res-sharing-scope>Shareable</res-sharing-scope>
    </resource-ref>
         
    <resource-ref>
        <res-ref-name>jms/hsadminSystem-h81</res-ref-name>
        <res-type>javax.jms.Queue</res-type>
        <res-auth>Container</res-auth>
        <res-sharing-scope>Shareable</res-sharing-scope>
    </resource-ref>
    <resource-ref>
        <res-ref-name>jms/hsadminSystem-h01</res-ref-name>
        <res-type>javax.jms.Queue</res-type>
hsarback/conf/WEB-INF/test-web.xml
New file
@@ -0,0 +1,195 @@
<?xml version="1.0"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
    version="2.5">
    <listener>
        <listener-class>de.hsadmin.core.model.onetier.PersistenceManagerContextListener</listener-class>
    </listener>
    <servlet>
        <servlet-name>Queue Status Servlet</servlet-name>
        <servlet-class>de.hsadmin.core.qserv.QueueStatusReceiverServlet</servlet-class>
        <load-on-startup>1</load-on-startup>
    </servlet>
      <servlet>
          <servlet-name>CLI Client Connector</servlet-name>
          <servlet-class>de.hsadmin.cliClientConnector.CLIClientConnectorServlet</servlet-class>
          <init-param>
              <param-name>proxyValidateUrl</param-name>
              <param-value>https://@LOGIN_HOST@:@LOGIN_PORT@/cas/proxyValidate</param-value>
          </init-param>
          <init-param>
              <param-name>proxyServiceUrl</param-name>
              <param-value>https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend</param-value>
          </init-param>
          <init-param>
              <param-name>Components</param-name>
              <param-value>member,pac,user,domain,emailaddress,emailalias,mysqluser,mysqldb,postgresqluser,postgresqldb,q</param-value>
        </init-param>
          <init-param>
              <param-name>ComponentClass_member</param-name>
            <param-value>de.hsadmin.mods.cust.Customer</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_member</param-name>
              <param-value>Mitglieder</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_pac</param-name>
            <param-value>de.hsadmin.mods.pac.Pac</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_pac</param-name>
              <param-value>Pakete</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_user</param-name>
              <param-value>de.hsadmin.mods.user.UnixUser</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_user</param-name>
              <param-value>Benutzer und Postfaecher anlegen</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_domain</param-name>
            <param-value>de.hsadmin.mods.dom.Domain</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_domain</param-name>
              <param-value>Domains aufschalten</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_emailaddress</param-name>
            <param-value>de.hsadmin.mods.email.EMailAddress</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_emailaddress</param-name>
              <param-value>E-Mail Adressen</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_emailalias</param-name>
            <param-value>de.hsadmin.mods.email.EMailAlias</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_emailalias</param-name>
              <param-value>E-Mail Aliases</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_postgresqluser</param-name>
            <param-value>de.hsadmin.mods.db.PgSqlUser</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_postgresqluser</param-name>
              <param-value>PostgreSQL DB-Administrator</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_postgresqldb</param-name>
            <param-value>de.hsadmin.mods.db.PgSqlDatabase</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_postgresqldb</param-name>
              <param-value>PostgreSQL Datenbank</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_mysqluser</param-name>
            <param-value>de.hsadmin.mods.db.MySqlUser</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_mysqluser</param-name>
              <param-value>MySQL DB-Administrator</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_mysqldb</param-name>
            <param-value>de.hsadmin.mods.db.MySqlDatabase</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_mysqldb</param-name>
              <param-value>MySQL Datenbank</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentClass_q</param-name>
            <param-value>de.hsadmin.core.qserv.QueueTask</param-value>
          </init-param>
          <init-param>
              <param-name>ComponentDescription_q</param-name>
              <param-value>Offene Aktionen</param-value>
          </init-param>
        <load-on-startup>1</load-on-startup>
      </servlet>
   <servlet>
        <servlet-name>XmlRpcServlet</servlet-name>
        <servlet-class>org.apache.xmlrpc.webserver.XmlRpcServlet</servlet-class>
        <init-param>
          <param-name>enabledForExtensions</param-name>
          <param-value>true</param-value>
        </init-param>
    </servlet>
    <servlet-mapping>
        <servlet-name>Queue Status Servlet</servlet-name>
        <url-pattern>/queueStatus</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
        <servlet-name>CLI Client Connector</servlet-name>
        <url-pattern>/hsadmin/cli-interface/</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
        <servlet-name>XmlRpcServlet</servlet-name>
        <url-pattern>/xmlrpc/*</url-pattern>
    </servlet-mapping>
    <resource-ref>
        <res-ref-name>jdbc/HSAdminDB</res-ref-name>
        <res-type>javax.sql.DataSource</res-type>
        <res-auth>Container</res-auth>
    </resource-ref>
    <resource-ref>
        <res-ref-name>jms/QueueCF</res-ref-name>
        <res-type>javax.jms.QueueConnectionFactory</res-type>
        <res-auth>Container</res-auth>
        <res-sharing-scope>Shareable</res-sharing-scope>
    </resource-ref>
    <resource-ref>
        <res-ref-name>jms/hsadminSystem-h99</res-ref-name>
        <res-type>javax.jms.Queue</res-type>
        <res-auth>Container</res-auth>
        <res-sharing-scope>Shareable</res-sharing-scope>
    </resource-ref>
    <resource-ref>
        <res-ref-name>jms/hsadminSystem-testdns</res-ref-name>
        <res-type>javax.jms.Queue</res-type>
        <res-auth>Container</res-auth>
        <res-sharing-scope>Shareable</res-sharing-scope>
    </resource-ref>
    <resource-ref>
        <res-ref-name>jms/hsadminSystem-testmail</res-ref-name>
        <res-type>javax.jms.Queue</res-type>
        <res-auth>Container</res-auth>
        <res-sharing-scope>Shareable</res-sharing-scope>
    </resource-ref>
    <resource-ref>
        <res-ref-name>jms/hsadminStatus</res-ref-name>
        <res-type>javax.jms.Queue</res-type>
        <res-auth>Container</res-auth>
        <res-sharing-scope>Shareable</res-sharing-scope>
    </resource-ref>
    <security-constraint>
       <web-resource-collection>
               <web-resource-name>Hostsharing Administrative Area</web-resource-name>
            <url-pattern>/*</url-pattern>
       </web-resource-collection>
       <user-data-constraint>
               <transport-guarantee>CONFIDENTIAL</transport-guarantee>
       </user-data-constraint>
   </security-constraint>
</web-app>
hsarback/conf/WEB-INF/web.xml
File was deleted