Menu
▾
▴
openqrm-cvs — openQRM cvs commits mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(886) |
Apr
(141) |
May
(30) |
Jun
(86) |
Jul
(23) |
Aug
(33) |
Sep
|
Oct
(21) |
Nov
(30) |
Dec
(811) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(184) |
Feb
(137) |
Mar
(519) |
Apr
(1298) |
May
(180) |
Jun
(71) |
Jul
(35) |
Aug
(90) |
Sep
(48) |
Oct
(86) |
Nov
(159) |
Dec
(55) |
| 2009 |
Jan
(57) |
Feb
(60) |
Mar
(53) |
Apr
(43) |
May
(32) |
Jun
(89) |
Jul
(83) |
Aug
(47) |
Sep
(74) |
Oct
(88) |
Nov
(72) |
Dec
(56) |
| 2010 |
Jan
(33) |
Feb
(20) |
Mar
(17) |
Apr
|
May
(3) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(66) |
Oct
(16) |
Nov
(6) |
Dec
(11) |
| 2011 |
Jan
(6) |
Feb
|
Mar
(49) |
Apr
(5) |
May
(1) |
Jun
(2) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(62) |
Nov
(4) |
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(81) |
Sep
(4) |
Oct
(3) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(8) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(33) |
Jun
(8) |
Jul
|
Aug
|
Sep
(76) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
(17) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
|
2
|
3
|
4
|
5
(4) |
|
6
|
7
|
8
|
9
|
10
|
11
|
12
|
|
13
|
14
(8) |
15
|
16
|
17
|
18
|
19
|
|
20
|
21
(6) |
22
(10) |
23
(2) |
24
|
25
|
26
|
|
27
|
28
|
29
|
30
|
31
|
|
|
|
From: Matt <mat...@us...> - 2007-05-23 13:01:01
|
Update of /cvsroot/openqrm/plugins/xen In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15607/plugins/xen Modified Files: Makefile Log Message: packaging only the xen/dist dir Index: Makefile =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 23 May 2007 12:22:24 -0000 1.4 --- Makefile 23 May 2007 13:00:54 -0000 1.5 *************** *** 158,162 **** # creating the plugin + xen-install packages @mkdir -p $(OUTDIR)/qrm/plugins/xen/packages ! @tar -C $(QRM_CACHE_DIR)/ -czf $(OUTDIR)/qrm/plugins/xen/packages/xen-install.tgz xen/ /bin/cp -f $(QRM_CACHE_DIR)/veth/*/veth/vethd $(OUTDIR)/qrm/plugins/xen/sbin/ @tar -C $(OUTDIR)/qrm/ --exclude CVS --exclude Makefile -czf $(OUTDIR)/qrm/plugins/xen/packages/xen-plugin.tgz plugins/xen/include plugins/xen/etc plugins/xen/bin plugins/xen/sbin --- 158,162 ---- # creating the plugin + xen-install packages @mkdir -p $(OUTDIR)/qrm/plugins/xen/packages ! @tar -C $(QRM_CACHE_DIR)/ -czf $(OUTDIR)/qrm/plugins/xen/packages/xen-install.tgz xen/dist /bin/cp -f $(QRM_CACHE_DIR)/veth/*/veth/vethd $(OUTDIR)/qrm/plugins/xen/sbin/ @tar -C $(OUTDIR)/qrm/ --exclude CVS --exclude Makefile -czf $(OUTDIR)/qrm/plugins/xen/packages/xen-plugin.tgz plugins/xen/include plugins/xen/etc plugins/xen/bin plugins/xen/sbin |
|
From: Matt <mat...@us...> - 2007-05-23 12:22:33
|
Update of /cvsroot/openqrm/plugins/xen In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32512/plugins/xen Modified Files: Makefile Log Message: fixed jta.jar download Index: Makefile =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 22 May 2007 12:50:11 -0000 1.3 --- Makefile 23 May 2007 12:22:24 -0000 1.4 *************** *** 184,188 **** java-term: ! $(SOURCE_ROOT)/make_helper build_package $(PACKAGE_CONFIG_FILE_JAVATERM) clean: check --- 184,191 ---- java-term: ! @if [ ! -f `. $(PACKAGE_CONFIG_FILE_JAVATERM) && $(SOURCE_ROOT)/make_helper qrm_cache $$FILE $$SOURCE` ]; then \ ! @echo "ERROR: "; \ ! exit 1; \ ! fi clean: check |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:40
|
Update of /cvsroot/openqrm/plugins/xen/web In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12704/plugins/xen/web Modified Files: xenconfig_int.jsp Log Message: removed Index: xenconfig_int.jsp =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/web/xenconfig_int.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xenconfig_int.jsp 9 Mar 2007 09:21:32 -0000 1.1 --- xenconfig_int.jsp 22 May 2007 12:50:38 -0000 1.2 *************** *** 102,105 **** --- 102,134 ---- </iframe> + + <% } else if(state.equals("4")) { %> + + <iframe + scrolling="auto" + marginwidth="0" + marginheight="0" + frameborder="0" + vspace="0" hspace="0" + width="100%" + height="100%" + src="${xen_config}"> + </iframe> + + + <% } else if(state.equals("2")) { %> + + <iframe + scrolling="auto" + marginwidth="0" + marginheight="0" + frameborder="0" + vspace="0" hspace="0" + width="100%" + height="100%" + src="${xen_config}"> + </iframe> + + <% } else if(state.equals("1")) { %> |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:17
|
Update of /cvsroot/openqrm/plugins/xen/build In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12318/plugins/xen/build Added Files: javaterm.conf Log Message: added a Xen-console accessible via the web-interface --- NEW FILE: javaterm.conf --- ################################################################################ # # # The contents of this file are subject to the Qlusters Public License # Version 1.1 (the License); you may not use this file except in compliance # with the License. # You may obtain a copy of the License at # http://www.openqrm.org/content/view/33/69/. # # Software distributed under the License is distributed on an AS IS basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for # the specific language governing rights and limitations under the License. # # The Original Code is openQRM. # # The Initial Developer of the Original Code is Qlusters Corporation. Portions # created by Qlusters Corporation are Copyright (C) 2003-2006. All Rights # Reserved. # # Contributor(s): # # Description: # # Comments: ################################################################################ #conf PACKAGE_NAME="javaterm" PACKAGE_VERSION="26" PACKAGE_MODE="source" # source, binary, userctl BINS="" FILE="jta$PACKAGE_VERSION.jar" # urls SOURCE="http://javassh.org/download/$FILE?" BINARY_REDHAT_73_i686="" BINARY_REDHAT_9_i686="" BINARY_REDHAT_AS3_i686="" BINARY_REDHAT_AS3_i686="" BINARY_FEDORA_CORE3_i686="" BINARY_FEDORA_CORE4_i686="" BINARY_SUSE_91_i686="" BINARY_SUSE_92_i686="" |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:15
|
Update of /cvsroot/openqrm/plugins/xen/include In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12318/plugins/xen/include Modified Files: xen-functions Log Message: added a Xen-console accessible via the web-interface Index: xen-functions =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/include/xen-functions,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xen-functions 9 Mar 2007 09:22:13 -0000 1.1 --- xen-functions 22 May 2007 12:50:12 -0000 1.2 *************** *** 145,149 **** # web-content mkdir -p $QRM_SERVER_BASE_DIR/qrm/usr/tomcat/webapps/ROOT/unsecure/xen/web/ ! /bin/cp -f $QRM_PLUGIN_BASE_DIR/web/* $QRM_SERVER_BASE_DIR/qrm/usr/tomcat/webapps/ROOT/unsecure/xen/web/ # link the jar to the tomcat lib dir -> NOTICE: this will cause the server to restart --- 145,149 ---- # web-content mkdir -p $QRM_SERVER_BASE_DIR/qrm/usr/tomcat/webapps/ROOT/unsecure/xen/web/ ! /bin/cp -aRf $QRM_PLUGIN_BASE_DIR/web/* $QRM_SERVER_BASE_DIR/qrm/usr/tomcat/webapps/ROOT/unsecure/xen/web/ # link the jar to the tomcat lib dir -> NOTICE: this will cause the server to restart |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:15
|
Update of /cvsroot/openqrm/plugins/xen/web In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12318/plugins/xen/web Modified Files: xenconfig_int_content.jsp Log Message: added a Xen-console accessible via the web-interface Index: xenconfig_int_content.jsp =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/web/xenconfig_int_content.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xenconfig_int_content.jsp 9 Mar 2007 09:21:32 -0000 1.1 --- xenconfig_int_content.jsp 22 May 2007 12:50:12 -0000 1.2 *************** *** 64,67 **** --- 64,74 ---- // out.print("partition memory = " + Long.toString(partition.getMemory()) + "<br>"); + // get some infos for the console access + Integer internalId_host = partition.getHostingVem(); + ComputeResourceData xenhost = ApiServicesLocator.getInstance().getResourcesServices().getResource(internalId_host); + Integer partition_console_port = internalId + 9000; + // out.print("xen host ip = " + xenhost.getIpString() + "<br>"); + // out.print("partition id = " + partition_console_port + "<br>"); + // get the list of resource available to migrate to ComputeResourceFilterData allfilter = new ComputeResourceFilterData(); *************** *** 148,151 **** --- 155,220 ---- + <% + // rebooting + } else if(state_str.equals("4")) { %> + + + <h2>Partition Console</h2> + <form action="/unsecure/xen/web/console/xenconsole_int.jsp" method="get"> + <input name="resource_ip" value="<%= xenhost.getIpString() %>" type="hidden"> + <input name="resource_port" value="<%= partition_console_port %>" type="hidden"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr><td width="90%" valign="top"> + <fieldset> + <legend>Access</legend> + + <table width="100%" border="0" cellspacing="0" cellpadding="1" class="dataTable"> + <tr> + <td><nobr> + <input value="open console" type="submit"> + </nobr></td> + <td></td> + <td></td> + </tr> + </table> + </form> + + + </fieldset> + </td></tr> + </table> + + + <% + // off / starting + } else if(state_str.equals("2")) { %> + + + <h2>Partition Console</h2> + <form action="/unsecure/xen/web/console/xenconsole_int.jsp" method="get"> + <input name="resource_ip" value="<%= xenhost.getIpString() %>" type="hidden"> + <input name="resource_port" value="<%= partition_console_port %>" type="hidden"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr><td width="90%" valign="top"> + <fieldset> + <legend>Access</legend> + + <table width="100%" border="0" cellspacing="0" cellpadding="1" class="dataTable"> + <tr> + <td><nobr> + <input value="open console" type="submit"> + </nobr></td> + <td></td> + <td></td> + </tr> + </table> + </form> + + + </fieldset> + </td></tr> + </table> + + <% } else { %> *************** *** 328,331 **** --- 397,430 ---- + + + <h2>Partition Console</h2> + <form action="/unsecure/xen/web/console/xenconsole_int.jsp" method="get"> + <input name="resource_ip" value="<%= xenhost.getIpString() %>" type="hidden"> + <input name="resource_port" value="<%= partition_console_port %>" type="hidden"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr><td width="90%" valign="top"> + <fieldset> + <legend>Access</legend> + + <table width="100%" border="0" cellspacing="0" cellpadding="1" class="dataTable"> + <tr> + <td><nobr> + <input value="open console" type="submit"> + </nobr></td> + <td></td> + <td></td> + </tr> + </table> + </form> + + + </fieldset> + </td></tr> + </table> + + + + <% } %> |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:15
|
Update of /cvsroot/openqrm/plugins/xen/doc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12318/plugins/xen/doc Modified Files: README.txt Changelog Log Message: added a Xen-console accessible via the web-interface Index: README.txt =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/doc/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README.txt 9 Mar 2007 09:22:26 -0000 1.1 --- README.txt 22 May 2007 12:50:12 -0000 1.2 *************** *** 195,198 **** --- 195,200 ---- - dhclient + + - xinetd -> for the Xen-console access PS: These components are not required on the openQRM-server but rather on *************** *** 333,336 **** --- 335,351 ---- the new destination Xen-host from the pull-down menu and click on "Go!". + + Xen-console for the partitions on the Xen-host : + + Via the Xen-partition configuration page the conslole of each partition is accessible. + Please notice that the console may need a few seconds to connect after pressing ENTER. + Also please notice that the Xen-console ports are managed by xinetd on the Xen-host. + To be able to use the Xen-console the "xinetd" package must be installed on the + Xen-host filesystem-image. The Xen-console ports are setup and connected during + the "start" event of the partitions and may involve an updated of the xinetd config file + for the partition on the Xen-host. + Known issue for the Xen-console is that the "reboot" event of a partition causes it to + get a new Xen-id. This may cause the Xen-console to a wrong Xen-partition id. + In this case plese stop and re-start the partition to update the xinetd configuration ! Index: Changelog =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/doc/Changelog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Changelog 21 May 2007 13:41:18 -0000 1.4 --- Changelog 22 May 2007 12:50:12 -0000 1.5 *************** *** 32,35 **** --- 32,38 ---- - updated Xen to 3.1 + - updated open-iscsi for the Xen-boot-image to version 2.0-711 + - disabled extra LSI-modules + - added a Xen-console accessible via the Web-interface |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:15
|
Update of /cvsroot/openqrm/plugins/xen/main/code/java/com/qlusters/qrm/plugins/partitioning/xen In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12318/plugins/xen/main/code/java/com/qlusters/qrm/plugins/partitioning/xen Modified Files: RebootPartitionCommand.java Log Message: added a Xen-console accessible via the web-interface Index: RebootPartitionCommand.java =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/main/code/java/com/qlusters/qrm/plugins/partitioning/xen/RebootPartitionCommand.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RebootPartitionCommand.java 9 Mar 2007 09:21:28 -0000 1.1 --- RebootPartitionCommand.java 22 May 2007 12:50:13 -0000 1.2 *************** *** 39,43 **** private static final String rebootPartition = Prefs.getPrefs() .getString( ! ShutdownPartitionCommand.class, "rebootPartition", /* xenControlScript + "reset -m ${" + MAC + "} -s ${" + STORAGE --- 39,43 ---- private static final String rebootPartition = Prefs.getPrefs() .getString( ! RebootPartitionCommand.class, "rebootPartition", /* xenControlScript + "reset -m ${" + MAC + "} -s ${" + STORAGE |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:14
|
Update of /cvsroot/openqrm/plugins/xen/bin In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12318/plugins/xen/bin Modified Files: qrm-xen-manage Log Message: added a Xen-console accessible via the web-interface Index: qrm-xen-manage =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/bin/qrm-xen-manage,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** qrm-xen-manage 9 Mar 2007 09:22:05 -0000 1.1 --- qrm-xen-manage 22 May 2007 12:50:12 -0000 1.2 *************** *** 42,45 **** --- 42,46 ---- XEN_HOST_VE_ID=$CR_VIRTUAL_ENVIRONMENT_ID XEN_HOST_RESOURE_ID=$CR_ID + XENCONSOLE_BASE_PORT=9000 *************** *** 169,173 **** # return: vm_id function xen_get_vm_id() { ! xen_list | grep -w ^$1 | awk {' print $2 '} } --- 170,174 ---- # return: vm_id function xen_get_vm_id() { ! $XEN_CMD list | grep -v VCPUs | grep -v Domain-0 | grep -w ^$1 | awk {' print $2 '} } *************** *** 322,325 **** --- 323,389 ---- + function xen_setup_xinetd() { + # this function start with sleeping for some time allow + # the starting partition to be added to "xm list" + sleep 10 + + # this functions sets up xinetd for the xen-console + if [ ! -f "$PARTITION_PARAMETER_FILE" ]; then + xen_log xen-setup-xinetd "ERROR No parameter file for partition $PARTITION_MAC" + return 1 + else + # source the partition parameter file to get its config + . $PARTITION_PARAMETER_FILE + fi + + while (true); do + export PARTITION_NEW_ID=`xen_get_vm_id $PARTITION_MAC` + if [ "$PARTITION_NEW_ID" != "" ]; then + break + fi + if [ "$IDLOOP" == "6" ]; then + xen_log xen-setup-xinetd "ERROR Max-loop reached ! Could not get Xen-id of the partition $PARTITION_MAC" + xen_log xen-setup-xinetd "ERROR Maybe it did not start correctly ? (pls check 'xm list'" + return 1 + fi + IDLOOP=$(( IDLOOP + 1 )) + xen_log xen-setup-xinetd "NOTICE: Looping on Partition $PARTITION_MAC to get a new Xen-id ...($IDLOOP)" + sleep 10 + done + xen_log xen-setup-xinetd "NOTICE: Partition $PARTITION_MAC starting with Xen-id $PARTITION_NEW_ID" + + # creating the conf file + XENCONSOLE_PORT=$(( XENCONSOLE_BASE_PORT + CR_ID )) + + # aquire the lock + xen_lock aquire + + cat > /etc/xinetd.d/xen$CR_ID << EOF + # xen-console for partition $CR_ID / $PARTITION_MAC + service xen$CR_ID + { + # disable = yes + type = UNLISTED + socket_type = stream + protocol = tcp + user = root + wait = no + port = $XENCONSOLE_PORT + server = /usr/sbin/xm + server_args = console $PARTITION_NEW_ID + } + + EOF + + # reloading xinetd + /etc/init.d/xinetd reload & + + # release the lock + xen_lock release + + } + + + function xen_start() { local RET=1 *************** *** 343,346 **** --- 407,420 ---- xen_lock release + # configure xinetd for the Xen-console + # may need to loop a bit until the parition gets available in "xm list" + # does not need to be running in the lock because it locks itself + if [ -x /etc/init.d/xinetd ]; then + xen_log xen-start "NOTICE: Found xinetd, setting up the xen-console for $PARTITION_CONFIG_FILE" + xen_setup_xinetd + else + xen_log xen-start "NOTICE: Xinetd not installed, skipping set up of the xen-console for $PARTITION_CONFIG_FILE" + fi + return 0 fi *************** *** 379,382 **** --- 453,465 ---- xen_send_off_event $CR_ID + sleep 10 + if [ -x /etc/init.d/xinetd ]; then + xen_log xen-stop "NOTICE: Found xinetd, setting up the xen-console for $PARTITION_CONFIG_FILE" + xen_setup_xinetd + else + xen_log xen-stop "NOTICE: Xinetd not installed, skipping set up of the xen-console for $PARTITION_CONFIG_FILE" + fi + + # release the lock xen_lock release *************** *** 409,412 **** --- 492,518 ---- xen_stop shutdown xen_log remove "NOTICE Removing partition $PARTITION_MAC" + + if [ -f "$PARTITION_PARAMETER_FILE" ]; then + # source the partition parameter file to get its config + . $PARTITION_PARAMETER_FILE + + # remove eventual xinetd setup + if [ -x /etc/init.d/xinetd ]; then + xen_log xen-remove "NOTICE: Found xinetd, removing set-up the xen-console for $PARTITION_CONFIG_FILE" + /bin/rm -f /etc/xinetd.d/xen$CR_ID + + # aquire the lock + xen_lock aquire + + # reloading xinetd + /etc/init.d/xinetd reload & + + # release the lock + xen_lock release + fi + + fi + + /bin/rm -f $PARTITION_CONFIG_FILE /bin/rm -f $XEN_PARTITION_DIR/$PARTITION_MAC/* |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:12
|
Update of /cvsroot/openqrm/plugins/xen/web/console In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12318/plugins/xen/web/console Added Files: xenconsole_int.jsp applet.conf Log Message: added a Xen-console accessible via the web-interface --- NEW FILE: xenconsole_int.jsp --- <%-- The contents of this file are subject to the Qlusters Public License Version 1.1 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.openqrm.org/content/view/33/69/. Software distributed under the License is distributed on an AS IS basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. The Original Code is openQRM. The Initial Developer of the Original Code is Qlusters Corporation. Portions created by Qlusters Corporation are Copyright (C) 2003-2006. All Rights Reserved. Contributor(s): Description: Comments: --%> <% pageContext.setAttribute("resource_ip", request.getParameter("resource_ip")); %> <% pageContext.setAttribute("resource_port", request.getParameter("resource_port")); %> <html> <head> <link href="/include/global.css" rel="stylesheet" type="text/css"></link> <title>Xen-console</title> </head> <body> <br> (please press ENTER to connect the console) <br> <applet CODEBASE="." ARCHIVE="jta26.jar" CODE="de.mud.jta.Applet" WIDTH=590 HEIGHT=360> <param name="Socket.host" value="${resource_ip}"> <param name="Socket.port" value="${resource_port}"> <param name="config" value="applet.conf"> </applet> <br> <br> <a href="#" >Back</a> </body> </html> --- NEW FILE: applet.conf --- (This appears to be a binary file; contents omitted.) |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:12
|
Update of /cvsroot/openqrm/plugins/xen In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12318/plugins/xen Modified Files: Makefile Log Message: added a Xen-console accessible via the web-interface Index: Makefile =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 21 May 2007 13:41:17 -0000 1.2 --- Makefile 22 May 2007 12:50:11 -0000 1.3 *************** *** 34,37 **** --- 34,38 ---- PACKAGE_KERNEL_VERSION = 2.6.18 LSI_MODULES=no + JAVA_TERM=yes INC_NAME := ../../build/Makefile.inc *************** *** 55,58 **** --- 56,61 ---- PACKAGE_CONFIG_FILE_VETHD=$(SOURCE_ROOT)/plugins/xen/build/veth.conf PACKAGE_CONFIG_FILE_LSI_MODULES=$(SOURCE_ROOT)/plugins/xen/build/lsi-modules.conf + PACKAGE_CONFIG_FILE_JAVATERM=$(SOURCE_ROOT)/plugins/xen/build/javaterm.conf + JAVA_STORE_PASSWORD=openqrm PACKAGE_BUILD_DISTRIBUTION=$(shell $(MAKE_HELPER) qrm_get_build_distro) *************** *** 113,116 **** --- 116,124 ---- make lsi-modules; \ fi + + @if [ "$(JAVA_TERM)" == "yes" ]; then \ + make java-term; \ + fi + make vethd *************** *** 135,138 **** --- 143,157 ---- fi + @if [ "$(JAVA_TERM)" == "yes" ]; then \ + echo "installing java-term"; \ + mkdir -p $(OUTDIR)/qrm/plugins/xen/web/console; \ + /bin/cp -f $(QRM_CACHE_DIR)/jta*.jar $(OUTDIR)/qrm/plugins/xen/web/console/; \ + /bin/rm -f $(OUTDIR)/qrm/plugins/xen/web/console/openqrm.store $(OUTDIR)/qrm/plugins/xen/web/console/openqrm.cer; \ + echo "Signing jar file"; \ + ${JAVA_HOME}/bin/keytool -genkey -alias openqrm -keystore $(OUTDIR)/qrm/plugins/xen/web/console/openqrm.store -storepass $(JAVA_STORE_PASSWORD) -keypass $(JAVA_STORE_PASSWORD) -dname "CN=qrm user, OU=na, O=na, L=na,S=na, C=na"; \ + ${JAVA_HOME}/bin/keytool -export -alias openqrm -keystore $(OUTDIR)/qrm/plugins/xen/web/console/openqrm.store -storepass $(JAVA_STORE_PASSWORD) -file $(OUTDIR)/qrm/plugins/xen/web/console/openqrm.cer; \ + ${JAVA_HOME}/bin/jarsigner -keystore $(OUTDIR)/qrm/plugins/xen/web/console/openqrm.store -storepass $(JAVA_STORE_PASSWORD) $(OUTDIR)/qrm/plugins/xen/web/console/jta26.jar openqrm; \ + fi + # the additional libs for the initrd / NOTICE -> to .../install/tmp/libs /bin/cp -aR $(QRM_CACHE_DIR)/xen-iscsi-2.6/libs/* $(QRM_CACHE_DIR)/xen/dist/install/tmp/libs *************** *** 163,167 **** java: ../../build/maven-helper.sh install -c $(QRM_CACHE_DIR)/java -t $(QRM_ROOT_DIR) -d $(INSTALL_FILES_DEST)/include -m xen -w $(TOMCAT_DIR) -- $(MAVEN_OPTS) ! clean: check --- 182,188 ---- java: ../../build/maven-helper.sh install -c $(QRM_CACHE_DIR)/java -t $(QRM_ROOT_DIR) -d $(INSTALL_FILES_DEST)/include -m xen -w $(TOMCAT_DIR) -- $(MAVEN_OPTS) ! ! java-term: ! $(SOURCE_ROOT)/make_helper build_package $(PACKAGE_CONFIG_FILE_JAVATERM) clean: check |
|
From: Matt <mat...@us...> - 2007-05-22 12:50:03
|
Update of /cvsroot/openqrm/plugins/xen/web/console In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12229/plugins/xen/web/console Log Message: Directory /cvsroot/openqrm/plugins/xen/web/console added to the repository |
|
From: Matt <mat...@us...> - 2007-05-21 18:12:19
|
Update of /cvsroot/openqrm/plugins/sshlogin/include In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23337/plugins/sshlogin/include Modified Files: sshlogin-functions Log Message: fixed typos Index: sshlogin-functions =================================================================== RCS file: /cvsroot/openqrm/plugins/sshlogin/include/sshlogin-functions,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sshlogin-functions 4 Apr 2007 14:43:07 -0000 1.2 --- sshlogin-functions 21 May 2007 18:12:19 -0000 1.3 *************** *** 26,38 **** ! WEB_DEPLOY_DIR := $QRM_SERVER_BASE_DIR/qrm/java/webapp/unsecure function sshlogin_install() { ! @mkdir -p $(WEB_DEPLOY_DIR)/sshlogin ! /bin/cp -f $QRM_SERVER_BASE_DIR/qrm/plugins/sshlogin/web/* $(WEB_DEPLOY_DIR)/sshlogin/ } function sshlogin_uninstall() { ! /bin/rm -rf $(WEB_DEPLOY_DIR)/sshlogin } --- 26,38 ---- ! WEB_DEPLOY_DIR=$QRM_SERVER_BASE_DIR/qrm/java/webapp/unsecure function sshlogin_install() { ! mkdir -p $WEB_DEPLOY_DIR/sshlogin ! /bin/cp -f $QRM_SERVER_BASE_DIR/qrm/plugins/sshlogin/web/* $WEB_DEPLOY_DIR/sshlogin/ } function sshlogin_uninstall() { ! /bin/rm -rf $WEB_DEPLOY_DIR/sshlogin } |
|
From: Matt <mat...@us...> - 2007-05-21 13:41:19
|
Update of /cvsroot/openqrm/plugins/xen/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11716/plugins/xen/etc Modified Files: xen.xml template.xen Log Message: updated to xen version 3.1 Index: template.xen =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/etc/template.xen,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** template.xen 9 Mar 2007 09:21:16 -0000 1.1 --- template.xen 21 May 2007 13:41:18 -0000 1.2 *************** *** 29,33 **** name = "@@NAME@@" vcpus = @@VCPUS@@ ! cpus = "" vif = [ 'mac=@@MACADDRESS@@, bridge=@@XENBR@@' ] hostname= "@@NAME@@" --- 29,33 ---- name = "@@NAME@@" vcpus = @@VCPUS@@ ! cpus = "0" vif = [ 'mac=@@MACADDRESS@@, bridge=@@XENBR@@' ] hostname= "@@NAME@@" Index: xen.xml =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/etc/xen.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xen.xml 5 Apr 2007 11:11:11 -0000 1.2 --- xen.xml 21 May 2007 13:41:18 -0000 1.3 *************** *** 26,30 **** <properties> <name>xen</name> ! <version>0.5</version> <description>xen integration</description> <schema_version>1.0</schema_version> --- 26,30 ---- <properties> <name>xen</name> ! <version>0.6</version> <description>xen integration</description> <schema_version>1.0</schema_version> |
|
From: Matt <mat...@us...> - 2007-05-21 13:41:19
|
Update of /cvsroot/openqrm/plugins/xen/doc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11716/plugins/xen/doc Modified Files: Changelog Log Message: updated to xen version 3.1 Index: Changelog =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/doc/Changelog,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Changelog 5 Apr 2007 11:47:32 -0000 1.3 --- Changelog 21 May 2007 13:41:18 -0000 1.4 *************** *** 28,31 **** --- 28,37 ---- # + + Xen-plugin 0.6 for openQRM 3.1.4 + + - updated Xen to 3.1 + + Xen-plugin 0.5 for openQRM 3.1.4 |
|
From: Matt <mat...@us...> - 2007-05-21 13:41:19
|
Update of /cvsroot/openqrm/plugins/xen/build In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11716/plugins/xen/build Modified Files: xen.conf xen-iscsi-2.6.conf Log Message: updated to xen version 3.1 Index: xen-iscsi-2.6.conf =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/build/xen-iscsi-2.6.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xen-iscsi-2.6.conf 9 Mar 2007 09:22:21 -0000 1.1 --- xen-iscsi-2.6.conf 21 May 2007 13:41:17 -0000 1.2 *************** *** 26,35 **** #conf PACKAGE_NAME="xen-iscsi-2.6" ! PACKAGE_VERSION="1.1-654" PACKAGE_MODE="source" # source, binary, userctl BINS="usr/iscsiadm" FILE="open-iscsi-$PACKAGE_VERSION.tar.gz" ! XEN_PACKAGE_VERSION="3.0.3-testing-src" ! XEN_PACKAGE_KERNEL_VERSION="2.6.16.29" # make QRM_MAKE_OPTIONS="KSRC=${QRM_ROOT_DIR}/build/xen/${XEN_PACKAGE_VERSION}_*/linux-${XEN_PACKAGE_KERNEL_VERSION}-xen" --- 26,35 ---- #conf PACKAGE_NAME="xen-iscsi-2.6" ! PACKAGE_VERSION="2.0-711" PACKAGE_MODE="source" # source, binary, userctl BINS="usr/iscsiadm" FILE="open-iscsi-$PACKAGE_VERSION.tar.gz" ! XEN_PACKAGE_VERSION="3.1.0" ! XEN_PACKAGE_KERNEL_VERSION="2.6.18" # make QRM_MAKE_OPTIONS="KSRC=${QRM_ROOT_DIR}/build/xen/${XEN_PACKAGE_VERSION}_*/linux-${XEN_PACKAGE_KERNEL_VERSION}-xen" Index: xen.conf =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/build/xen.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xen.conf 9 Mar 2007 09:22:21 -0000 1.1 --- xen.conf 21 May 2007 13:41:17 -0000 1.2 *************** *** 26,34 **** #conf PACKAGE_NAME="xen" ! PACKAGE_VERSION="3.0.3-testing-src" ! PACKAGE_DATE="07112006" PACKAGE_MODE="source" # source, binary, userctl ! BINS="dist/install/boot/xen-3.0.gz" ! FILE="xen-$PACKAGE_VERSION.tgz" # build --- 26,34 ---- #conf PACKAGE_NAME="xen" ! PACKAGE_VERSION="3.1.0" ! PACKAGE_DATE="21052007" PACKAGE_MODE="source" # source, binary, userctl ! BINS="dist/install/boot/xen-3.1.gz" ! FILE="xen-$PACKAGE_VERSION-src.tgz" # build *************** *** 36,40 **** # urls ! SOURCE="http://downloads.openqrm.net:/pub/qrm_pkgs/xen/xen-$PACKAGE_VERSION.$PACKAGE_DATE.tgz" BINARY_REDHAT_73_i686="" BINARY_REDHAT_9_i686="" --- 36,40 ---- # urls ! SOURCE="http://bits.xensource.com/oss-xen/release/$PACKAGE_VERSION/src.tgz/$FILE" BINARY_REDHAT_73_i686="" BINARY_REDHAT_9_i686="" |
|
From: Matt <mat...@us...> - 2007-05-21 13:41:19
|
Update of /cvsroot/openqrm/plugins/xen/include In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11716/plugins/xen/include Modified Files: xen-info.xml Log Message: updated to xen version 3.1 Index: xen-info.xml =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/include/xen-info.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xen-info.xml 5 Apr 2007 11:11:11 -0000 1.3 --- xen-info.xml 21 May 2007 13:41:17 -0000 1.4 *************** *** 28,32 **** <version>0</version> <type>plugin</type> ! <release>5</release> <license>Qlusters Public License Version 1.1</license> <group>QRM/plugins</group> --- 28,32 ---- <version>0</version> <type>plugin</type> ! <release>6</release> <license>Qlusters Public License Version 1.1</license> <group>QRM/plugins</group> |
|
From: Matt <mat...@us...> - 2007-05-21 13:41:19
|
Update of /cvsroot/openqrm/plugins/xen In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11716/plugins/xen Modified Files: Makefile Log Message: updated to xen version 3.1 Index: Makefile =================================================================== RCS file: /cvsroot/openqrm/plugins/xen/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 9 Mar 2007 09:21:35 -0000 1.1 --- Makefile 21 May 2007 13:41:17 -0000 1.2 *************** *** 31,37 **** export PACKAGE_NAME = xen export PACKAGE_F_NAME = $(PACKAGE_PREFIX)-$(PACKAGE_GROUP)-$(PACKAGE_NAME) ! PACKAGE_VERSION = 3.0.3-testing ! PACKAGE_KERNEL_VERSION = 2.6.16.29 ! LSI_MODULES=yes INC_NAME := ../../build/Makefile.inc --- 31,37 ---- export PACKAGE_NAME = xen export PACKAGE_F_NAME = $(PACKAGE_PREFIX)-$(PACKAGE_GROUP)-$(PACKAGE_NAME) ! PACKAGE_VERSION = 3.1.0 ! PACKAGE_KERNEL_VERSION = 2.6.18 ! LSI_MODULES=no INC_NAME := ../../build/Makefile.inc *************** *** 71,77 **** $(SOURCE_ROOT)/make_helper build_package $(PACKAGE_CONFIG_FILE_XEN) mkdir -p $(QRM_CACHE_DIR)/xen ! /bin/cp -aR $(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)-src_*/dist $(QRM_CACHE_DIR)/xen # adding iscsi module @echo "mkdir -p $(QRM_CACHE_DIR)/xen-iscsi-2.6/lib/modules/$(PACKAGE_KERNEL_VERSION)-xen/misc" > $(QRM_ROOT_DIR)/qrm-xen-iscsi-module-2.6.post @echo "mkdir -p $(QRM_CACHE_DIR)/xen-iscsi-2.6/sbin" >> $(QRM_ROOT_DIR)/qrm-xen-iscsi-module-2.6.post --- 71,84 ---- $(SOURCE_ROOT)/make_helper build_package $(PACKAGE_CONFIG_FILE_XEN) mkdir -p $(QRM_CACHE_DIR)/xen ! /bin/cp -aR $(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)_*/dist $(QRM_CACHE_DIR)/xen # adding iscsi module + # preparing the kernel-source dir + /bin/cp -aR $(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)_*/build-linux-$(PACKAGE_KERNEL_VERSION)*/.config $(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)_*/linux-$(PACKAGE_KERNEL_VERSION)-xen/ + cd $(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)_*/linux-$(PACKAGE_KERNEL_VERSION)-xen/ && make oldconfig + cd $(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)_*/linux-$(PACKAGE_KERNEL_VERSION)-xen/ && make prepare + cd $(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)_*/linux-$(PACKAGE_KERNEL_VERSION)-xen/ && make scripts + + # post action @echo "mkdir -p $(QRM_CACHE_DIR)/xen-iscsi-2.6/lib/modules/$(PACKAGE_KERNEL_VERSION)-xen/misc" > $(QRM_ROOT_DIR)/qrm-xen-iscsi-module-2.6.post @echo "mkdir -p $(QRM_CACHE_DIR)/xen-iscsi-2.6/sbin" >> $(QRM_ROOT_DIR)/qrm-xen-iscsi-module-2.6.post *************** *** 97,103 **** @chmod +x $(QRM_ROOT_DIR)/qrm-xen-iscsi-module* ! export QRM_MAKE_OPTIONS="KSRC=$(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)-src_*/linux-$(PACKAGE_KERNEL_VERSION)-xen" export QRM_POST_MAKE_CMD=$(QRM_ROOT_DIR)/qrm-xen-iscsi-module-2.6.post ! QRM_MAKE_OPTIONS="KSRC=$(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)-src_*/linux-$(PACKAGE_KERNEL_VERSION)-xen" \ QRM_POST_MAKE_CMD=$(QRM_ROOT_DIR)/qrm-xen-iscsi-module-2.6.post \ $(SOURCE_ROOT)/make_helper build_package $(PACKAGE_CONFIG_FILE_XEN_ISCSI_2_6) --- 104,110 ---- @chmod +x $(QRM_ROOT_DIR)/qrm-xen-iscsi-module* ! export QRM_MAKE_OPTIONS="KSRC=$(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)_*/linux-$(PACKAGE_KERNEL_VERSION)-xen" export QRM_POST_MAKE_CMD=$(QRM_ROOT_DIR)/qrm-xen-iscsi-module-2.6.post ! QRM_MAKE_OPTIONS="KSRC=$(QRM_ROOT_DIR)/build/xen/$(PACKAGE_VERSION)_*/linux-$(PACKAGE_KERNEL_VERSION)-xen" \ QRM_POST_MAKE_CMD=$(QRM_ROOT_DIR)/qrm-xen-iscsi-module-2.6.post \ $(SOURCE_ROOT)/make_helper build_package $(PACKAGE_CONFIG_FILE_XEN_ISCSI_2_6) |
|
From: Matt <mat...@us...> - 2007-05-14 12:50:01
|
Update of /cvsroot/openqrm/plugins/puppet/include In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19570/plugins/puppet/include Modified Files: puppet-info.xml Log Message: fixed typo Index: puppet-info.xml =================================================================== RCS file: /cvsroot/openqrm/plugins/puppet/include/puppet-info.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** puppet-info.xml 27 Mar 2007 10:55:24 -0000 1.2 --- puppet-info.xml 14 May 2007 12:50:00 -0000 1.3 *************** *** 32,36 **** <group>QRM/plugins</group> <arch>i386</arch> ! <summary>xen plugin</summary> <description>Provides configuration-management via Puppet for the managed nodes</description> </module> --- 32,36 ---- <group>QRM/plugins</group> <arch>i386</arch> ! <summary>Puppet plugin</summary> <description>Provides configuration-management via Puppet for the managed nodes</description> </module> |
|
From: Matt <mat...@us...> - 2007-05-14 12:46:23
|
Update of /cvsroot/openqrm/plugins/vnclogin/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18355/plugins/vnclogin/etc Added Files: vnclogin-plugin.xml Removed Files: qrm-vnclogin-plugin.xml Log Message: - updated TightVNC-javaviewer to 1.3.9 - fixed install and uninstall functions - added check for active resources --- NEW FILE: vnclogin-plugin.xml --- <?xml version="1.0" ?> <!-- The contents of this file are subject to the Qlusters Public License Version 1.1 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.openqrm.org/content/view/33/69/. Software distributed under the License is distributed on an AS IS basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. The Original Code is openQRM. The Initial Developer of the Original Code is Qlusters Corporation. Portions created by Qlusters Corporation are Copyright (C) 2003-2006. All Rights Reserved. Contributor(s): Description: Comments: --> <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.2" "http://jpf.sourceforge.net/plugin_0_2.dtd"> <plugin id="com.qlusters.qrm.plugins.vnclogin-plugin" version="0.0.1" > <requires> <import plugin-id="com.qlusters.qrm.plugins.core"/> </requires> <extension plugin-id="com.qlusters.qrm.plugins.core" point-id="MenuItem" id="resource_actions"> <parameter id="key" value="resource_actions"/> <parameter id="title" value="vnc-login" /> <parameter id="description" value="vnclogin"/> <parameter id="hierarchy" value="Actions"/> <parameter id="url" value="../unsecure/vnclogin/vnclogin.jsp?resource=${resource.derivedState}_${resource.ipString}"/> </extension> </plugin> --- qrm-vnclogin-plugin.xml DELETED --- |
|
From: Matt <mat...@us...> - 2007-05-14 12:46:16
|
Update of /cvsroot/openqrm/plugins/vnclogin/web In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18355/plugins/vnclogin/web Modified Files: vnclogin.jsp Added Files: vnclogin_int_error.jsp vnclogin_int_content.jsp vnclogin_int.jsp Log Message: - updated TightVNC-javaviewer to 1.3.9 - fixed install and uninstall functions - added check for active resources --- NEW FILE: vnclogin_int.jsp --- <%-- The contents of this file are subject to the Qlusters Public License Version 1.1 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.openqrm.org/content/view/33/69/. Software distributed under the License is distributed on an AS IS basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. The Original Code is openQRM. The Initial Developer of the Original Code is Qlusters Corporation. Portions created by Qlusters Corporation are Copyright (C) 2003-2006. All Rights Reserved. Contributor(s): Description: Comments: --%> <% String resource[] = request.getParameterValues("resource"); %> <% String resource_str = resource[0]; %> <% String state = resource_str.substring(0,1); %> <% String resource_ip = resource_str.substring(2,resource_str.length()); %> <% pageContext.setAttribute("vnc_error", "http://"+ request.getServerName() + "/unsecure/vnclogin/vnclogin_int_error.jsp?resource_ip=" + resource_ip + "&state=" + state); %> <% pageContext.setAttribute("vnc_viewer", "http://"+ request.getServerName() + "/unsecure/vnclogin/vnclogin_int_content.jsp?resource_ip=" + resource_ip + "&state=" + state); %> <%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.*" %> <%@ page import="com.qlusters.qrm.utils.StringUtils" %> <%@ page import="com.qlusters.qrm.server.api.services.ApiServicesLocator" %> <%@ page import="com.qlusters.qrm.server.api.objects.resources.*" %> <%@ page import="com.qlusters.qrm.server.api.objects.*" %> <%@ page import="com.qlusters.qrm.server.api.services.nodes.*" %> <% if(state.equals("9")) { %> <iframe scrolling="auto" marginwidth="0" marginheight="0" frameborder="0" vspace="0" hspace="0" width="100%" height="100%" src="${vnc_viewer}"> </iframe> <% } else { %> <iframe scrolling="auto" marginwidth="0" marginheight="0" frameborder="0" vspace="0" hspace="0" width="100%" height="100%" src="${vnc_error}"> </iframe> <% } %> --- NEW FILE: vnclogin_int_content.jsp --- <%-- The contents of this file are subject to the Qlusters Public License Version 1.1 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.openqrm.org/content/view/33/69/. Software distributed under the License is distributed on an AS IS basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. The Original Code is openQRM. The Initial Developer of the Original Code is Qlusters Corporation. Portions created by Qlusters Corporation are Copyright (C) 2003-2006. All Rights Reserved. Contributor(s): Description: Comments: --%> <% pageContext.setAttribute("resource_ip", request.getParameter("resource_ip")); %> <HTML> <TITLE> TightVNC desktop </TITLE> <APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=1024 HEIGHT=768> <param name=HOST value="${resource_ip}"> <param name=PORT value=5900> </APPLET> <BR> <A href='http://www.tightvnc.com/'>TightVNC site</A> </HTML> --- NEW FILE: vnclogin_int_error.jsp --- <%-- The contents of this file are subject to the Qlusters Public License Version 1.1 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.openqrm.org/content/view/33/69/. Software distributed under the License is distributed on an AS IS basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. The Original Code is openQRM. The Initial Developer of the Original Code is Qlusters Corporation. Portions created by Qlusters Corporation are Copyright (C) 2003-2006. All Rights Reserved. Contributor(s): Description: Comments: --%> <%@ taglib uri='/WEB-INF/tld/c-1.1.2.tld' prefix='c' %> <%@include file="/include/metaData.inc"%> <%@include file="/include/content.inc"%> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr class="h1Row"><td width="100%"> <h1> <img src="/images/ind_resources.gif" align="middle"/> VNC-Viewer <dfn style="color: #666;">(Resource ip-address <%= request.getParameter("resource_ip") %>)</dfn> </h1> </td></tr> </table> <br> <H2>The VNC-Viewer is available for resources in 'Active' state only !</H2> <a href="#" >Back</a> Index: vnclogin.jsp =================================================================== RCS file: /cvsroot/openqrm/plugins/vnclogin/web/vnclogin.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** vnclogin.jsp 9 Mar 2007 09:22:38 -0000 1.1 --- vnclogin.jsp 14 May 2007 12:46:14 -0000 1.2 *************** *** 24,39 **** Comments: --%> - <% pageContext.setAttribute("host_ip", request.getParameter("host_ip")); %> ! <HTML> ! <TITLE> ! TightVNC desktop ! </TITLE> ! <APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=1024 HEIGHT=768> ! <param name=HOST value="${host_ip}"> ! <param name=PORT value=5900> ! </APPLET> ! <BR> ! <A href='http://www.tightvnc.com/'>TightVNC site</A> ! </HTML> --- 24,37 ---- Comments: --%> ! <%@ taglib uri='/WEB-INF/tld/struts-tiles-1.2.tld' prefix='tiles' %> + <tiles:insert page='/templates/qrm_template.jsp'> + <tiles:put name="title" value="VNC-Viewer" /> + <tiles:put name="onPageLoad" value="javascript:showAlerts();" /> + <tiles:put name="calendar" value="" /> + <tiles:put name='header' value='/action/header.do' /> + <tiles:put name='sidebar' value='/action/sidebar.do' /> + <tiles:put name='content' value='/unsecure/vnclogin/vnclogin_int.jsp'/> + <tiles:put name='footer' value='/include/footer.jsp'/> + </tiles:insert> |
|
From: Matt <mat...@us...> - 2007-05-14 12:46:15
|
Update of /cvsroot/openqrm/plugins/vnclogin/include In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18355/plugins/vnclogin/include Modified Files: vnclogin-functions Log Message: - updated TightVNC-javaviewer to 1.3.9 - fixed install and uninstall functions - added check for active resources Index: vnclogin-functions =================================================================== RCS file: /cvsroot/openqrm/plugins/vnclogin/include/vnclogin-functions,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vnclogin-functions 4 Apr 2007 15:21:21 -0000 1.2 --- vnclogin-functions 14 May 2007 12:46:14 -0000 1.3 *************** *** 25,37 **** ################################################################################ ! WEB_DEPLOY_DIR := $QRM_SERVER_BASE_DIR/qrm/java/webapp/unsecure function vnclogin_install() { ! @mkdir -p $(WEB_DEPLOY_DIR)/vnclogin ! /bin/cp -f $QRM_SERVER_BASE_DIR/qrm/plugins/vnclogin/web/* $(WEB_DEPLOY_DIR)/vnclogin/ } function vnclogin_uninstall() { ! /bin/rm -rf $(WEB_DEPLOY_DIR)/vnclogin } --- 25,38 ---- ################################################################################ ! WEB_DEPLOY_DIR=$QRM_SERVER_BASE_DIR/qrm/java/webapp/unsecure function vnclogin_install() { ! mkdir -p $WEB_DEPLOY_DIR/vnclogin ! /bin/cp -f $QRM_SERVER_BASE_DIR/qrm/plugins/vnclogin/web/* $WEB_DEPLOY_DIR/vnclogin/ } + function vnclogin_uninstall() { ! /bin/rm -rf $WEB_DEPLOY_DIR/vnclogin } |
|
From: Matt <mat...@us...> - 2007-05-14 12:46:15
|
Update of /cvsroot/openqrm/plugins/vnclogin/doc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18355/plugins/vnclogin/doc Modified Files: Changelog README.txt Log Message: - updated TightVNC-javaviewer to 1.3.9 - fixed install and uninstall functions - added check for active resources Index: README.txt =================================================================== RCS file: /cvsroot/openqrm/plugins/vnclogin/doc/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README.txt 4 Apr 2007 15:21:21 -0000 1.1 --- README.txt 14 May 2007 12:46:15 -0000 1.2 *************** *** 39,44 **** Usage - sl-ui limitations - URLs --- 39,42 ---- *************** *** 48,56 **** General information ! Detailed explanation ! --- 46,57 ---- General information ! The vnclogin-plugin provides a VNC-client, integrated into the openQRM-server web-console, ! to access the active resources. Detailed explanation ! The vnclogin-plugin automatically installs a VNC-client jar-package on the ! openQRM-server and provides an additional link in the resource-action menu ! to quick-access the active nodes via VNC. *************** *** 63,67 **** Requirements ! --- 64,69 ---- Requirements ! The vnclogin-plugin for now only provides the VNC-client so the system-administrator ! needs to manually set up the vncserver on the fs-images deployed to the nodes *************** *** 80,88 **** Usage ! To use the vnclogin plug-in please refer to the steps below: ! - vnclogin limitations/Known issues --- 82,89 ---- Usage ! To use the vnclogin plug-in please install a VNC-server on your active Virtual Environments. ! The VNC-console of those servers can then be accessed via the resource-action menu. Index: Changelog =================================================================== RCS file: /cvsroot/openqrm/plugins/vnclogin/doc/Changelog,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Changelog 4 Apr 2007 15:21:21 -0000 1.1 --- Changelog 14 May 2007 12:46:15 -0000 1.2 *************** *** 29,36 **** vnclogin plugin 0.2 for openQRM 3.1.4 ! - not released yet vnclogin plugin 0.1 for openQRM 2.2.4 ! - not released yet --- 29,39 ---- vnclogin plugin 0.2 for openQRM 3.1.4 ! - ported to openQRM 3.1.4 ! - updated TightVNC-javaviewer to 1.3.9 ! - fixed install and uninstall functions ! - added check for active resources vnclogin plugin 0.1 for openQRM 2.2.4 ! - was not released |
|
From: Matt <mat...@us...> - 2007-05-14 12:46:15
|
Update of /cvsroot/openqrm/plugins/vnclogin/build In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18355/plugins/vnclogin/build Modified Files: tightvnc.conf Log Message: - updated TightVNC-javaviewer to 1.3.9 - fixed install and uninstall functions - added check for active resources Index: tightvnc.conf =================================================================== RCS file: /cvsroot/openqrm/plugins/vnclogin/build/tightvnc.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tightvnc.conf 4 Apr 2007 15:21:21 -0000 1.1 --- tightvnc.conf 14 May 2007 12:46:14 -0000 1.2 *************** *** 26,33 **** #conf PACKAGE_NAME="tightvnc" ! PACKAGE_VERSION="1.2.9" PACKAGE_MODE="source" # source, binary, userctl BINS="" ! FILE="tightvnc-1.2.9_javabin.tar.gz" --- 26,33 ---- #conf PACKAGE_NAME="tightvnc" ! PACKAGE_VERSION="1.3.9" PACKAGE_MODE="source" # source, binary, userctl BINS="" ! FILE="tightvnc-1.3.9_javabin.tar.gz" |
|
From: Matt <mat...@us...> - 2007-05-14 11:16:45
|
Update of /cvsroot/openqrm/plugins/puppet/etc/init.d In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14817/plugins/puppet/etc/init.d Modified Files: puppet Log Message: fixed the stop functions Index: puppet =================================================================== RCS file: /cvsroot/openqrm/plugins/puppet/etc/init.d/puppet,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** puppet 19 Mar 2007 10:31:07 -0000 1.2 --- puppet 14 May 2007 11:15:53 -0000 1.3 *************** *** 84,88 **** function stop() { echo "stopping openQRM puppet-plugin" ! kill `cat /var/run/puppet/puppetd.pid` } --- 84,89 ---- function stop() { echo "stopping openQRM puppet-plugin" ! kill `cat /var/run/puppet/puppetd.pid` 1>/dev/null 2>&1 ! kill `ps ax | grep puppetd | grep -v grep | awk {' print $1 '} 1>/dev/null 2>&1 } |