[Engine-patches] Change in ovirt-engine[master]: remove scripts dependencies on specific jar versions

[juan.hernandez at redhat.com]

Juan Hernandez has posted comments on this change.

Change subject: remove scripts dependencies on specific jar versions
......................................................................


Patch Set 1: (10 inline comments)

Find my comments inside.

I see a lot of places where we are using this classpath building logic. Maybe we should create a generic script for this (python better than bash probably).

....................................................
File backend/manager/conf/ca/generate-ssh-keys
Line 10: CLASS_PATH="${EAR_LIB}/engineencryptutils*.jar:${EAR_LIB}/engine-compat.jar:${JBOSS_HOME}/common/lib/commons-logging.jar:${EAR_LIB}/commons-codec-1.4.jar"
Maybe you could break this long line into separate lines:

CLASS_PATH="first.jar"
CLASS_PATH="${CLASS_PATH}:second.jar"
CLASS_PATH="${CLASS_PATH}:third.jar"

This makes it easier to read and to change.

You could also make it independent of the version of "commons-codec" as well.

....................................................
File backend/manager/conf/ca/store-utils.sh
Line 40: CP=$EAR_LIB/engineencryptutils*.jar:$EAR_LIB/engine-compat.jar:$JB_HOME/common/lib/commons-logging.jar:$EAR_LIB/commons-codec-1.4.jar
Same as before.

....................................................
File backend/manager/conf/kerberos/engine-manage-domains
Line 106: CP=$CONF_DIR:$JAVA_LIB_HOME/commons-logging.jar:$JAVA_LIB_HOME/commons-collections.jar:$JAVA_LIB_HOME/commons-lang.jar:$JAVA_LIB_HOME/commons-configuration.jar:$JAVA_LIB_HOME/commons-jxpath.jar:$JAVA_LIB_HOME/log4j.jar:$JAVA_LIB_HOME/commons-codec.jar:$JAVA_LIB_HOME/postgresql-jdbc.jar:$LOCAL_LIB/engine-compat.jar:$JAVA_LIB_HOME/engine-tools-common.jar:$ENGINE_LIB_PATH/engine-utils*.jar:$ENGINE_LIB_PATH/engine-common.jar:$ENGINE_LIB_PATH/spring-tx-2.5.6.SEC02.jar:$ENGINE_LIB_PATH/commons-lang-2.4.jar:$JAVA_LIB_HOME/spring2/beans-2.5.6.jar:$JAVA_LIB_HOME/spring2/core-2.5.6.jar:$ENGINE_LIB_PATH/spring-ldap-core-1.3.0.RELEASE.jar:$ENGINE_LIB_PATH/engineencryptutils*.jar
Please, break this really long line.

Also make it independent of the versions of all the jar files.

....................................................
File backend/manager/conf/kerberos/kerberosInstaller.sh
Line 44:     CLASSPATH=$JB_HOME/engine-utils*.jar:$JB_HOME/engine-compat.jar:$JB_HOME/commons-logging.jar
Break this line.

Line 49: 		CLASSPATH=$ENGINE_LIB_PATH/engine-utils*.jar:$ENGINE_LIB_PATH/engine-compat.jar:$JB_HOME/common/lib/commons-logging.jar		
And this one.

Line 51: 	    CLASSPATH=$JB_HOME/$EAR_LIB/engine-utils*.jar:$JB_HOME/$EAR_LIB/engine-compat.jar:$JB_HOME/common/lib/commons-logging.jar
And this one as well.

....................................................
File backend/manager/conf/kerberos/kerberosUpdater.sh
Line 43:     CLASSPATH=$JB_HOME/engine-utils*.jar:$JB_HOME/engine-compat.jar:$JB_HOME/commons-logging.jar:$JB_HOME/sqljdbc4.jar:$JB_HOME/engineencryptutils*.jar:$JB_HOME/commons-codec-1.4.jar
Break the line.

Make independent of the version of "commons-codec" as well.

Why is sqljdbc4.jar needed here? That is only needed for SQL Server as far as I undestand.

Line 45:     CLASSPATH=$JB_HOME/$EAR_LIB/engine-utils*.jar:$JB_HOME/$EAR_LIB/engine-compat.jar:$JB_HOME/common/lib/commons-logging.jar:$JB_HOME/common/lib/sqljdbc4.jar:$JB_HOME/$EAR_LIB/engineencryptutils*.jar:$JB_HOME/$EAR_LIB/commons-codec-1.4.jar
Same that before.

....................................................
File backend/manager/conf/kerberos/kerberos-util.sh
Line 40: CP=$EAR_LIB/engine-utils*.jar:$EAR_LIB/engine-compat.jar:$JB_HOME/common/lib/commons-logging.jar
Same as before.

....................................................
File backend/manager/tools/engine-config/src/main/resources/engine-config
Line 95: CP=$JAVA_LIB_HOME/commons-logging.jar:$JAVA_LIB_HOME/commons-collections.jar:$JAVA_LIB_HOME/commons-lang.jar:$JAVA_LIB_HOME/commons-configuration.jar:$JAVA_LIB_HOME/commons-jxpath.jar:$JAVA_LIB_HOME/log4j.jar:$JAVA_LIB_HOME/commons-codec.jar:$JAVA_LIB_HOME/postgresql-jdbc.jar:$LOCAL_LIB/engineencryptutils*.jar:$LOCAL_LIB/engine-compat.jar:$LOCAL_LIB/engine-config.jar:$JAVA_LIB_HOME/engine-tools-common.jar
Break the line.

--
To view, visit http://gerrit.ovirt.org/837
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib1dc9733159cf9a542c3846e3e304216d5fc34d5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgolan at redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck at redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib at redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan at redhat.com>
Gerrit-Reviewer: Yaniv Kaul <ykaul at redhat.com>