5:34 a.m.
Author: theute
Date: 2011-09-14 06:34:45 -0400 (Wed, 14 Sep 2011)
New Revision: 7416
Modified:
epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js
Log:
Missing ports to EPP
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-09-14 10:31:44 UTC (rev 7415)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-09-14 10:34:45 UTC (rev 7416)
@@ -35,6 +35,6 @@
<module>core</module>
<module>server</module>
<module>eXoGadgets</module>
- <module>gwtGadgets</module>
+ <module>gwtGadgets</module>
</modules>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-09-14 10:31:44 UTC (rev
7415)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-09-14 10:34:45 UTC (rev
7416)
@@ -72,7 +72,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified:
epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js 2011-09-14
10:31:44 UTC (rev 7415)
+++
epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js 2011-09-14
10:34:45 UTC (rev 7416)
@@ -44,7 +44,9 @@
// Container must be an array; this allows multiple containers
// to share configuration.
-{"gadgets.container" : ["default"],
+// TODO: Move out accel container config into a separate accel.js file.
+// TODO : remove "" container
+{"gadgets.container" : ["default", "accel", ""],
// Set of regular expressions to validate the parent parameter. This is
// necessary to support situations where you want a single container to support
@@ -60,38 +62,45 @@
// DNS domain on which gadgets should render.
"gadgets.lockedDomainSuffix" : "-a.example.com:8080",
+// Origins for CORS requests and/or Referer validation
+// Indicate a set of origins or an entry with * to indicate that all origins are allowed
+"gadgets.parentOrigins" : ["*"],
+
// Various urls generated throughout the code base.
// iframeBaseUri will automatically have the host inserted
// if locked domain is enabled and the implementation supports it.
// query parameters will be added.
"gadgets.iframeBaseUri" : "/eXoGadgetServer/gadgets/ifr",
+"gadgets.uri.iframe.basePath" : "/eXoGadgetServer/gadgets/ifr",
// jsUriTemplate will have %host% and %js% substituted.
// No locked domain special cases, but jsUriTemplate must
// never conflict with a lockedDomainSuffix.
"gadgets.jsUriTemplate" :
"http://%host%/eXoGadgetServer/gadgets/js/%js%",
+//New configuration for iframeUri generation:
+"gadgets.uri.iframe.lockedDomainSuffix" : "-a.example.com:8080",
+"gadgets.uri.iframe.unlockedDomain" : "http://%host%",
+"gadgets.uri.iframe.basePath" : "/eXoGadgetServer/gadgets/ifr",
+
+
// Callback URL. Scheme relative URL for easy switch between https/http.
-"gadgets.oauthGadgetCallbackTemplate" :
"//%host%/eXoGadgetServer/gadgets/oauthcallback",
+"gadgets.uri.oauth.callbackTemplate" :
"//%host%/eXoGadgetServer/gadgets/oauthcallback",
// Use an insecure security token by default
"gadgets.securityTokenType" : "secure",
"gadgets.securityTokenKeyFile" : "key.txt",
+// Config param to load Opensocial data for social
+// preloads in data pipelining. %host% will be
+// substituted with the current host.
+"gadgets.osDataUri" : "http://%host%/rpc",
+
"gadgets.signingKeyFile" : "oauthkey.pem",
"gadgets.signingKeyName" : "mytestkey",
"gadgets.signedFetchDomain" : "eXo",
-// Config param to load Opensocial data for social
-// preloads in data pipelining. %host% will be
-// substituted with the current host.
-"gadgets.osDataUri" : "http://%host%/social/rpc",
-// Uncomment these to switch to a secure version
-//
-//"gadgets.securityTokenType" : "secure",
-//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt",
-
"gadgets.content-rewrite" : {
"include-urls": ".*",
"exclude-urls": "",
@@ -101,6 +110,19 @@
"concat-url": "/eXoGadgetServer/gadgets/concat?"
},
+// Default Js Uri config: also must be overridden.
+"gadgets.uri.js.host" : "http://%host%/",
+"gadgets.uri.js.path" : "/eXoGadgetServer/gadgets/js",
+
+// Default concat Uri config; used for testing.
+"gadgets.uri.concat.host" : "%host%",
+"gadgets.uri.concat.path" : "/eXoGadgetServer/gadgets/concat",
+"gadgets.uri.concat.js.splitToken" : "false",
+
+// Default proxy Uri config; used for testing.
+"gadgets.uri.proxy.host" : "%host%",
+"gadgets.uri.proxy.path" : "/eXoGadgetServer/gadgets/proxy",
+
// This config data will be passed down to javascript. Please
// configure your object using the feature name rather than
// the javascript name.
@@ -110,8 +132,8 @@
"gadgets.features" : {
"core.io" : {
// Note: /proxy is an open proxy. Be careful how you expose this!
- "proxyUrl" :
"http://%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
- "jsonProxyUrl" :
"http://%host%/eXoGadgetServer/gadgets/makeRequest"
+ "proxyUrl" :
"//%host%/eXoGadgetServer/gadgets/proxy?container=default&refresh=%refresh%&url=%url%%rewriteMime%",
+ "jsonProxyUrl" : "//%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
"home" : {
@@ -125,6 +147,74 @@
"aliases" : ["FULL_PAGE"]
}
},
+ "tabs": {
+ "css" : [
+ ".tablib_table {",
+ "width: 100%;",
+ "border-collapse: separate;",
+ "border-spacing: 0px;",
+ "empty-cells: show;",
+ "font-size: 11px;",
+ "text-align: center;",
+ "}",
+ ".tablib_emptyTab {",
+ "border-bottom: 1px solid #676767;",
+ "padding: 0px 1px;",
+ "}",
+ ".tablib_spacerTab {",
+ "border-bottom: 1px solid #676767;",
+ "padding: 0px 1px;",
+ "width: 1px;",
+ "}",
+ ".tablib_selected {",
+ "padding: 2px;",
+ "background-color: #ffffff;",
+ "border: 1px solid #676767;",
+ "border-bottom-width: 0px;",
+ "color: #3366cc;",
+ "font-weight: bold;",
+ "width: 80px;",
+ "cursor: default;",
+ "}",
+ ".tablib_unselected {",
+ "padding: 2px;",
+ "background-color: #dddddd;",
+ "border: 1px solid #aaaaaa;",
+ "border-bottom-color: #676767;",
+ "color: #000000;",
+ "width: 80px;",
+ "cursor: pointer;",
+ "}",
+ ".tablib_navContainer {",
+ "width: 10px;",
+ "vertical-align: middle;",
+ "}",
+ ".tablib_navContainer a:link, ",
+ ".tablib_navContainer a:visited, ",
+ ".tablib_navContainer a:hover {",
+ "color: #3366aa;",
+ "text-decoration: none;",
+ "}"
+ ]
+ },
+ "minimessage": {
+ "css": [
+ ".mmlib_table {",
+ "width: 100%;",
+ "font: bold 9px arial,sans-serif;",
+ "background-color: #fff4c2;",
+ "border-collapse: separate;",
+ "border-spacing: 0px;",
+ "padding: 1px 0px;",
+ "}",
+ ".mmlib_xlink {",
+ "font: normal 1.1em arial,sans-serif;",
+ "font-weight: bold;",
+ "color: #0000cc;",
+ "cursor: pointer;",
+ "}"
+ ]
+ },
"rpc" : {
// Path to the relay file. Automatically appended to the parent
/// parameter if it passes input validation and is not null.
@@ -147,34 +237,44 @@
"ANCHOR_COLOR": ""
}
},
- "opensocial-0.8" : {
+ "opensocial" : {
// Path to fetch opensocial data from
// Must be on the same domain as the gadget rendering server
- "path" : "http://%host%/social",
+ "path" : "http://%host%/rpc",
+ // Path to issue invalidate calls
+ "invalidatePath" : "http://%host%/rpc",
"domain" : "shindig",
"enableCaja" : false,
"supportedFields" : {
"person" : ["id", {"name" : ["familyName",
"givenName", "unstructured"]}, "thumbnailUrl",
"profileUrl"],
- "activity" : ["id", "title"]
+ "activity" : ["appId", "body", "bodyId",
"externalId", "id", "mediaItems", "postedTime",
"priority",
+ "streamFaviconUrl", "streamSourceUrl",
"streamTitle", "streamUrl", "templateParams",
"title",
+ "url", "userId"],
+ "activityEntry" : ["icon", "postedTime",
"actor", "verb", "object", "target",
"generator", "provider", "title",
+ "body", "standardLinks", "to",
"cc", "bcc"],
+ "album" : ["id", "thumbnailUrl", "title",
"description", "location", "ownerId"],
+ "mediaItem" : ["album_id", "created",
"description", "duration", "file_size", "id",
"language", "last_updated",
+ "location", "mime_type",
"num_comments", "num_views", "num_votes",
"rating", "start_time",
+ "tagged_people", "tags",
"thumbnail_url", "title", "type", "url"]
}
},
"osapi.services" : {
// Specifying a binding to "container.listMethods" instructs osapi to
dynamicaly introspect the services
// provided by the container and delay the gadget onLoad handler until that
introspection is
// complete.
- // Alternatively a container can directly configure services here rather than having
them
+ // Alternatively a container can directly configure services here rather than having
them
// introspected. Simply list out the available servies and omit
"container.listMethods" to
// avoid the initialization delay caused by gadgets.rpc
// E.g. "gadgets.rpc" : ["activities.requestCreate",
"messages.requestSend", "requestShareApp",
"requestPermission"]
"gadgets.rpc" : ["container.listMethods"]
},
-// "osapi" : {
-// // The endpoints to query for available JSONRPC/REST services
-// "endPoints" : [ "http://%host%/social/rpc",
"http://%host%/gadgets/api/rpc" ]
-// },
+ "osapi" : {
+ // The endpoints to query for available JSONRPC/REST services
+ "endPoints" : [ "http://%host%/rpc" ]
+ },
"osml": {
// OSML library resource. Can be set to null or the empty string to disable OSML
// for a container.
- "library": ""
+ "library": "config/OSML_library.xml"
}
-}}
+}}
\ No newline at end of file