improvements to blank node handling in bulk deletion

opensocial/shindig.orng.properties

@@ -0,0 +1,190 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+##################################################################
+#
+#  Note from UCSF.  Compare this to the latest in shindig-common/conf/shindig.properties
+#  whenever you download a new version of shindig
+#
+##################################################################
+
+# Location of feature manifests (comma separated)
+shindig.features.default=res://features/features.txt
+
+# Location of container configurations (comma separated)
+#shindig.containers.default=res://containers/default/container.js
+shindig.containers.default=res://orng-container.js
+
+# A file containing blacklisted gadgets.
+shindig.blacklist.file=
+
+### Inbound OAuth support
+# The URL base to use for full OAuth support (three-legged)
+shindig.oauth.base-url=/oauth/
+shindig.oauth.authorize-action=/WEB-INF/authorize.jsp
+
+### Outbound OAuth support
+shindig.signing.state-key=
+shindig.signing.key-name=
+shindig.signing.key-file=
+shindig.signing.global-callback-url=http://localhost:8080/shindigorng/gadgets/oauthcallback
+shindig.signing.enable-signed-callbacks=true
+
+# Set to true if you want to allow the use of 3-legged OAuth tokens when viewer != owner.
+# This setting is not recommeneded for pages that allow user-controlled javascript, since
+# that javascript could be used to make unauthorized requests on behalf of the viewer of the page
+shindig.signing.viewer-access-tokens-enabled=false
+
+# If enabled here, configuration values can be found in container configuration files.
+shindig.locked-domain.enabled=false
+
+# TODO: This needs to be moved to container configuration.
+# Note by Eric.  This is set up to now exclude everything and include nothing
+shindig.content-rewrite.only-allow-excludes=false
+shindig.content-rewrite.include-urls=.*
+shindig.content-rewrite.exclude-urls=
+shindig.content-rewrite.include-tags=body,embed,img,input,link,script,style
+shindig.content-rewrite.expires=86400
+shindig.content-rewrite.proxy-url=/shindigorng/gadgets/proxy?container=default&url=
+shindig.content-rewrite.concat-url=/shindigorng/gadgets/concat?container=default&
+shindig.content-rewrite.enable-split-js-concat=false
+
+#
+# Default set of forced libs to allow for better caching
+#
+# NOTE: setting this causes the EndToEnd test to fail the opensocial-templates test
+shindig.gadget-rewrite.default-forced-libs=core:rpc
+shindig.gadget-rewrite.default-forced-libs=
+
+#
+# Allow supported JavaScript features required by a gadget to be externalized on demand
+shindig.gadget-rewrite.externalize-feature-libs=true
+
+# Configuration for image rewriter
+shindig.image-rewrite.max-inmem-bytes = 1048576
+shindig.image-rewrite.max-palette-size = 256
+shindig.image-rewrite.allow-jpeg-conversion = true
+shindig.image-rewrite.jpeg-compression = 0.75
+shindig.image-rewrite.min-threshold-bytes = 200
+
+# Configuration for the os:Flash tag
+shindig.flash.min-version = 9.0.115
+
+# Configuration for template rewriter
+shindig.template-rewrite.extension-tag-namespace=http://ns.opensocial.org/2009/extensions
+
+# These values provide default TTLs for HTTP responses that don't use caching headers.
+shindig.cache.http.defaultTtl=3600000
+shindig.cache.http.negativeCacheTtl=60000
+
+# A default refresh interval for XML files, since there is no natural way for developers to
+# specify this value, and most HTTP responses don't include good cache control headers.
+shindig.cache.xml.refreshInterval=300000
+
+# Add entries in the form shindig.cache.lru.<name>.capacity to specify capacities for different
+# caches when using the LruCacheProvider.
+# It is highly recommended that the EhCache implementation be used instead of the LRU cache.
+shindig.cache.lru.default.capacity=1000
+shindig.cache.lru.expressions.capacity=1000
+shindig.cache.lru.gadgetSpecs.capacity=1000
+shindig.cache.lru.messageBundles.capacity=1000
+shindig.cache.lru.httpResponses.capacity=10000
+
+# The location of the EhCache configuration file.
+shindig.cache.ehcache.config=res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml
+
+# True to enable JMX integration with cache stats
+shindig.cache.ehcache.jmx.enabled=true
+
+# true to enable JMX stats.
+shindig.cache.ehcache.jmx.stats=true
+
+# true to skip expensive encoding detection.
+# if true, will only attempt to validate utf-8. Assumes all other encodings are ISO-8859-1.
+shindig.http.fast-encoding-detection=true
+
+# Configuration for the HttpFetcher
+# Connection timeout, in milliseconds, for requests.
+shindig.http.client.connection-timeout-ms=5000
+
+# Maximum size, in bytes, of the object we fetched, 0 == no limit
+shindig.http.client.max-object-size-bytes=0
+
+# Strict-mode parsing for proxy and concat URIs ensures that the authority/host and path
+# for the URIs match precisely what is found in the container config for it. This is
+# useful where statistics and traffic routing patterns, typically in large installations,
+# key on hostname (and occasionally path). Enforcing this does come at the cost that
+# mismatches break, which in turn mandates that URI generation always happen in consistent
+# fashion, ie. by the class itself or tightly controlled code.
+shindig.uri.proxy.use-strict-parsing=false
+shindig.uri.concat.use-strict-parsing=false
+
+# Host:port of the proxy to use while fetching urls. Leave blank if proxy is
+# not to be used.
+org.apache.shindig.gadgets.http.basicHttpFetcherProxy=
+
+org.apache.shindig.serviceExpirationDurationMinutes=60
+
+#
+# Older versions of shindig used 'data' in the json-rpc response format
+# The spec calls for using 'result' instead, however to avoid breakage we
+# allow you to set it back to the old way here
+#
+# valid values are
+#  result  - new form
+#  data    - old broken form
+#  both    - return both fields for full compatibility
+#
+shindig.json-rpc.result-field=result
+
+# Remap "Internal server error"s received from the basicHttpFetcherProxy server to
+# "Bad Gateway error"s, so that it is clear to the user that the proxy server is
+# the one that threw the exception.
+shindig.accelerate.remapInternalServerError=true
+shindig.proxy.remapInternalServerError=true
+
+shindig.signing.key-file=/shindig/openssl/oauthkey.pem
+shindig.signing.key-name=
+
+####################################################################################
+#
+#	Open Research Networking Gadgets Items 
+#
+#####################################################################################
+
+# orng.system must be set to Profiles or VIVO
+#orng.system = Profiles
+orng.system = VIVO
+
+# orng.dbDriver is likely com.microsoft.sqlserver.jdbc.SQLServerDriver for Profiles and com.mysql.jdbc.Driver for VIVO
+#orng.dbDriver = com.microsoft.sqlserver.jdbc.SQLServerDriver
+orng.dbDriver = com.mysql.jdbc.Driver
+orng.dbURL = jdbc:mysql://localhost/vitrodb
+orng.dbUser = vitrodb
+orng.dbPassword = vitrodb
+orng.tokenservice.port = 8777
+# orng.RDFConverter = elda | babel 
+orng.RDFConverter = elda
+#orng.RDFConverter = babel
+
+# until Profiles has RDF 
+orng.profilesXMLService = http://dev-profiles.ucsf.edu/api_100810/ProfileService.svc/ProfileSearch
+orng.profilesRDF = true;
+
+
+
+

opensocial/shindig_example_gadgets.sql

@@ -0,0 +1,28 @@
+
+-- Add some gadgets to play with ------------------------
+--
+
+INSERT INTO `shindig_apps` (`appid`, `name`, `url`, `PersonFilterID`, `enabled`, `channels`) VALUES
+(100, 'Google Search', 'http://dev-profiles.ucsf.edu/apps/GoogleSearch.xml', NULL, 1, NULL),
+(101, 'Featured Presentations', 'http://dev-profiles.ucsf.edu/apps/SlideShare.xml', NULL, 1, NULL),
+(102, 'Faculty Mentor', 'http://dev-profiles.ucsf.edu/apps/Mentor.xml', NULL, 1, NULL),
+(103, 'Websites', 'http://dev-profiles.ucsf.edu/apps/Links.xml', NULL, 1, NULL),
+(104, 'Profile List', 'http://dev-profiles.ucsf.edu/apps/ProfileListTool.xml', NULL, 1, 'JSONPersonIds'),
+(105, 'Publication Export', 'http://dev-profiles.ucsf.edu/apps/PubExportTool.xml', NULL, 1, 'JSONPubMedIds'),
+(106, 'RDF Test Gadget', 'http://dev-profiles.ucsf.edu/gadgets/RDFTest.xml', NULL, 1, NULL);
+
+INSERT INTO `shindig_app_views` (`appid`, `viewer_req`, `owner_req`, `page`, `view`, `closed_width`, `open_width`, `start_closed`, `chromeId`, `display_order`) VALUES
+(100, NULL, NULL, 'search', NULL, 600, 600, 1, 'gadgets-search', NULL),
+(101, NULL, 'R', 'individual', 'profile', 291, 590, 1, 'gadgets-view', 3),
+(101, NULL, NULL, 'individual-EDIT-MODE', 'home', 700, 700, 1, 'gadgets-edit', NULL),
+(102, NULL, 'R', 'individual', 'profile', 291, 590, 1, 'gadgets-view', 2),
+(102, NULL, NULL, 'individual-EDIT-MODE', 'home', 700, 700, 1, 'gadgets-edit', NULL),
+(103, NULL, NULL, 'individual-EDIT-MODE', 'home', 700, 700, 1, 'gadgets-edit', NULL),
+(103, NULL, 'R', 'individual', 'profile', 291, 590, 0, 'gadgets-view', 1),
+(104, 'U', NULL, 'search', 'small', 160, 160, 0, 'gadgets-tools', NULL),
+(104, 'U', NULL, 'gadgetDetails', 'canvas', 700, 700, 0, 'gadgets-detail', NULL),
+(104, 'U', NULL, 'SimilarPeople.aspx', 'small', 160, 160, 0, 'gadgets-tools', NULL),
+(104, 'U', NULL, 'individual', 'small', 160, 160, 0, 'gadgets-view', NULL),
+(104, 'U', NULL, 'CoAuthors.aspx', 'small', 160, 160, 0, 'gadgets-tools', NULL),
+(105, 'U', NULL, 'individual', 'small', 160, 160, 0, 'gadgets-view', NULL),
+(105, 'U', NULL, 'gadgetDetails', 'canvas', 700, 700, 0, 'gadgets-detail', NULL);

opensocial/shindig_orng_tables.sql

@@ -0,0 +1,145 @@
+
+--
+-- Table structure for table `shindig_activity`
+--
+
+CREATE TABLE IF NOT EXISTS `shindig_activity` (
+  `activityId` int(11) NOT NULL AUTO_INCREMENT,
+  `userId` varchar(255) default NULL,
+  `appId` int(11) default NULL,
+  `createdDT` datetime default NULL,
+  `activity` text,
+  PRIMARY KEY  (`activityId`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `shindig_appdata`
+--
+
+CREATE TABLE IF NOT EXISTS `shindig_appdata` (
+  `userId` varchar(255) NOT NULL,
+  `appId` int(11) NOT NULL,
+  `keyname` varchar(255) NOT NULL,
+  `value` varchar(4000) default NULL,
+  `createdDT` datetime default NULL,
+  `updatedDT` datetime default NULL,
+  KEY `userId` (`userId`,`appId`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `shindig_apps`
+--
+
+CREATE TABLE IF NOT EXISTS `shindig_apps` (
+  `appid` int(11) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `PersonFilterID` int(11) default NULL,
+  `enabled` tinyint(1) NOT NULL default '1',
+  `channels` varchar(255) default NULL,
+  PRIMARY KEY  (`appid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `shindig_app_registry`
+--
+
+CREATE TABLE IF NOT EXISTS `shindig_app_registry` (
+  `appid` int(11) NOT NULL,
+  `personId` varchar(255) NOT NULL,
+  `createdDT` datetime NOT NULL,
+  PRIMARY KEY  (`appid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `shindig_app_views`
+--
+
+CREATE TABLE IF NOT EXISTS `shindig_app_views` (
+  `appid` int(11) NOT NULL,
+  `viewer_req` char(1) default NULL,
+  `owner_req` char(1) default NULL,
+  `page` varchar(50) default NULL,
+  `view` varchar(50) default NULL,
+  `closed_width` int(11) default NULL,
+  `open_width` int(11) default NULL,
+  `start_closed` tinyint(1) default NULL,
+  `chromeId` varchar(50) default NULL,
+  `display_order` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `shindig_messages`
+--
+
+CREATE TABLE IF NOT EXISTS `shindig_messages` (
+  `msgId` varchar(255) NOT NULL,
+  `senderId` varchar(255) default NULL,
+  `recipientId` varchar(255) default NULL,
+  `coll` varchar(255) default NULL,
+  `title` varchar(255) default NULL,
+  `body` varchar(4000) default NULL,
+  `createdDT` datetime default NULL,
+  PRIMARY KEY  (`msgId`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+
+DELIMITER // 
+CREATE PROCEDURE shindig_registerAppPerson (uid varchar(255), aid INT, v BOOL)
+BEGIN
+	IF (v)
+	THEN
+		INSERT INTO shindig_app_registry (appId, personId, createdDT) values (aid, uid, now());
+	ELSE 
+		DELETE FROM shindig_app_registry where appId = aid AND personId = uid;
+	END IF;	
+END // 
+DELIMITER ; 
+
+DELIMITER // 
+CREATE PROCEDURE shindig_upsertAppData(uid varchar(255), aid INT, kn varchar(255),v varchar(4000))
+BEGIN
+	DECLARE cnt int;
+	SELECT count(*) FROM shindig_appdata WHERE userId = uid AND appId = aid and keyname = kn INTO cnt; 
+	IF (cnt > 0)
+	THEN
+		UPDATE shindig_appdata set `value` = v, updatedDT = NOW() WHERE userId = uid AND appId = aid and keyname = kn;
+	ELSE
+		INSERT INTO shindig_appdata (userId, appId, keyname, `value`) values (uid, aid, kn, v);
+	END IF;
+		-- if keyname is VISIBLE, do more
+	IF (kn = 'VISIBLE' AND v = 'Y') 
+	THEN
+		CALL shindig_registerAppPerson(uid, aid, 1);
+	ELSEIF (kn = 'VISIBLE' )
+	THEN
+		CALL shindig_registerAppPerson(uid, aid, 0);
+	END IF;
+END // 
+DELIMITER ;					
+
+DELIMITER // 
+CREATE PROCEDURE shindig_deleteAppData(uid varchar(255),aid INT, kn varchar(255))
+BEGIN
+	DELETE FROM shindig_appdata WHERE userId = uid AND appId = aid and keyname = kn;
+		-- if keyname is VISIBLE, do more
+	IF (kn = 'VISIBLE' ) 
+	THEN
+		CALL shindig_registerAppPerson(uid, aid, 0);
+	END IF;
+END // 
+DELIMITER ;
+
+