XWIKI-1471: Make the XWiki build work with different databases

* Derby configuration error fixed



git-svn-id: https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-tools/trunk@3939 f329d543-caf0-0310-9063-dda96c69346f

xwiki-platform-tools/packager/src/it/basic-import-export/pom.xml

@@ -25,7 +25,7 @@
         </executions>
         <configuration>
           <resourceBundles>
-            <resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.1</resourceBundle>
+            <resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.2-SNAPSHOT</resourceBundle>
           </resourceBundles>
           <properties>
             <xwikiDbConnectionUrl>jdbc:hsqldb:mem:.</xwikiDbConnectionUrl>

xwiki-platform-tools/xwiki-configuration-resources/src/main/resources/hibernate.cfg.xml.vm

@@ -24,7 +24,7 @@
          database -->
 
     <property name="connection.url">$xwikiDbConnectionUrl</property>
-    <property name="connection.username">$xwikiDbConnectionUsername</property>
+    <property name="connection.username">$!xwikiDbConnectionUsername</property>
     <property name="connection.password">$!xwikiDbConnectionPassword</property>
     <property name="connection.driver_class">$xwikiDbConnectionDriverClass</property>
     <property name="dialect">$xwikiDbDialect</property>