Menu
▾
▴
sageplugins-commic — CVS Checkin messages
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
(29) |
Aug
(20) |
Sep
(6) |
Oct
(89) |
Nov
(24) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(16) |
Feb
(1) |
Mar
(7) |
Apr
(32) |
May
(36) |
Jun
(21) |
Jul
(65) |
Aug
(6) |
Sep
|
Oct
(30) |
Nov
(26) |
Dec
(44) |
| 2006 |
Jan
(35) |
Feb
(15) |
Mar
(29) |
Apr
(24) |
May
(8) |
Jun
(2) |
Jul
(7) |
Aug
(11) |
Sep
(61) |
Oct
(36) |
Nov
(10) |
Dec
(14) |
| 2007 |
Jan
(6) |
Feb
(43) |
Mar
(55) |
Apr
(20) |
May
(26) |
Jun
(21) |
Jul
(24) |
Aug
(22) |
Sep
(24) |
Oct
(4) |
Nov
|
Dec
(60) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(51) |
Jul
(2) |
Aug
(13) |
Sep
|
Oct
(16) |
Nov
(99) |
Dec
(12) |
| 2009 |
Jan
(23) |
Feb
(44) |
Mar
(4) |
Apr
|
May
|
Jun
(9) |
Jul
(70) |
Aug
(14) |
Sep
(13) |
Oct
(6) |
Nov
|
Dec
(3) |
| 2010 |
Jan
(13) |
Feb
(17) |
Mar
(2) |
Apr
(3) |
May
(71) |
Jun
(19) |
Jul
(95) |
Aug
|
Sep
|
Oct
|
Nov
(71) |
Dec
(3) |
| 2011 |
Jan
(52) |
Feb
|
Mar
(34) |
Apr
(10) |
May
(8) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: jreichen <jre...@us...> - 2011-01-14 05:39:11
|
Update of /cvsroot/sageplugins/JettyStarter In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19638 Modified Files: .classpath Log Message: Update sagex-api.jar Index: .classpath =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** .classpath 25 May 2010 03:41:01 -0000 1.5 --- .classpath 14 Jan 2011 05:39:03 -0000 1.6 *************** *** 15,20 **** <classpathentry kind="lib" path="extlib/log4j-1.2.15.jar"/> <classpathentry kind="lib" path="extlib/sbbi-upnplib-1.0.3.jar"/> <classpathentry kind="var" path="SAGE_JAR"/> - <classpathentry combineaccessrules="false" kind="src" path="/SageAPI"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.preview.runtimeTarget/J2EE Preview"/> <classpathentry kind="output" path="bin"/> --- 15,20 ---- <classpathentry kind="lib" path="extlib/log4j-1.2.15.jar"/> <classpathentry kind="lib" path="extlib/sbbi-upnplib-1.0.3.jar"/> + <classpathentry kind="lib" path="extlib/sagex-api.jar"/> <classpathentry kind="var" path="SAGE_JAR"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.preview.runtimeTarget/J2EE Preview"/> <classpathentry kind="output" path="bin"/> |
|
From: jreichen <jre...@us...> - 2011-01-14 05:37:00
|
Update of /cvsroot/sageplugins/JettyStarter/WebContent/apps In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19097/WebContent/apps Modified Files: index.jsp Log Message: Fix displayed version of installed plugin Index: index.jsp =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/WebContent/apps/index.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.jsp 2 Jan 2011 03:24:32 -0000 1.3 --- index.jsp 14 Jan 2011 05:36:52 -0000 1.4 *************** *** 97,104 **** --- 97,111 ---- else { + Object[] installedPlugins = PluginAPI.GetInstalledPlugins(); + for (int i = 0; i < handlerList.size(); i++) { ContextHandler context = (ContextHandler) handlerList.get(i); + Object pluginIdAttribute = context.getAttribute("pluginid"); + String pluginId = (pluginIdAttribute == null) ? null : pluginIdAttribute.toString(); + Object webpageAttribute = context.getAttribute("webpage"); + String webpage = (webpageAttribute == null) ? null : webpageAttribute.toString(); + Resource faviconResource = context.getResource("/favicon.ico"); String favIconPath = "/apps/favicon.ico"; *************** *** 115,118 **** --- 122,141 ---- } + String installedPluginVersion = null; + if (pluginId != null) + { + for (Object installedPlugin : installedPlugins) + { + String installedPluginName = PluginAPI.GetPluginName(installedPlugin); + String installedPluginId = PluginAPI.GetPluginIdentifier(installedPlugin); + + if (pluginId.equals(installedPluginId)) + { + installedPluginVersion = PluginAPI.GetPluginVersion(installedPlugin); + break; + } + } + } + if (context.isRunning()) { *************** *** 139,146 **** } out.write("<div class=\"appdetails\">"); ! if (context.getAttribute("pluginid") != null) { ! Object plugin = PluginAPI.GetAvailablePluginForID(context.getAttribute("pluginid").toString()); ! out.write("Version " + PluginAPI.GetPluginVersion(plugin)); } out.write("</div></div></a></li>\n"); --- 162,168 ---- } out.write("<div class=\"appdetails\">"); ! if (installedPluginVersion != null) { ! out.write("Version " + installedPluginVersion + "\n"); } out.write("</div></div></a></li>\n"); *************** *** 164,170 **** if (context.isStopped()) out.write("<br> [stopped]"); ! if (context.getAttribute("version") != null) { ! out.write("Version " + context.getAttribute("version")); } out.write("</div></div></li>\n"); --- 186,192 ---- if (context.isStopped()) out.write("<br> [stopped]"); ! if (installedPluginVersion != null) { ! out.write("Version " + installedPluginVersion + "\n"); } out.write("</div></div></li>\n"); |
|
From: jreichen <jre...@us...> - 2011-01-13 01:48:20
|
Update of /cvsroot/sageplugins/MediaStreaming/extlib In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27191/extlib Added Files: sagex-api.jar Removed Files: sagex-api-7.0.7.0.jar Log Message: Update sagex-api.jar --- sagex-api-7.0.7.0.jar DELETED --- --- NEW FILE: sagex-api.jar --- (This appears to be a binary file; contents omitted.) |
|
From: jreichen <jre...@us...> - 2011-01-13 01:48:20
|
Update of /cvsroot/sageplugins/MediaStreaming In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27191 Modified Files: .classpath Log Message: Update sagex-api.jar Index: .classpath =================================================================== RCS file: /cvsroot/sageplugins/MediaStreaming/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .classpath 3 Nov 2010 03:42:29 -0000 1.1 --- .classpath 13 Jan 2011 01:48:12 -0000 1.2 *************** *** 17,21 **** <classpathentry combineaccessrules="false" kind="src" path="/JettyStarter"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Jetty"/> ! <classpathentry kind="lib" path="extlib/sagex-api-7.0.7.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> --- 17,21 ---- <classpathentry combineaccessrules="false" kind="src" path="/JettyStarter"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Jetty"/> ! <classpathentry kind="lib" path="extlib/sagex-api.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> |
|
From: jreichen <jre...@us...> - 2011-01-13 01:44:35
|
Update of /cvsroot/sageplugins/MediaStreaming/WebContent In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26091/WebContent Modified Files: index.jsp Added Files: mediastreaming.css HeaderBgMobile.png SageLogo256smaller.png favicon.ico Log Message: Create a default web page to explain the plugin to the user. --- NEW FILE: favicon.ico --- (This appears to be a binary file; contents omitted.) Index: index.jsp =================================================================== RCS file: /cvsroot/sageplugins/MediaStreaming/WebContent/index.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.jsp 3 Nov 2010 03:42:29 -0000 1.1 --- index.jsp 13 Jan 2011 01:44:27 -0000 1.2 *************** *** 1,13 **** <?xml version="1.0" encoding="UTF-8" ?> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ! <%@page import="sagex.api.MediaFileAPI"%> <html xmlns="http://www.w3.org/1999/xhtml"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> ! <title>SageTV</title> </head> <body> </body> ! </html> \ No newline at end of file --- 1,54 ---- <?xml version="1.0" encoding="UTF-8" ?> + <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd"> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> ! <%@ page import="java.util.Date" %> ! <%@ page import="sagex.api.PluginAPI"%> ! ! <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <html xmlns="http://www.w3.org/1999/xhtml"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> ! <meta http-equiv="Cache-Control" content="no-cache"/> ! <meta http-equiv="Pragma" content="no-cache"/> ! <meta http-equiv="Expires" content="0"/> ! <title>SageTV Media Streaming Services</title> ! <link rel="stylesheet" type="text/css" href="mediastreaming.css"/> ! <link rel="Shortcut Icon" href="favicon.ico" type="image/x-icon"/> ! <%-- iphone headers --%> ! <meta name="viewport" content="user-scalable=no, width=device-width" /> <%-- iDevices --%> ! <%--link rel="apple-touch-icon" href="${cp}/images/SageIcon64.png" /> <!-- iPhone home screen icon --> ! <link rel="apple-touch-startup-image" href="${cp}/images/SageStartupLogo256-mgopenmodata13.png" /> <!-- iPhone startup graphic --> ! <meta name="apple-mobile-web-app-capable" content="yes" /> ! <meta name="apple-mobile-web-app-status-bar-style" content="black" /--%> </head> <body> + + <div class="header"> + <div class="titlebar"><img class="logo" src="SageLogo256smaller.png" alt="SageTV" title="SageTV"/></div> + <div class="title">Media Streaming Services</div> + </div> + + <div class="content"> + <p> + The Media Streaming Services Plugin provides video streaming services to other applications + such as the Mobile Web Interface, it is not an end-user web application. + </p> + + <c:if test="${!empty header.Referer}"> + <p> + <a href="${header.Referer}">Return to previous page</a> + </p> + </c:if> + </div> + + <div class="footer"> + <p>Page Generated <%= new Date() %></p> + <% + Object plugin = PluginAPI.GetAvailablePluginForID("mediastreaming"); + %> + <p>SageTV Media Streaming Services Version <%= PluginAPI.GetPluginVersion(plugin) %></p> + </div> + </body> ! </html> --- NEW FILE: mediastreaming.css --- body { font-family: 'Helvetica', 'Verdana', 'Tahoma', 'Arial'; font-size: 12pt; text-shadow: rgba(0, 0, 0, 0.7) 1px 1px 0; background-color: #606060; color: #FFFFFF; margin: 0px; overflow-x: hidden; -webkit-user-select: none; -webkit-text-size-adjust: none; } p { margin: 4px 0px 0px 0px; word-wrap: break-word; } .content { font-size: 16px; margin-bottom: 0px; padding: 5px 10px; border-bottom: 3px solid #FFFFFF; box-shadow: 0px 1px 0px #000000; -moz-box-shadow: 0px 1px 0px #000000; -webkit-box-shadow: 0px 1px 0px #000000; } .header { border: none; text-align: center; vertical-align: middle; font-size: 16pt; font-weight: bold; padding: 0px; border-bottom: 3px solid #FFFFFF; box-shadow: 0px 1px 0px #000000; -moz-box-shadow: 0px 1px 0px #000000; -webkit-box-shadow: 0px 1px 0px #000000; } .titlebar { height: 40px; text-align: center; vertical-align: middle; background-image: url(HeaderBgMobile.png); background-repeat: repeat-x; box-shadow: 0px 0px 10px rgba(0, 0, 0, 1.0); -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 1.0); -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 1.0); } .titlebar img, .titlebar a { vertical-align: middle; } .titlebar .logo { margin-top: 5px; } .header .title { font-weight: bold; font-size: 18px; text-align: center; vertical-align: middle; margin: 0px; padding-top: 5px; padding-bottom: 5px; } .footer { font-size: 12px; padding: 5px; border: none; } a, a:link, a:hover, a:visited { color: #FFFFFF; text-decoration: underline; } --- NEW FILE: HeaderBgMobile.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: SageLogo256smaller.png --- (This appears to be a binary file; contents omitted.) |
|
From: jreichen <jre...@us...> - 2011-01-13 01:43:58
|
Update of /cvsroot/sageplugins/MediaStreaming In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25768 Modified Files: build.xml Log Message: Version 1.1 Index: build.xml =================================================================== RCS file: /cvsroot/sageplugins/MediaStreaming/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 6 Nov 2010 20:59:35 -0000 1.3 --- build.xml 13 Jan 2011 01:43:50 -0000 1.4 *************** *** 6,10 **** <property file="build.properties"/> ! <property name="plugin.version" value="1.0.0"/> <property name="src.dir" location="src"/> --- 6,10 ---- <property file="build.properties"/> ! <property name="plugin.version" value="1.1.0"/> <property name="src.dir" location="src"/> |
|
From: jreichen <jre...@us...> - 2011-01-08 01:12:40
|
Update of /cvsroot/sageplugins/JettyStarter/WebContent/apps In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1588/WebContent/apps Modified Files: apps.css Log Message: Change footer font size Index: apps.css =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/WebContent/apps/apps.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** apps.css 2 Jan 2011 03:24:32 -0000 1.2 --- apps.css 8 Jan 2011 01:12:32 -0000 1.3 *************** *** 64,68 **** .footer { ! font-size: 14px; padding: 5px; border: none; --- 64,68 ---- .footer { ! font-size: 12px; padding: 5px; border: none; |
|
From: jreichen <jre...@us...> - 2011-01-08 01:11:08
|
Update of /cvsroot/sageplugins/JettyStarter/src/sagex/jetty/properties/persistence In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1072/src/sagex/jetty/properties/persistence Modified Files: UserRealmPersistence.java Log Message: make sure there's at least the 'user' role Index: UserRealmPersistence.java =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/src/sagex/jetty/properties/persistence/UserRealmPersistence.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UserRealmPersistence.java 15 May 2010 16:58:46 -0000 1.2 --- UserRealmPersistence.java 8 Jan 2011 01:11:00 -0000 1.3 *************** *** 145,148 **** --- 145,154 ---- } roles = m.group(ROLES_REGEX_GROUP); + + // make sure there's at least the 'user' role + if ((roles == null) || (roles.trim().equals(",")) || (roles.trim().length() == 0)) + { + roles = ",user"; + } propertyList.set(i, user + ": " + password + roles); |
|
From: jreichen <jre...@us...> - 2011-01-04 04:01:40
|
Update of /cvsroot/sageplugins/JettyStarter/resources/plugin In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22610/resources/plugin Modified Files: plugin.xml Log Message: Minor formatting Index: plugin.xml =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/resources/plugin/plugin.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** plugin.xml 4 Jan 2011 02:01:12 -0000 1.7 --- plugin.xml 4 Jan 2011 04:01:32 -0000 1.8 *************** *** 33,37 **** 2. Display message on /apps page when no web applications are installed 3. Convert end-of-line characters from LF (Linux) to CRLF (Windows) for the /apps files. ! Version 2.0 1. Added SageTV Web Applications webapp as a Jetty home page. --- 33,37 ---- 2. Display message on /apps page when no web applications are installed 3. Convert end-of-line characters from LF (Linux) to CRLF (Windows) for the /apps files. ! Version 2.0 1. Added SageTV Web Applications webapp as a Jetty home page. |
|
From: jreichen <jre...@us...> - 2011-01-04 02:01:21
|
Update of /cvsroot/sageplugins/JettyStarter/src/sagex/jetty/starter In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10847/src/sagex/jetty/starter Modified Files: Version.java Log Message: Version 2.1 Index: Version.java =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/src/sagex/jetty/starter/Version.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Version.java 31 May 2010 00:58:35 -0000 1.5 --- Version.java 4 Jan 2011 02:01:12 -0000 1.6 *************** *** 20,25 **** VERSION_2_0_0 ("2.0.0"), // Sage v7 beta VERSION_2_0_1 ("2.0.1"), // Sage v7 beta ! CURRENT_VERSION (VERSION_2_0_1.version); private String version = null; --- 20,26 ---- VERSION_2_0_0 ("2.0.0"), // Sage v7 beta VERSION_2_0_1 ("2.0.1"), // Sage v7 beta + VERSION_2_1_0 ("2.1.0"), // Sage v7 ! CURRENT_VERSION (VERSION_2_1_0.version); private String version = null; |
|
From: jreichen <jre...@us...> - 2011-01-04 02:01:21
|
Update of /cvsroot/sageplugins/JettyStarter/resources/plugin In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10847/resources/plugin Modified Files: plugin.xml Log Message: Version 2.1 Index: plugin.xml =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/resources/plugin/plugin.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** plugin.xml 31 May 2010 20:11:31 -0000 1.6 --- plugin.xml 4 Jan 2011 02:01:12 -0000 1.7 *************** *** 5,9 **** <Description> <![CDATA[ ! The Jetty Web Server Plugin provides a platform for SageTV web application plugins. Currently available web applications can manage SageTV recordings from desktop or mobile web browsers, manage fanart and metadata, provide remote web services for SageTV, configure batch job processing, and more. --- 5,9 ---- <Description> <![CDATA[ ! Provides a platform for SageTV web application plugins. Currently available web applications can manage SageTV recordings from desktop or mobile web browsers, manage fanart and metadata, provide remote web services for SageTV, configure batch job processing, and more. *************** *** 24,27 **** --- 24,32 ---- <ReleaseNotes> <![CDATA[ + Version 2.1.0 + 1. SageTV v7-style interface for 'apps' web application (switch from blue to gray as well as other style changes) + 2. Remove duplicate timestamps on Jetty's log entries in the SageTV log file. + 3. Override Jetty's war file extraction logic to address HTTP 404 and 503 errors. + Version 2.0.1 1. Fix Windows file-locking issue |
|
From: jreichen <jre...@us...> - 2011-01-04 02:01:20
|
Update of /cvsroot/sageplugins/JettyStarter In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10847 Modified Files: changelog.txt build.xml Log Message: Version 2.1 Index: changelog.txt =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/changelog.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** changelog.txt 31 May 2010 21:05:44 -0000 1.9 --- changelog.txt 4 Jan 2011 02:01:12 -0000 1.10 *************** *** 1,2 **** --- 1,6 ---- + 2.1.0 January 3, 2011 + - SageTV v7-style interface for 'apps' web application (switch from blue to gray as well as other style changes) + - Remove duplicate timestamps on Jetty's log entries in the SageTV log file. + - Override Jetty's war file extraction logic to address HTTP 404 and 503 errors. 2.0.1 May 31, 2010 - Fix Windows file-locking issue Index: build.xml =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** build.xml 31 May 2010 20:11:05 -0000 1.10 --- build.xml 4 Jan 2011 02:01:12 -0000 1.11 *************** *** 6,10 **** <property file="build.properties"/> ! <property name="plugin.version" value="2.0.1"/> <property name="src.dir" location="src"/> --- 6,10 ---- <property file="build.properties"/> ! <property name="plugin.version" value="2.1.0"/> <property name="src.dir" location="src"/> |
|
From: jreichen <jre...@us...> - 2011-01-02 03:24:41
|
Update of /cvsroot/sageplugins/JettyStarter/WebContent/apps In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2087/WebContent/apps Modified Files: apps.css index.jsp Added Files: HeaderBg.png Log Message: SageTV v7-style interface for 'apps' web application (switch from blue to gray as well as other style changes) --- NEW FILE: HeaderBg.png --- (This appears to be a binary file; contents omitted.) Index: apps.css =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/WebContent/apps/apps.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** apps.css 25 May 2010 03:22:47 -0000 1.1 --- apps.css 2 Jan 2011 03:24:32 -0000 1.2 *************** *** 1,20 **** ! body ! { ! font-family: Verdana, Helvetica, Arial, Tahoma; ! font-size: 12pt; ! background: #042360; ! color: #FFFFFF; ! ! -webkit-text-size-adjust: none; } ! .content ! { } ! .header ! { ! /*background: url(border.png);*/ ! /*border: 2px solid #FFFFFF;*/ border: none; text-align: center; --- 1,26 ---- ! body { ! font-family: 'Helvetica', 'Verdana', 'Tahoma', 'Arial'; ! font-size: 12pt; ! text-shadow: rgba(0, 0, 0, 0.7) 1px 1px 0; ! background-color: #606060; ! color: #FFFFFF; ! margin: 0px; ! overflow-x: hidden; ! -webkit-user-select: none; ! -webkit-text-size-adjust: none; } ! p { ! margin: 4px 0px 0px 0px; ! word-wrap: break-word; } ! .content { ! font-size: 16px; ! margin-bottom: 0px; ! padding: 5px 10px; ! } ! ! .header { border: none; text-align: center; *************** *** 24,50 **** font-weight: bold; ! padding: 5px; ! ! -moz-border-radius-topleft: 8px; ! -moz-border-radius-topright: 8px; ! -moz-border-radius-bottomleft: 8px; ! -moz-border-radius-bottomright: 8px; ! ! -webkit-border-radius: 8px; ! ! border-radius: 8px; ! ! /*-webkit-border-image: function top right bottom left / top_border right_border bottom_border left_border x_repeat y_repeat;*/ ! /*-webkit-border-image: -webkit-gradient(linear, left top, right top, from(#FFFFFFFF), to(#FFFFFFFF), color-stop(0.5, #FFFFFF)) 2 2 2 2 repeat repeat;*/ } ! .footer ! { ! font-size: 10pt; } a, a:link, a:hover, a:visited { ! color: #042360; text-decoration: none; } --- 30,75 ---- font-weight: bold; ! padding: 0px; } ! .titlebar { ! height: 70px; ! text-align: center; ! vertical-align: middle; ! background-image: url(HeaderBg.png); ! background-repeat: repeat-x; ! ! box-shadow: 0px 0px 10px rgba(0, 0, 0, 1.0); ! -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 1.0); ! -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 1.0); ! } ! ! .titlebar img, .titlebar a { ! vertical-align: middle; ! } ! ! .titlebar .logo { ! margin-top: 5px; ! } ! ! .header .title { ! font-weight: bold; ! font-size: 22px; ! text-align: center; ! vertical-align: middle; ! margin: 0px; ! padding-top: 10px; ! padding-bottom: 10px; ! } ! ! .footer { ! font-size: 14px; ! padding: 5px; ! border: none; } a, a:link, a:hover, a:visited { ! color: #111111; text-decoration: none; } *************** *** 52,55 **** --- 77,81 ---- ul { + margin: 0px; padding: 0px; } *************** *** 60,69 **** background: #FFFFFF; ! color: #042360; ! font-weight: bold; vertical-align: middle; ! border-bottom: 1px solid #042360; } --- 86,97 ---- background: #FFFFFF; ! color: #111111; ! font-weight: bold; vertical-align: middle; ! border-bottom: 1px solid #909090; ! ! text-shadow: none; } *************** *** 71,75 **** { color: white; ! background: #263D6C; } --- 99,103 ---- { color: white; ! background: #111111; } *************** *** 96,99 **** --- 124,129 ---- border-bottom-left-radius: 8px; border-bottom-right-radius: 8px; + + border-bottom: none; } *************** *** 120,124 **** .appdetails { ! font-size: 10pt; padding-left: 10px; } --- 150,155 ---- .appdetails { ! font-size: 14px; ! color: #909090; padding-left: 10px; } Index: index.jsp =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/WebContent/apps/index.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.jsp 31 May 2010 04:20:35 -0000 1.2 --- index.jsp 2 Jan 2011 03:24:32 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- <%@ page import="java.util.Collections" %> <%@ page import="java.util.Comparator" %> + <%@ page import="java.util.Date" %> <%@ page import="java.util.List" %> <%@ page import="org.mortbay.jetty.Handler" %> *************** *** 11,15 **** <%@ page import="org.mortbay.jetty.Server" %> <%@ page import="org.mortbay.resource.Resource" %> ! <%@page import="sagex.api.PluginAPI"%> <%@ page import="sagex.jetty.starter.JettyInstance" %> --- 12,16 ---- <%@ page import="org.mortbay.jetty.Server" %> <%@ page import="org.mortbay.resource.Resource" %> ! <%@ page import="sagex.api.PluginAPI"%> <%@ page import="sagex.jetty.starter.JettyInstance" %> *************** *** 19,22 **** --- 20,26 ---- <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <meta http-equiv="Cache-Control" content="no-cache"/> + <meta http-equiv="Pragma" content="no-cache"/> + <meta http-equiv="Expires" content="0"/> <title>SageTV Web Applications</title> <link rel="stylesheet" type="text/css" href="apps.css"/> *************** *** 30,42 **** </head> <body> <div class="content"> - <div class="header"> - <div><img src="SageLogo256small.png" alt="SageTV" title="SageTV"/></div> - <div>Web Applications</div> - </div> <% JettyInstance instance = JettyInstance.getInstance(); Server server = instance.getServers().get(0); Handler[] handlerArray = (server == null) ? null : server.getChildHandlersByClass(ContextHandler.class); --- 34,49 ---- </head> <body> + + <div class="header"> + <div class="titlebar"><img class="logo" src="SageLogo256small.png" alt="SageTV" title="SageTV"/></div> + <div class="title">Web Applications</div> + </div> + <div class="content"> <% JettyInstance instance = JettyInstance.getInstance(); Server server = instance.getServers().get(0); + ContextHandler consoleContext = null; Handler[] handlerArray = (server == null) ? null : server.getChildHandlersByClass(ContextHandler.class); *************** *** 53,56 **** --- 60,68 ---- continue; } + if ("/console".equals(context.getContextPath())) + { + consoleContext = context; + continue; + } handlerList.add(context); } *************** *** 137,141 **** { out.write("<li>"); ! out.write("<img class=\"app\" src=\"" + favIconPath + "\"/>"); out.write("<div class=\"appinfo\">"); if (context.getDisplayName() != null) --- 149,153 ---- { out.write("<li>"); ! out.write("<div class=\"appimg\"><img class=\"app\" src=\"" + favIconPath + "\"/></div>"); out.write("<div class=\"appinfo\">"); if (context.getDisplayName() != null) *************** *** 162,165 **** --- 174,202 ---- %> </ul> + + <% + if (consoleContext != null) + { + %> + <ul> + <li><a href="/console"> + <div class="appimg"><img class="app" src="/console/favicon.ico"/></div> + <div class="appinfo">Settings + <div class="appdetails"> + <% + if (consoleContext.getAttribute("pluginid") != null) + { + Object plugin = PluginAPI.GetAvailablePluginForID(consoleContext.getAttribute("pluginid").toString()); + out.write("Version " + PluginAPI.GetPluginVersion(plugin)); + } + %> + </div> + </div> + </a></li> + </ul> + <% + } + %> + <% for (int i = 0; i < 10; i++) *************** *** 169,178 **** } %> - <div class="footer"> - Jetty Web Server Plugin Version <%= sagex.jetty.starter.JettyPlugin.class.getPackage().getImplementationVersion() %><br/> - Jetty Web Server Version <%= Server.class.getPackage().getImplementationVersion() %> - </div> </div> </body> </html> - --- 206,217 ---- } %> </div> + + <div class="footer"> + <p>Page Generated <%= new Date() %></p> + <p>Jetty Web Server Plugin Version <%= sagex.jetty.starter.JettyPlugin.class.getPackage().getImplementationVersion() %></p> + <p>Jetty Web Server Version <%= Server.class.getPackage().getImplementationVersion() %></p> + </div> + </body> </html> |
|
From: jreichen <jre...@us...> - 2011-01-02 02:10:32
|
Update of /cvsroot/sageplugins/JettyStarter/src/sagex/jetty/lifecycle In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16591/src/sagex/jetty/lifecycle Added Files: WebAppContextLifeCycleListener.java SageContextHandlerCollection.java Log Message: Override Jetty's war file extraction logic to address HTTP 404 and 503 errors. --- NEW FILE: WebAppContextLifeCycleListener.java --- package sagex.jetty.lifecycle; import java.io.File; import java.io.FilenameFilter; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.mortbay.component.LifeCycle; import org.mortbay.jetty.webapp.WebAppContext; import org.mortbay.log.Log; import org.mortbay.util.IO; public class WebAppContextLifeCycleListener implements LifeCycle.Listener { private static File TEMP_WEBAPP_DIR = new File(System.getProperty("user.dir"), "jetty/webapps"); public void lifeCycleFailure(LifeCycle event, Throwable cause) { printUnavailableFailure(event); } public void lifeCycleStarted(LifeCycle event) { printUnavailableFailure(event); } public void lifeCycleStarting(LifeCycle event) { if (event instanceof WebAppContext) { WebAppContext context = (WebAppContext) event; File tempDir = context.getTempDirectory(); // only delete dirs from the webapps dir as a sanity check if ((context.isExtractWAR()) && (tempDir != null) && (isTempDirInWebappsDir(tempDir))) { removeTempDirectory(context, tempDir); setTempDirectory(context, tempDir); } } } public void lifeCycleStopped(LifeCycle event) { } public void lifeCycleStopping(LifeCycle event) { } /** * Print the exception that occurred if the web application failed to start */ private void printUnavailableFailure(LifeCycle event) { if (event instanceof WebAppContext) { WebAppContext context = (WebAppContext) event; if (!context.isStarted()) { Throwable t = context.getUnavailableException(); if (t != null) { Log.warn("UnavailableException: " + t.getMessage(), t); } } } } /** * Attempt to remove the default web app temp directory as well as any temp * directories created by this class. The directories might be left behind * when they were locked during a previous run of SageTV. */ private void removeTempDirectory(WebAppContext context, File tempDir) { TempDirFilter filter = new TempDirFilter(tempDir.getName()); File[] tempDirs = tempDir.getParentFile().listFiles(filter); for (File currentTempDir : tempDirs) { Log.debug("Delete temporary web app directory: " + currentTempDir.getAbsolutePath()); IO.delete(currentTempDir); } } /** * First attempt to set the temp directory to the default. It's the value * specified by the developer in the context file. This is necessary to set * the internal state of Jetty's WebAppContext class. * * If the directory already exists then find the first directory name that doesn't * exist when appending sequential numbers to the default directory's name. */ private void setTempDirectory(WebAppContext context, File tempDir) { File defaultTempDir = tempDir; int i = 1; while (tempDir.exists()) { tempDir = new File(defaultTempDir.getAbsolutePath() + "_" + i++); } context.setTempDirectory(tempDir); } private boolean isTempDirInWebappsDir(File tempDir) { return (tempDir.getParentFile().equals(TEMP_WEBAPP_DIR)); } /** * Filename filter to get the list of directories to delete */ private class TempDirFilter implements FilenameFilter { private Pattern p = null; public TempDirFilter(String name) { p = Pattern.compile(name + "(_\\d+)?"); } public boolean accept(File dir, String name) { Matcher m = p.matcher(name); return m.matches(); } } } --- NEW FILE: SageContextHandlerCollection.java --- package sagex.jetty.lifecycle; import org.mortbay.jetty.Handler; import org.mortbay.jetty.handler.ContextHandlerCollection; /** * Provides a hook into the deployment process (via jetty.xml) without requiring * modification of the context xml files (by subclassing WebAppContext). When a * web app is started, try to delete the current temp directory. If the delete * fails, create a new temp directory. * * Another option is to subclass ContextDeployer (also in jetty.xml) but that's a lot more work. * * WebAppContext does not delete temp directories when starting a web app. If * the temp directory was not deleted last time the app was stopped, HTTP 404 * and 503 errors are displayed to the user. */ public class SageContextHandlerCollection extends ContextHandlerCollection { private WebAppContextLifeCycleListener lifecycleListener = new WebAppContextLifeCycleListener(); public SageContextHandlerCollection() throws Exception { super(); } @Override public void setHandlers(Handler[] handlers) { super.setHandlers(handlers); for (Handler handler : handlers) { handler.addLifeCycleListener(lifecycleListener); } } @Override public void addHandler(Handler handler) { super.addHandler(handler); handler.addLifeCycleListener(lifecycleListener); } @Override public void removeHandler(Handler handler) { super.removeHandler(handler); handler.removeLifeCycleListener(lifecycleListener); } } |
|
From: jreichen <jre...@us...> - 2011-01-02 02:10:32
|
Update of /cvsroot/sageplugins/JettyStarter/jetty/etc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16591/jetty/etc Modified Files: jetty.xml Log Message: Override Jetty's war file extraction logic to address HTTP 404 and 503 errors. Index: jetty.xml =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/jetty/etc/jetty.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** jetty.xml 24 May 2010 23:18:23 -0000 1.8 --- jetty.xml 2 Jan 2011 02:10:25 -0000 1.9 *************** *** 147,151 **** </Item> <Item> ! <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/> </Item> <Item> --- 147,151 ---- </Item> <Item> ! <New id="Contexts" class="sagex.jetty.lifecycle.SageContextHandlerCollection"/> </Item> <Item> |
|
From: jreichen <jre...@us...> - 2011-01-02 02:10:28
|
Update of /cvsroot/sageplugins/JettyStarter/src/sagex/jetty/lifecycle In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16572/src/sagex/jetty/lifecycle Log Message: Directory /cvsroot/sageplugins/JettyStarter/src/sagex/jetty/lifecycle added to the repository |
|
From: jreichen <jre...@us...> - 2010-12-31 01:59:27
|
Update of /cvsroot/sageplugins/JettyStarter In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3435 Added Files: deploy-test-package.xml Log Message: --- NEW FILE: deploy-test-package.xml --- <?xml version="1.0" encoding="UTF-8"?> <project name="Jetty Starter" default="deploy"> <property file="build.properties"/> <property name="test.download.url.location" value="http://localhost/sageplugins"/> <property name="test.download.url.params" value=""/> <property name="download.url.location" value="${test.download.url.location}"/> <property name="download.url.params" value="${test.download.url.params}"/> <property name="test.webserver.home" value="/var/www"/> <property name="test.sagetv.home" value="/opt/sagetv/server"/> <target name="build"> <ant antfile="build.xml" target="dist"/> </target> <target name="deploy" depends="build"> <unzip dest="${test.webserver.home}"> <fileset dir="dist"> <include name="jetty-starter-plugin*.zip"/> </fileset> </unzip> <copy todir="${test.sagetv.home}"> <fileset dir="build/packages" includes="plugin*.xml"/> <mergemapper to="SageTVPluginsDev.xml"/> </copy> </target> </project> |
|
From: jreichen <jre...@us...> - 2010-12-31 01:49:29
|
Update of /cvsroot/sageplugins/JettyStarter/src/sagex/jetty/log In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv761/src/sagex/jetty/log Modified Files: JettyStarterLogger.java Added Files: SageStdErrLog.java Log Message: Remove duplicate timestamps on Jetty's log entries in the SageTV log file. Index: JettyStarterLogger.java =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/src/sagex/jetty/log/JettyStarterLogger.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JettyStarterLogger.java 15 May 2010 23:39:15 -0000 1.2 --- JettyStarterLogger.java 31 Dec 2010 01:49:21 -0000 1.3 *************** *** 48,52 **** public JettyStarterLogger() { ! stdErrLog = new StdErrLog(); } --- 48,52 ---- public JettyStarterLogger() { ! stdErrLog = new SageStdErrLog(); } --- NEW FILE: SageStdErrLog.java --- package sagex.jetty.log; import org.mortbay.log.Logger; import org.mortbay.log.StdErrLog; /** * Don't output the timestamp because Sage's logger already does. * Otherwise this is the same as Jetty's StdErrLog. */ public class SageStdErrLog extends StdErrLog { private static boolean debug = System.getProperty("DEBUG",null)!=null; private String name; public SageStdErrLog() { this(null); } public SageStdErrLog(String name) { this.name=name==null?"":name; } public boolean isDebugEnabled() { return debug; } public void setDebugEnabled(boolean enabled) { debug=enabled; } public void info(String msg,Object arg0, Object arg1) { System.err.println(":"+name+":INFO: "+format(msg,arg0,arg1)); } public void debug(String msg,Throwable th) { if (debug) { System.err.println(":"+name+":DEBUG: "+msg); if (th!=null) th.printStackTrace(); } } public void debug(String msg,Object arg0, Object arg1) { if (debug) { System.err.println(":"+name+":DEBUG: "+format(msg,arg0,arg1)); } } public void warn(String msg,Object arg0, Object arg1) { System.err.println(":"+name+":WARN: "+format(msg,arg0,arg1)); } public void warn(String msg, Throwable th) { System.err.println(":"+name+":WARN: "+msg); if (th!=null) th.printStackTrace(); } private String format(String msg, Object arg0, Object arg1) { int i0=msg.indexOf("{}"); int i1=i0<0?-1:msg.indexOf("{}",i0+2); if (arg1!=null && i1>=0) msg=msg.substring(0,i1)+arg1+msg.substring(i1+2); if (arg0!=null && i0>=0) msg=msg.substring(0,i0)+arg0+msg.substring(i0+2); return msg; } public Logger getLogger(String name) { if ((name==null && this.name==null) || (name!=null && name.equals(this.name))) return this; return new StdErrLog(name); } public String toString() { return "STDERR"+name; } } |
|
From: jreichen <jre...@us...> - 2010-12-08 14:08:42
|
Update of /cvsroot/sageplugins/webapp In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20092 Modified Files: .classpath Log Message: Index: .classpath =================================================================== RCS file: /cvsroot/sageplugins/webapp/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .classpath 5 Nov 2010 03:28:14 -0000 1.2 --- .classpath 8 Dec 2010 14:08:33 -0000 1.3 *************** *** 6,10 **** <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.preview.runtimeTarget/J2EE Preview"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/webserver"/> <classpathentry kind="lib" path="/JettyStarter/lib/jsp-api-2.1.jar"/> <classpathentry kind="lib" path="/JettyStarter/lib/jsp-2.1.jar"/> --- 6,9 ---- *************** *** 13,16 **** --- 12,16 ---- <classpathentry kind="lib" path="/JettyStarter/lib/jetty-util-6.1.19.jar" sourcepath="/JettyStarter/jetty-6.1.19-src.zip"/> <classpathentry kind="lib" path="/JettyStarter/lib/servlet-api-2.5-6.1.19.jar" sourcepath="/JettyStarter/jetty-6.1.19-src.zip"/> + <classpathentry combineaccessrules="false" kind="src" path="/JettyStarter"/> <classpathentry kind="output" path="build/classes"/> </classpath> |
|
From: jreichen <jre...@us...> - 2010-11-08 02:43:05
|
Update of /cvsroot/sageplugins/webapp/resources/plugin In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25423/resources/plugin Modified Files: plugin.xml Log Message: Fix GeekTonic URL Index: plugin.xml =================================================================== RCS file: /cvsroot/sageplugins/webapp/resources/plugin/plugin.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** plugin.xml 8 Nov 2010 02:15:06 -0000 1.8 --- plugin.xml 8 Nov 2010 02:42:56 -0000 1.9 *************** *** 15,20 **** <Webpage title="Forum Support Thread">http://forums.sagetv.com/forums/showthread.php?t=52157</Webpage> <Webpage title="Mobile Web Interface Wiki">http://tools.assembla.com/sageplugins/wiki/MobileWebInterface</Webpage> ! <Webpage title="GeekTonic.com Review">http://www.geektonic.com/2010/11/sage-on-gosagetv-gets-ipad-iphone-and.html</Webpage> ! <DemoVideo title="GeekTonic on YouTube">http://www.youtube.com/watch?v=mYSf-gXyMYU</DemoVideo> <ReleaseNotes> <
