Hi Thiago Instead of hacking default config why not using /etc/tomee-x/tomee.xml? ---------- Message transféré ---------- De : <[email protected]> Date : 29 avr. 2014 00:21 Objet : svn commit: r1590837 - in /tomee/tomee/trunk: container/openejb-core/src/main/resources/ tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/ tomee/tomee-deb/src/main/resources/control/ À : <[email protected]>
Author: tveronezi Date: Mon Apr 28 23:21:26 2014 New Revision: 1590837 URL: http://svn.apache.org/r1590837 Log: -using bash in all .sh files -reverting changes in default.openejb.conf file Modified: tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh Modified: tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf?rev=1590837&r1=1590836&r2=1590837&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf Mon Apr 28 23:21:26 2014 @@ -164,7 +164,7 @@ <Resource id="My DataSource" type="DataSource"> JdbcDriver org.hsqldb.jdbcDriver - JdbcUrl jdbc:hsqldb:file:temp/data/hsqldb/hsqldb + JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb UserName sa Password JtaManaged true @@ -173,7 +173,7 @@ <Resource id="My Unmanaged DataSource" type="DataSource"> JdbcDriver org.hsqldb.jdbcDriver - JdbcUrl jdbc:hsqldb:file:temp/data/hsqldb/hsqldb + JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb UserName sa Password JtaManaged false Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy?rev=1590837&r1=1590836&r2=1590837&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy (original) +++ tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy Mon Apr 28 23:21:26 2014 @@ -263,6 +263,7 @@ class PackageBuilder { } new File(homeConf, 'openejb.conf').withWriter { BufferedWriter out -> def data = this.class.getResource('/default.openejb.conf').text + data = data.replace('jdbc:hsqldb:file:data/hsqldb/hsqldb', 'jdbc:hsqldb:file:temp/data/hsqldb/hsqldb') out.write(data) } def homeConfD = new File(homeConf, 'conf.d') Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh?rev=1590837&r1=1590836&r2=1590837&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh (original) +++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh Mon Apr 28 23:21:26 2014 @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -42,4 +42,6 @@ update-rc.d tomee-${classifier} defaults update-alternatives --install /etc/init.d/tomee tomee /etc/init.d/tomee-${classifier} ${priority} -echo "Reboot your machine or run 'service tomee-${classifier} start' to start the Apache TomEE ${classifier} server (version: ${tomeeVersion})" \ No newline at end of file +echo "Apache TomEE classifier ${tomeeVersion} installed." +echo "Reboot your machine or run 'service tomee-${classifier} start' to start the Apache TomEE." + Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh?rev=1590837&r1=1590836&r2=1590837&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh (original) +++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh Mon Apr 28 23:21:26 2014 @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh?rev=1590837&r1=1590836&r2=1590837&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh (original) +++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh Mon Apr 28 23:21:26 2014 @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with
