[gatein-commits] gatein SVN: r5855 - in portal/branches/shindig2: gadgets/server/src/main/webapp/containers/default and 1 other directory.
Author: alain_defrance
Date: 2011-02-07 10:55:09 -0500 (Mon, 07 Feb 2011)
New Revision: 5855
Modified:
portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js
Log:
Fix gadgets display
Modified:
portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
===================================================================
---
portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2011-02-07
14:18:32 UTC (rev 5854)
+++
portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2011-02-07
15:55:09 UTC (rev 5855)
@@ -332,11 +332,6 @@
}
return done;
}
- catch (Exception e)
- {
- e.printStackTrace();
- return null;
- }
finally
{
chromatticLifeCycle.closeContext(true);
Modified:
portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js
===================================================================
---
portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js 2011-02-07
14:18:32 UTC (rev 5854)
+++
portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js 2011-02-07
15:55:09 UTC (rev 5855)
@@ -45,7 +45,8 @@
// Container must be an array; this allows multiple containers
// to share configuration.
// TODO: Move out accel container config into a separate accel.js file.
-{"gadgets.container" : ["default", "accel"],
+// 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
@@ -114,12 +115,12 @@
"gadgets.uri.js.path" : "/eXoGadgetServer/gadgets/js",
// Default concat Uri config; used for testing.
-"gadgets.uri.concat.host" : "http://localhost:8080/",
+"gadgets.uri.concat.host" : "localhost:8080",
"gadgets.uri.concat.path" : "/eXoGadgetServer/gadgets/concat",
"gadgets.uri.concat.js.splitToken" : "false",
// Default proxy Uri config; used for testing.
-"gadgets.uri.proxy.host" : "http://localhost:8080/",
+"gadgets.uri.proxy.host" : "localhost:8080",
"gadgets.uri.proxy.path" : "/eXoGadgetServer/gadgets/proxy",
// This config data will be passed down to javascript. Please