Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 51731 invoked from network); 3 Jun 2005 14:32:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Jun 2005 14:32:34 -0000 Received: (qmail 87861 invoked by uid 500); 3 Jun 2005 14:32:33 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 87842 invoked by uid 500); 3 Jun 2005 14:32:33 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 87839 invoked by uid 99); 3 Jun 2005 14:32:33 -0000 X-ASF-Spam-Status: No, hits=-9.3 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,WEIRD_PORT X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 03 Jun 2005 07:32:29 -0700 Received: (qmail 51648 invoked by uid 65534); 3 Jun 2005 14:32:14 -0000 Message-ID: <20050603143214.51647.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r179801 - in /incubator/jackrabbit/trunk/contrib/tck-webapp: project.xml src/java/org/apache/jackrabbit/tck/j2ee/RepositoryServlet.java src/webapp/WEB-INF/web.xml src/webapp/docroot/js/server_call.js src/webapp/index.jsp src/webapp/submit_result.jsp src/webapp/version.id Date: Fri, 03 Jun 2005 14:32:13 -0000 To: jackrabbit-cvs@incubator.apache.org From: tripod@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: tripod Date: Fri Jun 3 07:32:12 2005 New Revision: 179801 URL: http://svn.apache.org/viewcvs?rev=3D179801&view=3Drev Log: - adjusting to version 1.0 - minor enhancements Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackr= abbit/tck/j2ee/RepositoryServlet.java incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/web.xml incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/docroot/js/ser= ver_call.js incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/index.jsp incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/submit_result.= jsp incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/version.id Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-w= ebapp/project.xml?rev=3D179801&r1=3D179800&r2=3D179801&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml (original) +++ incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml Fri Jun 3 07= :32:12 2005 @@ -22,7 +22,7 @@ tck-webapp Day TCK web application - 0.16.4.1 + 1.0 =20 =20 @@ -66,8 +66,7 @@ jsr170 jcr - 0.16.4.1 - http://www.day.com/maven/jsr170/jars/jcr-0.16.4.jar + 1.0 Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache= /jackrabbit/tck/j2ee/RepositoryServlet.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-w= ebapp/src/java/org/apache/jackrabbit/tck/j2ee/RepositoryServlet.java?rev=3D= 179801&r1=3D179800&r2=3D179801&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackr= abbit/tck/j2ee/RepositoryServlet.java (original) +++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackr= abbit/tck/j2ee/RepositoryServlet.java Fri Jun 3 07:32:12 2005 @@ -64,6 +64,9 @@ /** exclude list version checker gif path */ public static final String CHECK_EXCLUDELIST_VERSION_GIF_PATH =3D "ch= eck-excludelist-version-gif"; =20 + /** exclude list version checker gif path */ + public static final String TCK_UPDATE_URL =3D "tck-update-page"; + /** tck webapp jar path name */ public static final String TCK_WEBAPP_JAR_PATH =3D "tck-webapp-jar-pa= th"; =20 @@ -94,6 +97,9 @@ /** the exclude list checker url */ private static String excludeListCheckerPath; =20 + /** the update url */ + private static String tckUpdateUrl; + /** * The init method starts the repository to read/write test results an= d configuration, * sets the jaas config and the user id and the user password @@ -188,6 +194,9 @@ // set the exclude list checker path excludeListCheckerPath =3D getServletConfig().getInitParameter= (CHECK_EXCLUDELIST_VERSION_GIF_PATH); =20 + // set the tck update page url + tckUpdateUrl =3D getServletConfig().getInitParameter(TCK_UPDAT= E_URL); + } catch (RepositoryException e) { log_info("Unable to initialize repository: " + e.toString(), e= ); throw new ServletException("Unable to initialize repository: "= + e.toString(), e); @@ -292,5 +301,14 @@ */ public static String getExcludeListCheckerPath() { return excludeListCheckerPath; + } + + /** + * Returns the tck update url + * + * @return url pointing to update page + */ + public static String getTckUpdateUrl() { + return tckUpdateUrl; } } Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/= web.xml URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-w= ebapp/src/webapp/WEB-INF/web.xml?rev=3D179801&r1=3D179800&r2=3D179801&view= =3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/web.xm= l (original) +++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/web.xm= l Fri Jun 3 07:32:12 2005 @@ -50,19 +50,19 @@ =20 submit-url - http://www.day.com/en/product/jsr_170/tck_submit.= html + http://www.day.com/en/product/jsr_170/tck/tck_sub= mit.html Url pointing to test result submit receiver =20 tck-webapp-jar-path - /WEB-INF/lib/tck-webapp-0.16.4.1.jar + /WEB-INF/lib/tck-webapp-1.0.jar Path to the tck webapp jar, where the test source= s reside =20 exclude-list-url - http://www.day.com/en/product/jsr_170/exclude_lis= t=2Ehtml + http://www.day.com/en/product/jsr_170/tck/exclude= list Url pointing to exclude list provider =20 @@ -76,6 +76,12 @@ check-excludelist-version-gif http://dev.day.com/excludelist.gif Url pointing to the excludelist version checker + + + + tck-update-page + http://www.day.com/en/product/jsr_170/tck/tckupda= te + Url pointing to the tck update page =20 1 Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/docroot/= js/server_call.js URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-w= ebapp/src/webapp/docroot/js/server_call.js?rev=3D179801&r1=3D179800&r2=3D17= 9801&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/docroot/js/ser= ver_call.js (original) +++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/docroot/js/ser= ver_call.js Fri Jun 3 07:32:12 2005 @@ -1,8 +1,10 @@ -function startTest(dlurl, checkerurl, currentVersion, useExcludeList) { +var uptodate; + +function startTest(dlurl, useExcludeList) { if (!useExcludeList) { window.graph.document.location.href=3D"graph.jsp?mode=3Dtestnow&us= eExcludeList=3Dno"; } else { - if (excludeListIsUpToDate(checkerurl + "?v=3D" + currentVersion)) = { + if (uptodate) { window.graph.document.location.href=3D"graph.jsp?mode=3Dtestno= w&useExcludeList=3Dyes"; } else { if (window.confirm("The Exclude List is out of date.\nPress OK= to continue testing or CANCEL to get pointed to the download page")) { @@ -15,11 +17,11 @@ } =20 function isUpToDate() { - return true; + uptodate =3D true; } =20 function isOutOfDate() { - return false; + uptodate =3D false; } =20 function excludeListIsUpToDate(url) { @@ -28,5 +30,4 @@ tester.onerror =3D isOutOfDate; tester.src =3D url; } - =20 Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/index.jsp URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-w= ebapp/src/webapp/index.jsp?rev=3D179801&r1=3D179800&r2=3D179801&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/index.jsp (ori= ginal) +++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/index.jsp Fri = Jun 3 07:32:12 2005 @@ -32,7 +32,7 @@ } =20 // checker intervall -long checkerIntervall =3D 3600; +long CHECKER_INTERVALL =3D 24 * 60 * 60 * 1000; =20 // load download id from file Properties props =3D new Properties(); @@ -68,7 +68,7 @@ // last version checker time long lastChecked =3D (repSession.getRootNode().hasNode("lastChecked")) ? r= epSession.getRootNode().getNode("lastChecked").getProperty("time").getLong(= ) : 0; long currentTime =3D System.currentTimeMillis(); -boolean checkIt =3D ((lastChecked + checkerIntervall * 1000) < currentTime= ) || lastChecked =3D=3D 0; +boolean checkIt =3D ((lastChecked + CHECKER_INTERVALL) < currentTime) || l= astChecked =3D=3D 0; boolean isUpToDate =3D (repSession.getRootNode().hasNode("lastChecked")) ?= repSession.getRootNode().getNode("lastChecked").getProperty("uptodate").ge= tBoolean() : true; =20 // load version @@ -121,6 +121,17 @@ String mode =3D request.getParameter("mode"); mode =3D (mode =3D=3D null || mode.equals("")) ? "test" : mode; =20 +String exludeListTestMethod =3D ""; + +if (mode.equals("test")) { + // get exclude list version currently stored in the tck repository + String excludeListVersion =3D ""; + if (repSession.getRootNode().hasNode("excludelist")) { + Node excludeListNode =3D repSession.getRootNode().getNode("exclude= list"); + excludeListVersion =3D excludeListNode.getProperty("version").getS= tring(); + } + exludeListTestMethod =3D (mode.equals("test")) ? "excludeListIsUpToDat= e('" + RepositoryServlet.getExcludeListCheckerPath() + "?v=3D" + excludeLis= tVersion + "');" : ""; +} %> TCK for JSR170 @@ -138,23 +149,27 @@ } } =20 - function setGreen() { + function setGreen(doNotTell) { var img =3D document.getElementById('vcheckpic'); img.src =3D "docroot/imgs/green.png"; img.setAttribute("title", "The Tck web application is up to da= te."); // tell server that a check got performed (perform in 24h agai= n) - tellChecked(<%=3D currentTime %>, true); + if (!doNotTell) { + tellChecked(<%=3D currentTime %>, true); + } } =20 - function setRed() { + function setRed(doNotTell) { var img =3D document.getElementById('vcheckpic'); img.src =3D "docroot/imgs/red.png"; img.setAttribute("title", "A new Tck version is available."); var link =3D document.getElementById('vcheckpic_href'); - link.setAttribute("href", "http://localhost:4302/update.html?d= id=3D<%=3D did %>"); + link.setAttribute("href", "<%=3D RepositoryServlet.getTckUpdat= eUrl() %>"); link.setAttribute("target", "_new"); // tell server that a check got performed (perform in 24h agai= n) - tellChecked(<%=3D currentTime %>, false); + if (!doNotTell) { + tellChecked(<%=3D currentTime %>, false); + } } =20 function tellChecked(currTime, upToDate) { @@ -176,16 +191,16 @@ <% } else { if (isUpToDate) { - %>setGreen();<% + %>setGreen(true);<% } else { - %>setRed();<% + %>setRed(true);<% } }%> } =20 - ');"> + ');<%=3D= exludeListTestMethod %>">
@@ -218,12 +233,6 @@ <% if (mode.equals("test")) { - // get exclude list version currently stored in the tc= k repository - String excludeListVersion =3D ""; - if (repSession.getRootNode().hasNode("excludelist")) { - Node excludeListNode =3D repSession.getRootNode().= getNode("excludelist"); - excludeListVersion =3D excludeListNode.getProperty= ("version").getString(); - } %>
@@ -233,7 +242,7 @@ - + Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/submit_r= esult.jsp URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-w= ebapp/src/webapp/submit_result.jsp?rev=3D179801&r1=3D179800&r2=3D179801&vie= w=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/submit_result.= jsp (original) +++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/submit_result.= jsp Fri Jun 3 07:32:12 2005 @@ -120,11 +120,13 @@ - + Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/version.= id URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-w= ebapp/src/webapp/version.id?rev=3D179801&r1=3D179800&r2=3D179801&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/version.id (or= iginal) +++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/version.id Fri= Jun 3 07:32:12 2005 @@ -1 +1 @@ -version.id=3D1.0-RC2 \ No newline at end of file +version.id=3D1.0
','<%=3D RepositoryServlet.getExcludeListCheck= erPath() %>','<%=3D excludeListVersion %>', document.getElementById('excude= list').checked)">', document.getElementById('excudelis= t').checked)"> Start Test Exclude List  Subm= it Test Data
-  ">">"> +  ">">">
Publishing test results allowed + Publishing test results allowed +