svn commit: r766239 - in /ofbiz/trunk/debian: ofbiz-framework.config ofbiz-framework.postinst ofbiz-framework.templates

[doogie-3]

Author: doogie
Date: Sat Apr 18 06:22:23 2009
New Revision: 766239

URL: http://svn.apache.org/viewvc?rev=766239&view=rev
Log:
No longer find and change the default ofbiz test email and admin
login password.

Modified:
    ofbiz/trunk/debian/ofbiz-framework.config
    ofbiz/trunk/debian/ofbiz-framework.postinst
    ofbiz/trunk/debian/ofbiz-framework.templates

Modified: ofbiz/trunk/debian/ofbiz-framework.config
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/ofbiz-framework.config?rev=766239&r1=766238&r2=766239&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.config (original)
+++ ofbiz/trunk/debian/ofbiz-framework.config Sat Apr 18 06:22:23 2009
@@ -47,9 +47,6 @@
 }
 ofbiz_admin_port="10523"
 #env LANG=C LC_ALL=C sed -n -e 's/[^[:alnum:]]//g;p;q' < /dev/urandom | cut -b1-12
-if set_if ofbiz/admin-password-encrypted "$ofbiz_admin_password_encrypted"; then
- db_fset ofbiz/admin-password-encrypted seen true
-fi
 #db_set ofbiz/admin-password ofbiz || true
 set_if ofbiz/admin-user "$ofbiz_admin_user" || true
 set_if ofbiz/admin-port "$ofbiz_admin_port" || true
@@ -69,46 +66,10 @@
  exit 9
  ;;
 esac
-seen_admin_password_prompt="false"
-db_fget ofbiz/admin-password seen && seen_admin_password_prompt="$RET"
 
 ofb_dc_admin_user() {
  db_input low ofbiz/admin-user || true
 }
-ofb_dc_admin_password() {
- db_input medium ofbiz/admin-password || true
-}
-ofb_dc_admin_password_check() {
- password=""
- db_get ofbiz/admin-password && password="$RET"
- if [ "z" = "z$password" ]; then
- if [ "$seen_admin_password_prompt" = "false" ]; then
- db_set ofbiz/admin-password "ofbiz"
- db_set ofbiz/password-confirmation "ofbiz"
- password="ofbiz"
- else
- db_input high ofbiz/empty-password-not-allowed || true
- NEXT=0
- fi
- else
- seen_admin_password_prompt="true"
- fi
-}
-ofb_dc_admin_password_confirm() {
- if [ "$seen_admin_password_prompt" = "true" ]; then
- db_input high ofbiz/password-confirmation || true
- fi
-}
-ofb_dc_admin_password_compare() {
- confirm=""
- db_get ofbiz/password-confirmation && confirm="$RET"
- if [ "$password" != "$confirm" ]; then
- db_input high ofbiz/mismatched-passwords || true
- NEXT=0
- db_set ofbiz/admin-password ''
- db_fset ofbiz/admin-password seen false
- fi
-}
 ofb_dc_import_question() {
  db_input low $import_question || true
 }
@@ -124,10 +85,6 @@
 declare -a ofb_dc_list
 ofb_dc_list=(
  ofb_dc_admin_user
- ofb_dc_admin_password
- ofb_dc_admin_password_check
- ofb_dc_admin_password_confirm
- ofb_dc_admin_password_compare
  ofb_dc_import_question
  ofb_dc_readers
  ofb_dc_admin_port

Modified: ofbiz/trunk/debian/ofbiz-framework.postinst
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/ofbiz-framework.postinst?rev=766239&r1=766238&r2=766239&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.postinst (original)
+++ ofbiz/trunk/debian/ofbiz-framework.postinst Sat Apr 18 06:22:23 2009
@@ -35,12 +35,6 @@
 fi
 JAVA="$JAVA_HOME/bin/java"
 
-encrypt_password() {
- (
- cd "$OFBIZ_HOME"
- "$JAVA" -classpath framework/base/build/lib/ofbiz-base.jar:framework/common/build/lib/ofbiz-common.jar:framework/base/config:framework/entity/build/lib/ofbiz-entity.jar:framework/base/lib/javolution.jar:framework/base/lib/commons/commons-collections.jar:framework/base/lib/jdbm.jar:framework/base/lib/log4j.jar:framework/security/config:support EncryptPassword "$1"
- )
-}
 munge_conffile() {
  tmp="$1"
  source="$2"
@@ -67,43 +61,10 @@
  extra=""
  : ofbiz_readers "$ofbiz_readers"
  : ofbiz_import_readers "$ofbiz_import_readers"
- : ofbiz_override_data "$ofbiz_override_data"
  if [ "$ofbiz_readers" ]; then
  if [ "$ofbiz_import_readers" ]; then
  extra="$extra -readers=\"$ofbiz_readers\""
  fi
- if [ "$ofbiz_override_data" ]; then
- trap 'rm -f "$tempfile1" "$tempfile2"' EXIT
- tempdir="$(mktemp -d)"
- chown ofbiz:ofbiz "$tempdir"
- trap 'rm -rf "$tempdir"' EXIT
- files=""
- {
- IFS="," set -- $ofbiz_readers
- while [ $# -gt 0 ]; do
- if true; then
- xalan -q \
- -param reader "'$1'" \
- -param password "'$ofbiz_password_encrypted'" \
- -param ofbizhome "'$OFBIZ_HOME'" \
- -xsl "$OFBIZ_HOME/support/override-data.xslt" \
- -in "$OFBIZ_HOME/framework/base/config/component-load.xml" \
- -out "$tempdir/reader-$1.xml"
- chown ofbiz:ofbiz "$tempdir/reader-$1.xml"
- fi
- if [ "$files" ]; then
- files="$files,$tempdir/reader-$1.xml"
- else
- files="$tempdir/reader-$1.xml"
- fi
- shift
- done
- }
- trap '' EXIT
- if [ "$files" ]; then
- extra="$extra -file=\"$files\""
- fi
- fi
  fi
  for file in "/var/lib/ofbiz/import/"*.xml; do
  if [ -e "$file" ]; then

Modified: ofbiz/trunk/debian/ofbiz-framework.templates
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/ofbiz-framework.templates?rev=766239&r1=766238&r2=766239&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.templates (original)
+++ ofbiz/trunk/debian/ofbiz-framework.templates Sat Apr 18 06:22:23 2009
@@ -6,30 +6,6 @@
  password will be 'ofbiz', and you will be prompted to change it
  after you log in the first time.
 
-Template: ofbiz/admin-password
-Type: password
-_Description: Enter the password for ofbiz admin accounts:
- If this is the first time installing ofbiz, you can leave this
- blank, and the default of 'ofbiz' will be choosen.
-
-Template: ofbiz/password-confirmation
-Type: password
-_Description: Password confirmation:
-
-Template: ofbiz/admin-password-encrypted
-Type: password
-_Description: for internal use
-
-Template: ofbiz/mismatched-passwords
-Type: note
-_Description: passwords do not match
- The passwords you have entered do not match.
-
-Template: ofbiz/empty-password-not-allowed
-Type: note
-_Description: empty password is not allowed
- The password you have entered is empty.  This is not allowed.
-
 Template: ofbiz/admin-port
 Type: string
 Default: 10523