Updated Branches: refs/heads/noa/packaging_rpm_fixes 734b877cf -> 451e63811 (forced update)
Revert classpath.conf.in to before .deb packaing merge This change is apparently incompatible with the centos packaging, temporarily reverting until we have discussed a proper fix Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/451e6381 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/451e6381 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/451e6381 Branch: refs/heads/noa/packaging_rpm_fixes Commit: 451e638114b0d3a4137bdf3d27e605620c388659 Parents: 306f910 Author: Noa Resare <[email protected]> Authored: Thu Feb 28 13:16:16 2013 +0000 Committer: Noa Resare <[email protected]> Committed: Thu Feb 28 14:55:11 2013 +0000 ---------------------------------------------------------------------- client/tomcatconf/classpath.conf.in | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/451e6381/client/tomcatconf/classpath.conf.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in index 5625f69..3ae0fb4 100644 --- a/client/tomcatconf/classpath.conf.in +++ b/client/tomcatconf/classpath.conf.in @@ -16,11 +16,23 @@ # specific language governing permissions and limitations # under the License. -# We use WEB-INF/lib in the webapp for including things into -# the classpath nowdays - -for jar in /usr/share/tomcat6/lib/*.jar; do - CLASSPATH=$jar:$CLASSPATH +SYSTEMJARS="@SYSTEMJARS@" +SCP=$(build-classpath $SYSTEMJARS 2>/dev/null) ; if [ $? != 0 ] ; then export SCP="@SYSTEMCLASSPATH@" ; fi +MCP="@MSCLASSPATH@" +DCP="@DEPSCLASSPATH@" +CLASSPATH=$SCP:$DCP:$MCP:@MSCONF@:@SETUPDATADIR@ +for jarfile in "@PREMIUMJAVADIR@"/* ; do + if [ ! -e "$jarfile" ] ; then continue ; fi + CLASSPATH=$jarfile:$CLASSPATH +done +for plugin in "@PLUGINJAVADIR@"/* ; do + if [ ! -e "$plugin" ] ; then continue ; fi + CLASSPATH=$plugin:$CLASSPATH +done +for vendorconf in "@MSCONF@"/vendor/* ; do + if [ ! -d "$vendorconf" ] ; then continue ; fi + CLASSPATH=$vendorconf:$CLASSPATH done -CLASSPATH=${CLASSPATH}/usr/share/cloudstack-management/webapps/client/WEB-INF/lib/mysql-connector-java-5.1.21.jar export CLASSPATH +PATH=/sbin:/usr/sbin:$PATH +export PATH
