Migrate infocenter to 3.5

releng/org.eclipse.rse.releng.infocenter/infocenter.sh

@@ -11,26 +11,28 @@
 #*******************************************************************************
 umask 022
 
-PATH=/opt/j2sdk1.4.2_12/bin:$PATH
+#PATH=/opt/j2sdk1.4.2_12/bin:$PATH
+PATH=/opt/JDKs/amd64/jdk1.6.0_11/bin:$PATH
 export PATH
 
-EHOME=/home/infocenter/eclipse3.2/eclipse
 if [ "$IHOME" = "" ]; then
   IHOME=/home/infocenter/latest
 fi
+EHOME=${IHOME}/eclipse/eclipse
+curdir=`pwd`
 
 if [ "$1" = "" -o "$1" = "help" ]; then
   echo "Usage: infocenter.sh [start|shutdown|addSite -from dir|apply]"
   exit 1
 fi
 
+HELP_PLUGIN=`ls $EHOME/plugins/org.eclipse.help.base_3.*.jar | sort | tail -1`
+
 java \
-  -classpath $EHOME/plugins/org.eclipse.help.base_3.2.0.v20060601.jar \
+  -classpath $HELP_PLUGIN \
   org.eclipse.help.standalone.Infocenter \
   -command $* \
   -eclipsehome $EHOME \
   -data $IHOME/workspace \
   -port 27127 \
-  -nl en -locales en \
+  -nl en -locales en
-  -configuration file://$IHOME/config 
-

releng/org.eclipse.rse.releng.infocenter/setup.sh

@@ -12,9 +12,19 @@
 umask 022
 
 curdir=`pwd`
-PATH=/opt/j2sdk1.4.2_12/bin:$PATH
+#PATH=/opt/j2sdk1.4.2_12/bin:$PATH
+PATH=/opt/JDKs/amd64/jdk1.6.0_11/bin:$PATH
 export PATH
 
+if [ "$IHOME" = "" ]; then
+  IHOME=/home/infocenter/latest
+fi
+# prepare the base Eclipse installation in folder "eclipse"
+ECL_DIR=$IHOME/eclipse
+ep_rel=S
+ep_ver=3.5M4
+ep_date=200812111908
+
 uname_s=`uname -s`
 uname_m=`uname -m`
 case ${uname_s}${uname_m} in
@@ -29,11 +39,6 @@ case ${uname_s}${uname_m} in
              ;;
 esac
 
-# prepare the base Eclipse installation in folder "eclipse"
-ECL_DIR=$HOME/eclipse3.5
-ep_rel=S
-ep_ver=3.5M4
-ep_date=200812111908
 P2_no_dropins=false
 if [ ! -f ${ECL_DIR}/eclipse/plugins/org.eclipse.swt_3.5.0.v3525.jar ]; then
   if [ ! -d ${ECL_DIR} ]; then
@@ -67,4 +72,4 @@ if [ ! -d "${ECL_DIR}/eclipse/plugins.disabled" ]; then
   cd "${ECL_DIR}/eclipse/plugins"
   mv org.eclipse.platform.doc.user_*.jar ../plugins.disabled
   cd "${curdir}"
-fi 
+fi 

releng/org.eclipse.rse.releng.infocenter/update.sh

@@ -15,6 +15,7 @@ id
 if [ "$IHOME" = "" ]; then
   IHOME=/home/infocenter/latest
 fi
+ECL_DIR=$IHOME/eclipse
 curdir=`pwd`
 NEED_RESTART=0
 
@@ -64,7 +65,7 @@ if [ -e dsdp-mtj-SDK-incubation-latest.zip ]; then
   rm -rf eclipse
   NUM=`ls plugins.tmp/*.jar | wc -l`
   echo "MTJ plugins.tmp: NUM=$NUM"
-  if [ "$NUM" = "2" ]; then
+  if [ "$NUM" = "2" -o "$NUM" = "1" ]; then
     echo "Doc plugins got successfully, installing from plugins.tmp into plugins..."
     if [ -e plugins ]; then 
       rm -rf plugins
@@ -82,21 +83,15 @@ if [ "$NEED_RESTART" != "0" ]; then
   $IHOME/bin/infocenter.sh shutdown
 
   echo "Deploying new plug-ins..."
-  ######################### Deploy RSE #############################
+  ######################### Deploy all #############################
-  rm $IHOME/plugins/rse/eclipse/plugins/*
+  for COMP in rse dd.dsf nab ercp mtj ; do
-  cp -p $IHOME/deploy/rse/plugins/* $IHOME/plugins/rse/eclipse/plugins/
+    if [ ! -d "$ECL_DIR/eclipse/dropins/${COMP}" ]; then
-  ####################### Deploy dd.dsf ############################
+      mkdir "$ECL_DIR/eclipse/dropins/${COMP}"
-  rm $IHOME/plugins/dd.dsf/eclipse/plugins/*
+    else
-  cp -p $IHOME/deploy/dd.dsf/plugins/* $IHOME/plugins/dd.dsf/eclipse/plugins/
+      rm -rf "$ECL_DIR/eclipse/dropins/${COMP}"/*
-  ####################### Deploy nab ###############################
+    fi
-  rm -rf $IHOME/plugins/nab/eclipse/plugins/*
+    cp -Rp $IHOME/deploy/${COMP}/plugins/* "$ECL_DIR/eclipse/dropins/${COMP}"/
-  cp -Rp $IHOME/deploy/nab/plugins/* $IHOME/plugins/nab/eclipse/plugins/
+  done 
-  ####################### Deploy ercp ##############################
-  rm -rf $IHOME/plugins/ercp/eclipse/plugins/*
-  cp -Rp $IHOME/deploy/ercp/*.jar $IHOME/plugins/ercp/eclipse/plugins/
-  ####################### Deploy ercp ##############################
-  rm -rf $IHOME/plugins/mtj/eclipse/plugins/*
-  cp -Rp $IHOME/deploy/mtj/plugins/*.jar $IHOME/plugins/mtj/eclipse/plugins/
   
   #TODO: not sure if we need to delete the old index to force re-indexing
   echo "Deleting old index..."