Author: osallou-guest
Date: 2011-09-14 11:42:11 +0000 (Wed, 14 Sep 2011)
New Revision: 7790
Modified:
trunk/packages/biomaj/trunk/debian/patches/removeSqlToolDependency
trunk/packages/biomaj/trunk/debian/postinst
Log:
update sql patch, remove unnecessary params from postins
Modified: trunk/packages/biomaj/trunk/debian/patches/removeSqlToolDependency
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/removeSqlToolDependency 2011-09-14 10:57:00 UTC (rev 7789)
+++ trunk/packages/biomaj/trunk/debian/patches/removeSqlToolDependency 2011-09-14 11:42:11 UTC (rev 7790)
@@ -46,10 +46,11 @@
import org.inria.biomaj.singleton.BiomajLogger;
import org.inria.biomaj.utils.BiomajConst;
import org.inria.biomaj.utils.BiomajUtils;
-@@ -131,156 +129,7 @@
+@@ -130,156 +128,6 @@
+ */
@Override
public boolean createDB(String adminLogin, String adminPasswd, String adminMail) {
-
+-
- Statement statement = getStatement();
- try {
-
@@ -127,7 +128,7 @@
- MessageDigest digest;
- try {
- digest = MessageDigest.getInstance("SHA1");
-- digest.update(passwd.getBytes());
+- digest.update(adminPasswd.getBytes());
- byte[] hashedPasswd = digest.digest();
- hash = BiomajUtils.getHexString(hashedPasswd);
- } catch (NoSuchAlgorithmException e) {
@@ -199,11 +200,9 @@
- e.printStackTrace();
- return false;
- }
-- return true;
-+ return false;
+ return true;
}
- private void writeFileVersion(String name) throws IOException {
--- a/usr/share/biomaj/src/org/inria/biomaj/sql/TestConnection.java
+++ b/usr/share/biomaj/src/org/inria/biomaj/sql/TestConnection.java
@@ -16,8 +16,6 @@
@@ -215,10 +214,11 @@
import org.inria.biomaj.singleton.BiomajLogger;
import org.inria.biomaj.utils.BiomajUtils;
-@@ -61,132 +59,7 @@
+@@ -60,132 +58,6 @@
+ */
@Override
public boolean createDB(String adminLogin, String adminPasswd, String adminMail) {
-
+-
- Statement statement = getStatement();
- try {
-
@@ -273,7 +273,7 @@
- MessageDigest digest;
- try {
- digest = MessageDigest.getInstance("SHA1");
-- digest.update(passwd.getBytes());
+- digest.update(adminPasswd.getBytes());
- byte[] hashedPasswd = digest.digest();
- hash = BiomajUtils.getHexString(hashedPasswd);
- } catch (NoSuchAlgorithmException e) {
@@ -344,8 +344,6 @@
- e.printStackTrace();
- return false;
- }
-- return true;
-+ return false;
+ return true;
}
- private Connection getConnection() {
Modified: trunk/packages/biomaj/trunk/debian/postinst
===================================================================
--- trunk/packages/biomaj/trunk/debian/postinst 2011-09-14 10:57:00 UTC (rev 7789)
+++ trunk/packages/biomaj/trunk/debian/postinst 2011-09-14 11:42:11 UTC (rev 7790)
@@ -22,7 +22,7 @@
cd $biomaj_root
- java -cp $biomaj_root/bin Configurator java_home:=$jdk_home ant_home:=$ant_home biomaj_root:=$biomaj_root use_ldap:=$use_ldap ldap_host:=$ldap_host ldap_dn:=$ldap_dn opt_filter:=$opt_filter db_type:=$db_type db_url:=$db_url db_login:=$db_login db_passwd:=$db_passwd app_login:=$app_login app_passwd:=$app_passwd tomcat_port:=$tomcat_port
+ java -cp $biomaj_root/bin Configurator java_home:=$jdk_home ant_home:=$ant_home biomaj_root:=$biomaj_root db_type:=$db_type db_url:=$db_url db_login:=$db_login db_passwd:=$db_passwd
if [ ! -e /usr/share/biomaj/sql/migration ]; then
ln -s /var/lib/biomaj/migration /usr/share/biomaj/sql/migration