[Sciviews-commits] r547 - in pkg/svHttp: . R man

[noreply at r-forge.r-project.org]

Author: phgrosjean
Date: 2014-03-01 22:01:00 +0100 (Sat, 01 Mar 2014)
New Revision: 547

Modified:
   pkg/svHttp/DESCRIPTION
   pkg/svHttp/NEWS
   pkg/svHttp/R/httpServer.R
   pkg/svHttp/man/svHttp-package.Rd
Log:
svHttp: removed use of :::

Modified: pkg/svHttp/DESCRIPTION
===================================================================
--- pkg/svHttp/DESCRIPTION	2014-03-01 20:07:24 UTC (rev 546)
+++ pkg/svHttp/DESCRIPTION	2014-03-01 21:01:00 UTC (rev 547)
@@ -1,7 +1,7 @@
 Package: svHttp
 Type: Package
-Version: 0.9-54
-Date: 2012-04-02
+Version: 0.9-55
+Date: 2014-03-01
 Title: SciViews GUI API - R HTTP server
 Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
   email = "phgrosjean at sciviews.org"))

Modified: pkg/svHttp/NEWS
===================================================================
--- pkg/svHttp/NEWS	2014-03-01 20:07:24 UTC (rev 546)
+++ pkg/svHttp/NEWS	2014-03-01 21:01:00 UTC (rev 547)
@@ -2,6 +2,13 @@
 
 == Changes in svHttp 0.9-54
 
+* LICENSE file eliminated.
+
+* No more use of ::: (not allowed by CRAN).
+
+
+== Changes in svHttp 0.9-54
+
 * NEWS file reworked to use the new Rd format.
 
 * Temporary data are now saved in SciViews:TempEnv environment (was TempEnv),

Modified: pkg/svHttp/R/httpServer.R
===================================================================
--- pkg/svHttp/R/httpServer.R	2014-03-01 20:07:24 UTC (rev 546)
+++ pkg/svHttp/R/httpServer.R	2014-03-01 21:01:00 UTC (rev 547)
@@ -21,8 +21,7 @@
 		## This port is stored in 'ko.serve' option
 		options(ko.serve = port)
 		## If the server is running on another port, restart it now
-		## TODO: avoid using ::: here => how to get it "officially"?
-		curport <- tools:::httpdPort
+		curport <- getNamespace("tools")$httpdPort
 		if (curport > 0 && curport != port) startHttpServer(port = port)
 		return(port)
 	} else {  # Get the server port
@@ -107,8 +106,7 @@
 stopHttpServer <- function (remove.clients = FALSE)
 {
 	## Eliminate the SciViews custom process function for HTTP server
-	## TODO: how to get it without using ::: ?
-	e <- tools:::.httpd.handlers.env
+	e <- getNamespace("tools")$.httpd.handlers.env
 	if ("SciViews" %in% ls(envir = e)) rm(list = "SciViews", envir = e)
 	
 	## Do we also remove persistent data for clients?
@@ -134,8 +132,7 @@
 		stop("'port' must be a positive integer!")
 	port <- as.integer(round(port[1]))
 	## The port on which the server currently runs
-	## TODO: how to get it without using ::: ?
-	curport <- tools:::httpdPort
+	curport <- getNamespace("tools")$httpdPort
 	
 	## Can we run the server?
 	if (curport == -1L || nzchar(Sys.getenv("R_DISABLE_HTTPD")))
@@ -163,8 +160,7 @@
 		HttpServerName(name)
 		
 		## Install the SciViews function that will process our requests
-		## TODO: how to get it without using ::: ?
-		e <- tools:::.httpd.handlers.env
+		e <- getNamespace("tools")$.httpd.handlers.env
 		e[["SciViews"]] <- function (path, query, body, ...) {
 			## Analyze the query: command + callback
 			#cat(query, "\n", sep = " -- ")

Modified: pkg/svHttp/man/svHttp-package.Rd
===================================================================
--- pkg/svHttp/man/svHttp-package.Rd	2014-03-01 20:07:24 UTC (rev 546)
+++ pkg/svHttp/man/svHttp-package.Rd	2014-03-01 21:01:00 UTC (rev 547)
@@ -14,8 +14,8 @@
   \tabular{ll}{
     Package: \tab svHttp\cr
     Type: \tab Package\cr
-    Version: \tab 0.9-54\cr
-    Date: \tab 2012-04-02\cr
+    Version: \tab 0.9-55\cr
+    Date: \tab 2012-03-01\cr
     License: \tab GPL 2 or above, at your convenience\cr
   }
   % TODO: add description of main functions here. Also add examples