[gatein-commits] gatein SVN: r7166 - in epp/portal/branches/EPP_5_2_Branch: gadgets/core/src/main/java/containers/default and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Aug 17 16:57:48 EDT 2011
Author: mwringe
Date: 2011-08-17 16:57:48 -0400 (Wed, 17 Aug 2011)
New Revision: 7166
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/containers/default/container.js
epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java
epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java
epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java
epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/WEB-INF/web.xml
Log:
JBEPP-938: merge in Shindig 2 support.
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-17 15:37:06 UTC (rev 7165)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-17 20:57:48 UTC (rev 7166)
@@ -1143,36 +1143,6 @@
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- <exclusion>
- <artifactId>htmlparser</artifactId>
- <groupId>nu.validator.htmlparser</groupId>
- </exclusion>
- <exclusion>
- <artifactId>oauth</artifactId>
- <groupId>net.oauth.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>oauth-consumer</artifactId>
- <groupId>net.oauth.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>oauth-httpclient3</artifactId>
- <groupId>net.oauth.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jdom</artifactId>
- <groupId>org.jdom</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
@@ -1183,37 +1153,9 @@
<artifactId>shindig-common</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-jmx</artifactId>
</exclusion>
- <exclusion>
- <artifactId>commons-beanutils-core</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-betwixt</artifactId>
- <groupId>commons-betwixt</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-collections</artifactId>
- <groupId>commons-collections</groupId>
- </exclusion>
- <exclusion>
- <artifactId>ezmorph</artifactId>
- <groupId>net.sf.ezmorph</groupId>
- </exclusion>
- <exclusion>
- <artifactId>json-lib</artifactId>
- <groupId>net.sf.json-lib</groupId>
- </exclusion>
- <exclusion>
- <artifactId>oauth</artifactId>
- <groupId>net.oauth.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xpp3_min</artifactId>
- <groupId>xpp3</groupId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1221,53 +1163,17 @@
<artifactId>shindig-social-api</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
+ <artifactId>guice-jmx</artifactId>
+ <groupId>com.google.inject.extensions</groupId>
</exclusion>
<exclusion>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-betwixt</artifactId>
- <groupId>commons-betwixt</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-collections</artifactId>
- <groupId>commons-collections</groupId>
- </exclusion>
- <exclusion>
- <artifactId>ezmorph</artifactId>
- <groupId>net.sf.ezmorph</groupId>
- </exclusion>
- <exclusion>
- <artifactId>json-lib</artifactId>
- <groupId>net.sf.json-lib</groupId>
- </exclusion>
- <exclusion>
<artifactId>oauth</artifactId>
<groupId>net.oauth.core</groupId>
</exclusion>
<exclusion>
- <artifactId>oauth-consumer</artifactId>
- <groupId>net.oauth.core</groupId>
- </exclusion>
- <exclusion>
<artifactId>oauth-provider</artifactId>
<groupId>net.oauth.core</groupId>
</exclusion>
- <exclusion>
- <artifactId>oauth-httpclient3</artifactId>
- <groupId>net.oauth.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xpp3_min</artifactId>
- <groupId>xpp3</groupId>
- </exclusion>
</exclusions>
</dependency>
@@ -1283,6 +1189,22 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+
+
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
@@ -1309,6 +1231,29 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>caja</groupId>
+ <artifactId>caja</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>caja</groupId>
+ <artifactId>json_simple</artifactId>
+ </dependency>
+
+
<!-- needed so that GTN can be run on the IBM jdk, to be removed when the IBM jdk no longer needs this hack -->
<dependency>
<groupId>net.jcip</groupId>
@@ -1513,4 +1458,4 @@
</snapshots>
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/containers/default/container.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/containers/default/container.js 2011-08-17 15:37:06 UTC (rev 7165)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/containers/default/container.js 2011-08-17 20:57:48 UTC (rev 7166)
@@ -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
@@ -59,39 +61,42 @@
// 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": "",
@@ -100,7 +105,19 @@
"proxy-url": "/eXoGadgetServer/gadgets/proxy?url=",
"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,7 +127,7 @@
"gadgets.features" : {
"core.io" : {
// Note: /proxy is an open proxy. Be careful how you expose this!
- "proxyUrl" : "//%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
+ "proxyUrl" : "//%host%/eXoGadgetServer/gadgets/proxy?container=default&refresh=%refresh%&url=%url%%rewriteMime%",
"jsonProxyUrl" : "//%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
@@ -125,6 +142,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,15 +232,25 @@
"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" : {
@@ -168,13 +263,13 @@
// 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"
}
}}
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-08-17 15:37:06 UTC (rev 7165)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-08-17 20:57:48 UTC (rev 7166)
@@ -25,7 +25,7 @@
import com.google.inject.name.Named;
import sun.misc.BASE64Encoder;
-import org.apache.shindig.auth.BlobCrypterSecurityTokenDecoder;
+import org.apache.shindig.auth.BlobCrypterSecurityTokenCodec;
import org.apache.shindig.config.ContainerConfigException;
import org.apache.shindig.config.JsonContainerConfig;
import org.apache.shindig.expressions.Expressions;
@@ -165,7 +165,7 @@
@Override
public Object getProperty(String container, String property)
{
- if (property.equals(BlobCrypterSecurityTokenDecoder.SECURITY_TOKEN_KEY_FILE) && _keyPath != null)
+ if (property.equals(BlobCrypterSecurityTokenCodec.SECURITY_TOKEN_KEY_FILE) && _keyPath != null)
{
return _keyPath;
}
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java 2011-08-17 15:37:06 UTC (rev 7165)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java 2011-08-17 20:57:48 UTC (rev 7166)
@@ -41,6 +41,6 @@
@Inject
public ExoHttpFetcher()
{
- super(DEFAULT_MAX_OBJECT_SIZE, DEFAULT_CONNECT_TIMEOUT_MS);
+ super(DEFAULT_MAX_OBJECT_SIZE, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_CONNECT_TIMEOUT_MS, null);
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java 2011-08-17 15:37:06 UTC (rev 7165)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java 2011-08-17 20:57:48 UTC (rev 7166)
@@ -19,9 +19,16 @@
package org.exoplatform.portal.gadget.core;
+import com.google.inject.AbstractModule;
+import com.google.inject.name.Names;
+
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.DefaultGuiceModule;
import org.apache.shindig.gadgets.http.HttpFetcher;
+import org.apache.shindig.protocol.conversion.BeanAtomConverter;
+import org.apache.shindig.protocol.conversion.BeanConverter;
+import org.apache.shindig.protocol.conversion.BeanJsonConverter;
+import org.apache.shindig.protocol.conversion.BeanXmlConverter;
/**
* The goal of the module is to bind the {@link org.apache.shindig.common.ContainerConfig} interface to the
@@ -31,16 +38,17 @@
* @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class ExoModule extends DefaultGuiceModule
+public class ExoModule extends AbstractModule
{
@Override
protected void configure()
{
- //super.configure();
-
- //
bind(ContainerConfig.class).to(ExoContainerConfig.class);
bind(HttpFetcher.class).to(ExoHttpFetcher.class);
+
+ bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml")).to(BeanXmlConverter.class);
+ bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(BeanJsonConverter.class);
+ bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.atom")).to(BeanAtomConverter.class);
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-17 15:37:06 UTC (rev 7165)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-17 20:57:48 UTC (rev 7166)
@@ -49,34 +49,9 @@
<!-- project dependencies -->
<dependency>
<groupId>org.gatein.shindig</groupId>
- <artifactId>shindig-server</artifactId>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.gatein.shindig</groupId>
<artifactId>shindig-features</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.gatein.shindig</groupId>
- <artifactId>shindig-social-api</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>net.oauth.core</groupId>
- <artifactId>oauth-provider</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.oauth</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice-jmx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- external dependencies -->
<dependency>
@@ -94,24 +69,12 @@
<artifactId>json_simple</artifactId>
<scope>provided</scope>
</dependency>
- <!--
<dependency>
- <groupId>net.oauth</groupId>
- <artifactId>core</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
- -->
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>provided</scope>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-08-17 15:37:06 UTC (rev 7165)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-08-17 20:57:48 UTC (rev 7166)
@@ -52,8 +52,23 @@
<filter-name>ProxyServletFilter</filter-name>
<filter-class>org.exoplatform.portal.gadget.core.ProxyServletFilter</filter-class>
</filter>
+
+ <filter>
+ <filter-name>hostFilter</filter-name>
+ <filter-class>org.apache.shindig.common.servlet.HostFilter</filter-class>
+ </filter>
<filter-mapping>
+ <filter-name>hostFilter</filter-name>
+ <url-pattern>/gadgets/ifr</url-pattern>
+ <url-pattern>/gadgets/js/*</url-pattern>
+ <url-pattern>/gadgets/proxy/*</url-pattern>
+ <url-pattern>/gadgets/concat</url-pattern>
+ <url-pattern>/rpc/*</url-pattern>
+ <url-pattern>/rest/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>authFilter</filter-name>
<url-pattern>/gadgets/ifr</url-pattern>
</filter-mapping>
@@ -138,7 +153,7 @@
</servlet-class>
<init-param>
<param-name>handlers</param-name>
- <param-value>org.apache.shindig.gadgets.handlers</param-value>
+ <param-value>org.apache.shindig.handlers</param-value>
</init-param>
</servlet>
@@ -149,7 +164,7 @@
</servlet-class>
<init-param>
<param-name>handlers</param-name>
- <param-value>org.apache.shindig.gadgets.handlers</param-value>
+ <param-value>org.apache.shindig.handlers</param-value>
</init-param>
</servlet>
More information about the gatein-commits
mailing list