--- branches/magellan-next/include/java.sminc	2012/01/04 13:08:10	9667
+++ branches/R11-unstable/include/java.sminc	2014/11/25 02:21:44	24893
@@ -4,7 +4,7 @@
 
 JAVA_CLASSPATH_DIR="/usr/share/java"
 
-jar-path-from-classpath()
+mget-jar-path-from-classpath()
 {
 	local jar="$1"
 	local i
@@ -17,6 +17,13 @@
 	done
 }
 
+# deprecated and will be dropped in near future
+jar-path-from-classpath()
+{
+	echo -e "${COLYELLOW}Warning: jar-path-from-classpath() is depcrecated, please use mget-jar-path-from-classpath() instead${COLDEFAULT}" >&2
+	mget-jar-path-from-classpath $@
+}
+
 mclasspathinit()
 {
 	minstalldir /etc/env.d || die
@@ -30,6 +37,7 @@
 {
 	local files
 	local jar
+	local jarbase
 
 	files="$@"
 
@@ -42,8 +50,9 @@
 
 	for jar in ${files}
 	do
-		minstallfile ${jar} /usr/share/${PNAME}-${PVER}/lib || die
-		maddconfig "CLASSPATH=/usr/share/${PNAME}-${PVER}/lib/${jar}" || die
+		jarbase="$(basename ${jar})"
+		minstallfile ${jar} /usr/share/${PNAME}-${PVER}/lib/${jarbase} || die
+		maddconfig "CLASSPATH=/usr/share/${PNAME}-${PVER}/lib/${jarbase}" || die
 	done
 }
 
@@ -51,11 +60,15 @@
 {
 	local files
 	local jar
+	local jarbase
 
 	files="$@"
 
+	minstalldir ${JAVA_CLASSPATH_DIR} || die
 	for jar in ${files}
 	do
-		minstallfile ${jar} ${JAVA_CLASSPATH_DIR} || die
+		jarbase="$(basename ${jar} .jar)"
+		minstallfile ${jar} ${JAVA_CLASSPATH_DIR}/${jarbase}-${PVER}.jar || die
+		mlink ${jarbase}-${PVER}.jar ${JAVA_CLASSPATH_DIR}/${jarbase}.jar || die
 	done
 }