--- branches/magellan-next/include/java.sminc	2012/01/03 22:09:42	9644
+++ trunk/include/java.sminc	2014/04/03 23:09:35	22418
@@ -2,7 +2,9 @@
 
 sminclude mtools
 
-jar-path-from-classpath()
+JAVA_CLASSPATH_DIR="/usr/share/java"
+
+mget-jar-path-from-classpath()
 {
 	local jar="$1"
 	local i
@@ -15,10 +17,27 @@
 	done
 }
 
-minstalljar()
+# 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
+
+	# classpath env
+	MCONFIG="/etc/env.d/22java-app-${PNAME}"
+	mclearconfig || die
+}
+
+minstalljar-classpath()
 {
 	local files
 	local jar
+	local jarbase
 
 	files="$@"
 
@@ -31,7 +50,25 @@
 
 	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
+}
+
+minstalljar()
+{
+	local files
+	local jar
+	local jarbase
+
+	files="$@"
+
+	minstalldir ${JAVA_CLASSPATH_DIR} || die
+	for jar in ${files}
+	do
+		jarbase="$(basename ${jar} .jar)"
+		minstallfile ${jar} ${JAVA_CLASSPATH_DIR}/${jarbase}-${PVER}.jar || die
+		mlink ${jarbase}-${PVER}.jar ${JAVA_CLASSPATH_DIR}/${jarbase}.jar || die
 	done
 }