[pkg-jboss-commits] cvs commit to jboss3/debian by codeshark-guest

pkg-jboss-commits@lists.alioth.debian.org pkg-jboss-commits@lists.alioth.debian.org
Mon, 24 May 2004 09:19:21 -0600


Update of /cvsroot/pkg-jboss/jboss3/debian
In directory haydn:/tmp/cvs-serv6302

Modified Files:
	control jboss3.default jboss3.init rules 
Added Files:
	jboss3-server-debian.dirs 
	jboss3-server-debian.jboss-service.xml 
	jboss3-server-debian.links jboss3-server-debian.postinst 
	jboss3-server-debian.postrm jboss3-server-debian.server.xml 
Log Message:
added jboss-server-debian as default configuration


--- NEW FILE: jboss3-server-debian.dirs ---
etc/jboss3/debian
var/log/jboss3/debian
var/cache/jboss3/debian/work
var/cache/jboss3/debian/data
var/cache/jboss3/debian/tmp
usr/share/jboss3/server/debian

--- NEW FILE: jboss3-server-debian.jboss-service.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!-- $Id: jboss3-server-debian.jboss-service.xml,v 1.1 2004/05/24 15:19:19 codeshark-guest Exp $ -->

<!-- ===================================================================== -->
<!--  JBoss Server Configuration                                           -->
<!-- ===================================================================== -->

<server>

   <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
     can be restricted to specific jars by specifying them in the archives
     attribute.
    -->
   <classpath codebase="lib" archives="*"/>


   <!-- ==================================================================== -->
   <!-- JSR-77 Single JBoss Server Management Domain                         -->
   <!-- ==================================================================== -->
   <mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
      name="jboss.management.local:j2eeType=J2EEDomain,name=Manager">
      <attribute name="MainDeployer">jboss.system:service=MainDeployer</attribute>
      <attribute name="SARDeployer">jboss.system:service=ServiceDeployer</attribute>
      <attribute name="EARDeployer">jboss.j2ee:service=EARDeployer</attribute>
      <attribute name="EJBDeployer">jboss.ejb:service=EJBDeployer</attribute>
      <attribute name="RARDeployer">jboss.jca:service=RARDeployer</attribute>
      <attribute name="CMDeployer">jboss.jca:service=ConnectionFactoryDeployer</attribute>
      <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
      <attribute name="MailService">jboss:service=Mail</attribute>
      <attribute name="JMSService">jboss.mq:service=DestinationManager</attribute>
      <attribute name="JNDIService">jboss:service=Naming</attribute>
      <attribute name="JTAService">jboss:service=TransactionManager</attribute>
      <attribute name="UserTransactionService">jboss:service=ClientUserTransaction</attribute>
      <attribute name="RMI_IIOPService">jboss:service=CorbaORB</attribute>
   </mbean>

   <!-- Preload all custom editors for VMs that don't use the thread
        context class loader when searching for PropertyEditors. Uncomment
        if your JDK 1.3.0 VM fails to find JBoss PropertyEditors.
   <mbean code="org.jboss.varia.property.PropertyEditorManagerService"
     name="jboss:type=Service,name=BootstrapEditors">
     <attribute name="BootstrapEditors">
       java.math.BigDecimal=org.jboss.util.propertyeditor.BigDecimalEditor
       java.lang.Boolean=org.jboss.util.propertyeditor.BooleanEditor
       java.lang.Class=org.jboss.util.propertyeditor.ClassEditor
       java.util.Date=org.jboss.util.propertyeditor.DateEditor
       java.io.File=org.jboss.util.propertyeditor.FileEditor
       java.net.InetAddress=org.jboss.util.propertyeditor.InetAddressEditor
       java.lang.Integer=org.jboss.util.propertyeditor.IntegerEditor
       javax.management.ObjectName=org.jboss.mx.util.propertyeditor.ObjectNameEditor
       java.util.Properties=org.jboss.util.propertyeditor.PropertiesEditor
       [Ljava.lang.String;=org.jboss.util.propertyeditor.StringArrayEditor
       java.net.URL=org.jboss.util.propertyeditor.URLEditor
     </attribute>
   </mbean>
   -->

   <!-- ==================================================================== -->
   <!-- Log4j Initialization                                                 -->
   <!-- ==================================================================== -->

   <mbean code="org.jboss.logging.Log4jService"
      name="jboss.system:type=Log4jService,service=Logging">
      <attribute name="ConfigurationURL">resource:log4j.xml</attribute>
      <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
      this needs to be set to avoid a possible deadlock on exception at the
      appender level. See bug#696819.
      -->
      <attribute name="Log4jQuietMode">true</attribute>
   </mbean>

   <!-- ==================================================================== -->
   <!-- JBoss RMI Classloader - only install when available                  -->
   <!-- ==================================================================== -->
   <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
      name="jboss.rmi:type=RMIClassLoader">
      <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
      <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
   </mbean>

   <!-- ==================================================================== -->
   <!-- Service Binding                                                      -->
   <!-- ==================================================================== -->

   <!-- Automatically activated when generatting the clustering environment -->
   <!-- @TESTSUITE_CLUSTER_CONFIG@ -->

   <!-- 
      | Binding service manager for port/host mapping. This is a sample
      | config that demonstrates a JBoss instances with a server name 'jboss1'
      | loading its bindings from an XML file using the ServicesStoreFactory
      | implementation returned by the XMLServicesStoreFactory.
      |
      | ServerName: The unique name assigned to a JBoss server instance for
      | lookup purposes. This allows a single ServicesStore to handle mulitiple
      | JBoss servers.
      |
      | StoreURL: The URL string passed to org.jboss.services.binding.ServicesStore
      | during initialization that specifies how to connect to the bindings store.
      | StoreFactory: The org.jboss.services.binding.ServicesStoreFactory interface
      | implementation to create to obtain the ServicesStore instance.

   <mbean code="org.jboss.services.binding.ServiceBindingManager"
     name="jboss.system:service=ServiceBindingManager">
     <attribute name="ServerName">ports-01</attribute>
     <attribute name="StoreURL">../docs/examples/binding-manager/sample-bindings.xml</attribute>
     <attribute name="StoreFactoryClassName">
       org.jboss.services.binding.XMLServicesStoreFactory
     </attribute>
   </mbean>

   -->


   <!-- ==================================================================== -->
   <!-- Class Loading                                                        -->
   <!-- ==================================================================== -->

   <mbean code="org.jboss.web.WebService"
      name="jboss:service=WebService">
      <attribute name="Port">0</attribute>
      <!-- Should resources and non-EJB classes be downloadable -->
      <attribute name="DownloadServerClasses">true</attribute>
      <attribute name="Host">${jboss.bind.address}</attribute>
      <attribute name="BindAddress">${jboss.bind.address}</attribute>
   </mbean>

   <!-- ==================================================================== -->
   <!-- JNDI                                                                 -->
   <!-- ==================================================================== -->

   <mbean code="org.jboss.naming.NamingService"
      name="jboss:service=Naming">
      <!-- The listening port for the bootstrap JNP service. Set this to -1
        to run the NamingService without the JNP invoker listening port.
      -->
      <attribute name="Port">-1</attribute>
      <!-- The bootstrap JNP server bind address. This also sets the default
      RMI service bind address. Empty == all addresses
       -->
      <attribute name="BindAddress">${jboss.bind.address}</attribute>
      <!-- The port of the RMI naming service, 0 == anonymous -->
      <attribute name="RmiPort">0</attribute>
      <!-- The RMI service bind address. Empty == all addresses
       -->
      <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
   </mbean>

   <mbean code="org.jboss.naming.JNDIView" 
   		name="jboss:service=JNDIView"
   		xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml"> 
   </mbean>

   <!-- ==================================================================== -->
   <!-- Security                                                             -->
   <!-- ==================================================================== -->

   <mbean code="org.jboss.security.plugins.SecurityConfig"
      name="jboss.security:service=SecurityConfig">
      <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
   </mbean>
   <mbean code="org.jboss.security.auth.login.XMLLoginConfig"
      name="jboss.security:service=XMLLoginConfig">
      <attribute name="ConfigResource">login-config.xml</attribute>
   </mbean>

   <!-- JAAS security manager and realm mapping -->
   <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
      name="jboss.security:service=JaasSecurityManager">
      <attribute name="SecurityManagerClassName">
         org.jboss.security.plugins.JaasSecurityManager
      </attribute>
   </mbean>

   <!-- ==================================================================== -->
   <!-- Transactions                                                         -->
   <!-- ==================================================================== -->
   <!-- The configurable Xid factory.  For use with Oracle, set pad to true -->
   <mbean code="org.jboss.tm.XidFactory"
      name="jboss:service=XidFactory">
      <!--attribute name="Pad">true</attribute-->
   </mbean>

   <!--
      | The fast in-memory transaction manager.
    -->
   <mbean code="org.jboss.tm.TransactionManagerService"
      name="jboss:service=TransactionManager"
      xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
      <attribute name="TransactionTimeout">300</attribute>

      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
   </mbean>

   <!--
      | UserTransaction support.
    -->
   <mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService"
      name="jboss:service=ClientUserTransaction"
      xmbean-dd="resource:xmdesc/ClientUserTransaction-xmbean.xml">
      <depends>
         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
            name="jboss:service=proxyFactory,target=ClientUserTransactionFactory">
            <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
            <attribute name="JndiName">UserTransactionSessionFactory</attribute>
            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSessionFactory</attribute>
            <attribute name="ClientInterceptors">
               <interceptors>
                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
               </interceptors>
            </attribute>
            <depends>jboss:service=invoker,type=jrmp</depends>
         </mbean>
      </depends>
      <depends optional-attribute-name="TxProxyName">
         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
            name="jboss:service=proxyFactory,target=ClientUserTransaction">
            <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
            <attribute name="JndiName"></attribute>
            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSession</attribute>
            <attribute name="ClientInterceptors">
               <interceptors>
                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
               </interceptors>
            </attribute>
            <depends>jboss:service=invoker,type=jrmp</depends>
         </mbean>
      </depends>

   </mbean>

   <!-- ==================================================================== -->
   <!-- Invokers to the JMX node                                             -->
   <!-- ==================================================================== -->

   <!-- RMI/JRMP invoker 
   <mbean code="org.jboss.invocation.jrmp.server.JRMPInvoker"
      name="jboss:service=invoker,type=jrmp">
      <attribute name="RMIObjectPort">4444</attribute>
      <attribute name="ServerAddress">${jboss.bind.address}</attribute>

      <depends>jboss:service=TransactionManager</depends>
   </mbean> -->

   <mbean code="org.jboss.invocation.local.LocalInvoker"
      name="jboss:service=invoker,type=local">

      <depends>jboss:service=TransactionManager</depends>
   </mbean>

   <mbean code="org.jboss.invocation.pooled.server.PooledInvoker"
      name="jboss:service=invoker,type=pooled">
      <attribute name="NumAcceptThreads">1</attribute>
      <attribute name="MaxPoolSize">300</attribute>
      <attribute name="ClientMaxPoolSize">300</attribute>
      <attribute name="SocketTimeout">60000</attribute>
      <attribute name="ServerBindAddress">${jboss.bind.address}</attribute>
      <attribute name="ServerBindPort">0</attribute>
      <attribute name="ClientConnectAddress">${jboss.bind.address}</attribute>
      <attribute name="ClientConnectPort">0</attribute>
      <attribute name="EnableTcpNoDelay">false</attribute>

      <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends>
   </mbean>

   <!-- ==================================================================== -->
   <!-- The deployers...                                                     -->
   <!-- ==================================================================== -->

   <!-- EJB deployer, remove to disable EJB behavior-->
   <mbean code="org.jboss.ejb.EJBDeployer" name="jboss.ejb:service=EJBDeployer">
      <attribute name="VerifyDeployments">true</attribute>
      <attribute name="ValidateDTDs">false</attribute>
      <attribute name="MetricsEnabled">false</attribute>
      <attribute name="VerifierVerbose">true</attribute>

      <!--
          StrictVerifier: Setting this to 'true' will cause all deployments
          to fail when the Verifier detected a problem with the contained
          Beans.
      -->
      <attribute name="StrictVerifier">true</attribute>

      <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
      <depends optional-attribute-name="WebServiceName">jboss:service=WebService</depends>
   </mbean>
  
   <!-- EAR deployer, remove if you are not using Web layers -->
   <mbean code="org.jboss.deployment.EARDeployer" name="jboss.j2ee:service=EARDeployer">
   </mbean>

   <mbean code="org.jboss.varia.deployment.BeanShellSubDeployer"
      name="jboss.scripts:service=BSHDeployer">
   </mbean>

   <!-- ==================================================================== -->
   <!-- Monitoring and Management                                            -->
   <!-- ==================================================================== -->

   <!-- Uncomment to enable JMX monitoring of the bean cache
   <mbean code="org.jboss.monitor.BeanCacheMonitor" 
          name="jboss.monitor:name=BeanCacheMonitor"/>
   -->

   <!-- Uncomment to enable JMX monitoring of the entity bean locking
   <mbean code="org.jboss.monitor.EntityLockMonitor" 
          name="jboss.monitor:name=EntityLockMonitor"/>
   -->

   <!-- ==================================================================== -->
   <!-- Deployment Scanning                                                  -->
   <!-- ==================================================================== -->

   <!-- An mbean for hot deployment/undeployment of archives.
   -->
   <mbean code="org.jboss.deployment.scanner.URLDeploymentScanner"
      name="jboss.deployment:type=DeploymentScanner,flavor=URL">

      <!-- Uncomment (and comment/remove version below) to enable usage of the
        DeploymentCache
      <depends optional-attribute-name="Deployer">jboss.deployment:type=DeploymentCache</depends>
      -->
      <depends optional-attribute-name="Deployer">jboss.system:service=MainDeployer</depends>

      <!-- The URLComparator can be used to specify a deployment ordering
           for deployments found in a scanned directory.  The class specified
           must be an implementation of java.util.Comparator, it must be able
           to compare two URL objects, and it must have a no-arg constructor.
           Two deployment comparators are shipped with JBoss:
             - org.jboss.deployment.DeploymentSorter 
               Sorts by file extension, as follows:
                 "sar", "service.xml", "rar", "jar", "war", "wsr", "ear", "zip", 
                 "*"
             - org.jboss.deployment.scanner.PrefixDeploymentSorter
               If the name portion of the url begins with 1 or more digits, those 
               digits are converted to an int (ignoring leading zeroes), and 
               files are deployed in that order.  Files that do not start with 
               any digits will be deployed first, and they will be sorted by
               extension as above with DeploymentSorter.
      -->
      <attribute name="URLComparator">org.jboss.deployment.DeploymentSorter</attribute>
      <!--
      <attribute name="URLComparator">org.jboss.deployment.scanner.PrefixDeploymentSorter</attribute>
      -->

      <!-- The Filter specifies a java.io.FileFilter for scanned
           directories.  Any file not accepted by this filter will not be
           deployed.  The org.jboss.deployment.scanner.DeploymentFilter 
           rejects the following patterns:
               "#*", "%*", ",*", ".*", "_$*", "*#", "*$", "*%", "*.BAK", 
               "*.old", "*.orig", "*.rej", "*.bak", "*,v", "*~", ".make.state", 
               ".nse_depinfo", "CVS", "CVS.admin", "RCS", "RCSLOG", "SCCS", 
               "TAGS", "core", "tags"
      -->
      <attribute name="Filter">org.jboss.deployment.scanner.DeploymentFilter</attribute>

      <attribute name="ScanPeriod">5000</attribute>

      <!-- URLs are comma separated and resolve relative to the server home URL
         unless the given path is absolute. If the URL ends in "/" it is
         considered a collection and scanned, otherwise it is simply deployed;
         this follows RFC2518 convention and allows discrimination between
         collections and directories that are simply unpacked archives.

         URLs may be local (file:) or remote (http:). Scanning is supported
         for remote URLs but unpacked deployment units are not.

         Example URLs:
            deploy/
                 scans ${jboss.server.url}/deploy/, which is local or remote
                 depending on the URL used to boot the server
            ${jboss.server.home}/deploy/
                 scans ${jboss.server.home)/deploy, which is always local
            file:/var/opt/myapp.ear
                 deploy myapp.ear from a local location
            file:/var/opt/apps/
                 scans the specified directory
            http://www.test.com/netboot/myapp.ear
                 deploys myapp.ear from a remote location
            http://www.test.com/netboot/apps/
                 scans the specified WebDAV location
       -->
      <attribute name="URLs">
         deploy/
      </attribute>

      <!-- Indicates if the scanner should recursively scan directories that
      contain no "." in their names. This can be used to group applications
      and services that must be deployed and that have the same
      logical function in the same directory i.e.
        deploy/JMX/
        deploy/JMS/
        ...
      -->

      <attribute name="RecursiveSearch">True</attribute>

    </mbean>
    
</server>

--- NEW FILE: jboss3-server-debian.links ---
/var/log/jboss3/debian	       /usr/share/jboss3/server/debian/log
/var/cache/jboss3/debian/tmp   /usr/share/jboss3/server/debian/tmp
/var/cache/jboss3/debian/work  /usr/share/jboss3/server/debian/work
/var/cache/jboss3/debian/data  /usr/share/jboss3/server/debian/data
/etc/jboss3/debian	       /usr/share/jboss3/server/debian/conf

--- NEW FILE: jboss3-server-debian.postinst ---
#! /bin/sh
# postinst script for jboss
# $Id: jboss3-server-debian.postinst,v 1.1 2004/05/24 15:19:19 codeshark-guest Exp $
#
# see: dh_installdeb(1)

set -e

# summary of how this script can be called:
#        * <postinst> `configure' <most-recently-configured-version>
#        * <old-postinst> `abort-upgrade' <new version>
#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
#          <new-version>
#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
#          <failed-install-package> <version> `removing'
#          <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

PKG=jboss3
CONF=debian
DEFAULT=/etc/$CONF/$PKG

case "$1" in
    configure)
      chown -R jboss:adm /var/log/$PKG/$CONF
      chown -R jboss:root /var/cache/$PKG/$CONF
      find /etc/$PKG/$CONF -type d | xargs chown jboss:root

      # restart jboss if this is the currently used config
      [ -r $DEFAULT ] && . $DEFAULT
      if [ "$JBOSS_SERVER" = "$CONF" -o -z "$JBOSS_SERVER" ]; then
        if [ -x /etc/init.d/$PKG ]; then
	    if [ -x /usr/sbin/invoke-rc.d ]; then
		invoke-rc.d $PKG restart
	    else
		/etc/init.d/$PKG restart
	    fi
	fi
      fi
    ;;

    abort-upgrade|abort-remove|abort-deconfigure)
    ;;

    *)
        echo "postinst called with unknown argument \`$1'" >&2
        exit 1
    ;;
esac

# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.

#DEBHELPER#

exit 0



--- NEW FILE: jboss3-server-debian.postrm ---
#! /bin/sh
# postrm script for #PACKAGE#
# $Id: jboss3-server-debian.postrm,v 1.1 2004/05/24 15:19:19 codeshark-guest Exp $
#
# see: dh_installdeb(1)

set -e

# summary of how this script can be called:
#        * <postrm> `remove'
#        * <postrm> `purge'
#        * <old-postrm> `upgrade' <new-version>
#        * <new-postrm> `failed-upgrade' <old-version>
#        * <new-postrm> `abort-install'
#        * <new-postrm> `abort-install' <old-version>
#        * <new-postrm> `abort-upgrade' <old-version>
#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

PKG=jboss3
CONF=debian

case "$1" in
       purge)
	    rm  -rf /var/log/$PKG/$CONF /var/cache/$PKG/$CONF
        ;;
esac

# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.

#DEBHELPER#

exit 0

--- NEW FILE: jboss3-server-debian.server.xml ---
<Server>

  <Service name="jboss.web">

    <!-- A HTTP/1.1 Connector on port 8280 -->
    <Connector port="8280" address="${jboss.bind.address}"
         maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
         enableLookups="false" redirectPort="8443" acceptCount="100"
         connectionTimeout="20000" disableUploadTimeout="true" />

    <!-- A AJP 1.3 Connector on port 8209 -->
    <Connector port="8209" address="${jboss.bind.address}"
         enableLookups="false" redirectPort="8443" debug="0"
         protocol="AJP/1.3" />

    <!-- SSL/TLS Connector configuration using the admin devl guide keystore
    <Connector port="8443" address="${jboss.bind.address}"
         maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
         scheme="https" secure="true" clientAuth="false"
         keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore"
         keystorePass="rmi+ssl" sslProtocol = "TLS" />
    -->

    <Engine name="jboss.web" defaultHost="localhost">

      <Logger className="org.jboss.web.tomcat.Log4jLogger"
          verbosityLevel="INFORMATION" 
          category="org.jboss.web.localhost.Engine"/>

      <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
         subjectAttributeName="j_subject"
         certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
         />

      <Host name="localhost" autoDeploy="false">

        <!-- Access logger -->
        <!--
        <Valve className="org.apache.catalina.valves.AccessLogValve"
           prefix="localhost_access_log." suffix=".log"
           pattern="common" directory="${jboss.server.home.dir}/log" 
           resolveHosts="false" />
        -->

        <!-- Uncomment to enable single sign-on across web apps
        deployed to this host.
        <Valve className="org.apache.catalina.authenticator.SingleSignOn"
           debug="0"/>
        -->
         
         <!-- Check for unclosed connections -->
        <Valve className="org.jboss.web.tomcat.tc5.jca.CachedConnectionValve"
            cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager" />

        <!-- Default context parameters -->
        <DefaultContext cookies="true" crossContext="true" override="true" />

      </Host>

    </Engine>

  </Service>

</Server>

Index: control
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/control,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- control	24 May 2004 09:44:46 -0000	1.8
+++ control	24 May 2004 15:19:19 -0000	1.9
@@ -15,11 +15,19 @@
  The JBoss/Server is the leading Open Source, standards-compliant, J2EE based
  application server implemented in 100% Pure Java
 
+Package: jboss3-server-debian
+Architecture: all
+Depends: jboss3
+Description: Debian configuration for JBoss
+ JBoss is a Java Application Server fully implemented in Java.
+ .
+ This is a modified default upstream server configuration.
+
 Package: jboss3-server-default
 Architecture: all
 Depends: jboss3
 Provides: jboss3-server-config
-Description: Full configuration for JBoss 
+Description: Default configuration for JBoss 
  JBoss is a Java Application Server fully implemented in Java.
  .
  This is the default upstream server configuration.

Index: jboss3.default
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/jboss3.default,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jboss3.default	15 May 2004 15:56:24 -0000	1.1
+++ jboss3.default	24 May 2004 15:19:19 -0000	1.2
@@ -9,7 +9,7 @@
 #JAVA_HOME=/usr/lib/j2sdk1.4
 
 # Configuration layout to use
-#JBOSS_SERVER=default
+#JBOSS_SERVER=debian
 
 # Timeout in seconds for the shutdown procedure (default: 30). The Java
 # processes will be killed if tomcat4 has not stopped until then.

Index: jboss3.init
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/jboss3.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jboss3.init	17 May 2004 13:29:19 -0000	1.3
+++ jboss3.init	24 May 2004 15:19:19 -0000	1.4
@@ -22,6 +22,9 @@
 # Run JBoss as this user ID
 JBOSS_USER=jboss
 
+# Use debian configuration as default
+JBOSS_SERVER=debian
+
 test -f $DAEMON || exit 0
 
 # the first existing directory is used for JAVA_HOME ,if JAVA_HOME isn't

Index: rules
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rules	23 May 2004 14:36:55 -0000	1.6
+++ rules	24 May 2004 15:19:19 -0000	1.7
@@ -80,6 +80,12 @@
 	    	$(JBOSS_DIR)-server-$$i/usr/share/${PKG}/server/$$i/lib/; \
 	done
 
+	# clone jboss-server-default to jboss-server-debian
+	cp -a $(JBOSS_DIR)-server-default/etc/${PKG}/default/* $(JBOSS_DIR)-server-debian/etc/${PKG}/debian/
+	cp -a $(JBOSS_DIR)-server-default/usr/share/${PKG}/server/default/* $(JBOSS_DIR)-server-debian/usr/share/${PKG}/server/debian/
+	cp $(CURDIR)/debian/${PKG}-server-debian.jboss-service.xml $(JBOSS_DIR)-server-debian/etc/${PKG}/debian/jboss-service.xml
+	cp $(CURDIR)/debian/${PKG}-server-debian.server.xml $(JBOSS_DIR)-server-debian/usr/share/jboss3/server/debian/deploy/jbossweb-tomcat50.sar/server.xml
+
 	cp -a $(BUILD_DIR)/* $(JBOSS_DIR)/usr/share/${PKG}