svn commit: r1591291 - in /tomee/tomee/trunk/tomee/tomee-deb/src/main: groovy/org/apache/tomee/deb/PackageBuilder.groovy resources/control/postinst.sh resources/tomee_xml.template

[tv...@apache.org]

Author: tveronezi
Date: Wed Apr 30 13:23:46 2014
New Revision: 1591291

URL: http://svn.apache.org/r1591291
Log:
Using "tomee.xml" instead of hacking "openejb.conf" for configuring the default datasource.

Added:
    tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/tomee_xml.template
Modified:
    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

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=1591291&r1=1591290&r2=1591291&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 Wed Apr 30 13:23:46 2014
@@ -263,7 +263,10 @@ 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)
+        }
+        new File(homeConf, 'tomee.xml').withWriter { BufferedWriter out ->
+            def data = this.class.getResource('/tomee_xml.template').text
             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=1591291&r1=1591290&r2=1591291&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 Wed Apr 30 13:23:46 2014
@@ -22,6 +22,7 @@ ln -sf /var/log/tomee-${classifier} /var
 ln -sf /etc/tomee-${classifier}/server.xml /var/lib/tomee-${classifier}/conf/server.xml
 ln -sf /etc/tomee-${classifier}/tomcat-users.xml /var/lib/tomee-${classifier}/conf/tomcat-users.xml
 ln -sf /etc/tomee-${classifier}/openejb.conf /var/lib/tomee-${classifier}/conf/openejb.conf
+ln -sf /etc/tomee-${classifier}/tomee.xml /var/lib/tomee-${classifier}/conf/tomee.xml
 ln -sf /etc/tomee-${classifier}/conf.d /var/lib/tomee-${classifier}/conf/conf.d
 
 groupadd apachetomee || true

Added: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/tomee_xml.template
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/tomee_xml.template?rev=1591291&view=auto
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/tomee_xml.template (added)
+++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/tomee_xml.template Wed Apr 30 13:23:46 2014
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<tomee>
+    <Resource id="My DataSource" type="DataSource">
+      JdbcDriver org.hsqldb.jdbcDriver
+      JdbcUrl jdbc:hsqldb:file:temp/data/hsqldb/hsqldb
+      UserName sa
+      Password
+      JtaManaged true
+    </Resource>
+
+    <Resource id="My Unmanaged DataSource" type="DataSource">
+      JdbcDriver org.hsqldb.jdbcDriver
+      JdbcUrl jdbc:hsqldb:file:temp/data/hsqldb/hsqldb
+      UserName sa
+      Password
+      JtaManaged false
+    </Resource>
+</tomee>
\ No newline at end of file