Author: alain_defrance Date: 2011-02-01 08:20:11 -0500 (Tue, 01 Feb 2011) New Revision: 5831 Modified: portal/branches/shindig2/component/application-registry/pom.xml portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java portal/branches/shindig2/gadgets/core/pom.xml portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java portal/branches/shindig2/gadgets/eXoGadgets/pom.xml portal/branches/shindig2/gadgets/server/pom.xml portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js portal/branches/shindig2/packaging/module/src/main/javascript/portal.packaging.module.js portal/branches/shindig2/packaging/tomcat/pkg/pom.xml portal/branches/shindig2/pom.xml portal/branches/shindig2/webui/portal/pom.xml Log: change shindig version to 2.0.2 Modified: portal/branches/shindig2/component/application-registry/pom.xml =================================================================== --- portal/branches/shindig2/component/application-registry/pom.xml 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/component/application-registry/pom.xml 2011-02-01 13:20:11 UTC (rev 5831) @@ -48,7 +48,7 @@ </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-gadgets</artifactId> </dependency> 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-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2011-02-01 13:20:11 UTC (rev 5831) @@ -332,6 +332,11 @@ } return done; } + catch (Exception e) + { + e.printStackTrace(); + return null; + } finally { chromatticLifeCycle.closeContext(true); Modified: portal/branches/shindig2/gadgets/core/pom.xml =================================================================== --- portal/branches/shindig2/gadgets/core/pom.xml 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/gadgets/core/pom.xml 2011-02-01 13:20:11 UTC (rev 5831) @@ -35,7 +35,7 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <version>${org.shindig.version}</version> <type>jar</type> @@ -79,15 +79,15 @@ <artifactId>exo.kernel.container</artifactId> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-gadgets</artifactId> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-common</artifactId> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-features</artifactId> </dependency> <dependency> Modified: portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java =================================================================== --- portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-02-01 13:20:11 UTC (rev 5831) @@ -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.expressions.Expressions; import org.exoplatform.commons.utils.Safe; @@ -164,7 +164,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: portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java =================================================================== --- portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java 2011-02-01 13:20:11 UTC (rev 5831) @@ -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); } -} +} \ No newline at end of file Modified: portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java =================================================================== --- portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java 2011-02-01 13:20:11 UTC (rev 5831) @@ -19,6 +19,7 @@ package org.exoplatform.portal.gadget.core; +import com.google.inject.AbstractModule; import org.apache.shindig.config.ContainerConfig; import org.apache.shindig.gadgets.DefaultGuiceModule; import org.apache.shindig.gadgets.http.HttpFetcher; @@ -31,15 +32,12 @@ * @author <a href="mailto:julien.viet@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); } Modified: portal/branches/shindig2/gadgets/eXoGadgets/pom.xml =================================================================== --- portal/branches/shindig2/gadgets/eXoGadgets/pom.xml 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/gadgets/eXoGadgets/pom.xml 2011-02-01 13:20:11 UTC (rev 5831) @@ -49,7 +49,7 @@ </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-common</artifactId> <scope>provided</scope> </dependency> Modified: portal/branches/shindig2/gadgets/server/pom.xml =================================================================== --- portal/branches/shindig2/gadgets/server/pom.xml 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/gadgets/server/pom.xml 2011-02-01 13:20:11 UTC (rev 5831) @@ -48,18 +48,18 @@ <dependencies> <!-- project dependencies --> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-server</artifactId> <type>war</type> <scope>provided</scope> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-features</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> + <dependency> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-social-api</artifactId> <scope>provided</scope> </dependency> @@ -86,8 +86,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -96,6 +96,21 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <scope>provided</scope> Modified: portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-02-01 13:20:11 UTC (rev 5831) @@ -55,7 +55,7 @@ <filter-mapping> <filter-name>authFilter</filter-name> - <url-pattern>/gadgets/ifr</url-pattern> + <url-pattern>/gadgetsifr</url-pattern> </filter-mapping> <filter-mapping> @@ -197,7 +197,7 @@ <servlet-mapping> <servlet-name>xml-to-html</servlet-name> - <url-pattern>/gadgets/ifr</url-pattern> + <url-pattern>/gadgetsifr</url-pattern> </servlet-mapping> <servlet-mapping> 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-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js 2011-02-01 13:20:11 UTC (rev 5831) @@ -44,7 +44,8 @@ // 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. +{"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 +61,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" : "localhost:8080", +"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", -"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.signingKeyFile" : "oauthkey.pem", +"gadgets.signingKeyName" : "mytestkey", +"gadgets.signedFetchDomain" : "eXo", + "gadgets.content-rewrite" : { "include-urls": ".*", "exclude-urls": "", @@ -101,6 +109,19 @@ "concat-url": "/eXoGadgetServer/gadgets/concat?" }, +// Default Js Uri config: also must be overridden. +"gadgets.uri.js.host" : "http://localhost:8080/", +"gadgets.uri.js.path" : "/eXoGadgetServer/gadgets/js", + +// Default concat Uri config; used for testing. +"gadgets.uri.concat.host" : "http://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.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. @@ -162,7 +183,7 @@ // 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"] @@ -170,11 +191,11 @@ }, // "osapi" : { // // The endpoints to query for available JSONRPC/REST services -// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ] +// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ] // }, "osml": { // OSML library resource. Can be set to null or the empty string to disable OSML // for a container. "library": "" } -}} +}} \ No newline at end of file Modified: portal/branches/shindig2/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/branches/shindig2/packaging/module/src/main/javascript/portal.packaging.module.js 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/packaging/module/src/main/javascript/portal.packaging.module.js 2011-02-01 13:20:11 UTC (rev 5831) @@ -225,19 +225,22 @@ module.eXoGadgetServer = new Project("org.exoplatform.portal", "exo.portal.gadgets-server", "war", module.version). addDependency(new Project("commons-io", "commons-io", "jar", "1.4")). - addDependency(new Project("commons-codec", "commons-codec", "jar", "1.3")). + addDependency(new Project("commons-codec", "commons-codec", "jar", "1.4")). addDependency(new Project("net.oauth", "core", "jar", "20080621")). - addDependency(new Project("com.google.collections", "google-collections", "jar", "1.0-rc2")). + addDependency(new Project("com.google.guava", "guava", "jar", "r07")). addDependency(new Project("com.google.code.guice", "guice", "jar", "2.0")). addDependency(new Project("com.google.code.guice", "guice-jmx", "jar", "2.0")). + addDependency(new Project("com.google.inject.extensions", "guice-multibindings", "jar", "2.0")). + addDependency(new Project("org.apache.httpcomponents", "httpclient", "jar", "4.0")). + addDependency(new Project("org.apache.httpcomponents", "httpcore", "jar", "4.0.1")). addDependency(new Project("commons-lang", "commons-lang", "jar", "2.4")). addDependency(new Project("rome", "rome", "jar", "0.9")). addDependency(new Project("joda-time", "joda-time", "jar", "1.6")). addDependency(new Project("org.json", "json", "jar", "20070829")). - addDependency(new Project("org.gatein.shindig", "shindig-common", "jar", shindigVersion)). - addDependency(new Project("org.gatein.shindig", "shindig-gadgets", "jar", shindigVersion)). - addDependency(new Project("org.gatein.shindig", "shindig-features", "jar", shindigVersion)). - addDependency(new Project("org.gatein.shindig", "shindig-social-api", "jar", shindigVersion)). + addDependency(new Project("org.apache.shindig", "shindig-common", "jar", shindigVersion)). + addDependency(new Project("org.apache.shindig", "shindig-gadgets", "jar", shindigVersion)). + addDependency(new Project("org.apache.shindig", "shindig-features", "jar", shindigVersion)). + addDependency(new Project("org.apache.shindig", "shindig-social-api", "jar", shindigVersion)). addDependency(new Project("jdom", "jdom", "jar", "1.0")). addDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.1")). addDependency(new Project("commons-collections", "commons-collections", "jar", "3.2.1")). @@ -247,7 +250,7 @@ addDependency(new Project("net.sourceforge.nekohtml", "nekohtml", "jar", "1.9.9")). addDependency(new Project("xerces", "xercesImpl", "jar", "2.9.1")). addDependency(new Project("com.thoughtworks.xstream", "xstream", "jar", "1.3.1")). - addDependency(new Project("caja", "caja", "jar", "r3375")). + addDependency(new Project("caja", "caja", "jar", "r4251")). addDependency(new Project("caja", "json_simple", "jar", "r1")). addDependency(new Project("org.apache.sanselan", "sanselan", "jar", "0.97-incubator")). addDependency(new Project("de.odysseus.juel", "juel-api", "jar", "2.1.2")). Modified: portal/branches/shindig2/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/branches/shindig2/packaging/tomcat/pkg/pom.xml 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/packaging/tomcat/pkg/pom.xml 2011-02-01 13:20:11 UTC (rev 5831) @@ -370,19 +370,19 @@ <!-- GateIn Shinding --> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-gadgets</artifactId> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-features</artifactId> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-common</artifactId> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-social-api</artifactId> </dependency> @@ -550,6 +550,18 @@ <artifactId>guice-jmx</artifactId> </dependency> <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <dependency> <groupId>antlr</groupId> <artifactId>antlr</artifactId> <version>2.7.6rc1</version> @@ -608,8 +620,8 @@ <version>2.0.235</version> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> Modified: portal/branches/shindig2/pom.xml =================================================================== --- portal/branches/shindig2/pom.xml 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/pom.xml 2011-02-01 13:20:11 UTC (rev 5831) @@ -42,7 +42,7 @@ <org.exoplatform.ws.version>2.1.5-GA</org.exoplatform.ws.version> <org.exoplatform.jcr.version>1.12.5-GA</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> - <org.shindig.version>1.0-r790473-Patch04</org.shindig.version> + <org.shindig.version>2.0.2</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> <org.gatein.common.version>2.0.3-GA</org.gatein.common.version> <org.gatein.wci.version>2.1.0-Alpha02</org.gatein.wci.version> @@ -964,7 +964,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> @@ -1063,7 +1063,7 @@ <dependency> <groupId>caja</groupId> <artifactId>caja</artifactId> - <version>r3375</version> + <version>r4251</version> </dependency> <dependency> <groupId>caja</groupId> @@ -1076,9 +1076,9 @@ <version>20080621</version> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0-rc2</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r07</version> </dependency> <dependency> <groupId>com.google.code.guice</groupId> @@ -1091,6 +1091,21 @@ <version>2.0</version> </dependency> <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.0</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.0.1</version> + </dependency> + <dependency> <groupId>rome</groupId> <artifactId>rome</artifactId> <version>0.9</version> @@ -1127,33 +1142,33 @@ </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-features</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-common</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-server</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-server</artifactId> <version>${org.shindig.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-social-api</artifactId> <version>${org.shindig.version}</version> </dependency> Modified: portal/branches/shindig2/webui/portal/pom.xml =================================================================== --- portal/branches/shindig2/webui/portal/pom.xml 2011-02-01 12:46:26 UTC (rev 5830) +++ portal/branches/shindig2/webui/portal/pom.xml 2011-02-01 13:20:11 UTC (rev 5831) @@ -78,7 +78,7 @@ </dependency> <dependency> - <groupId>org.gatein.shindig</groupId> + <groupId>org.apache.shindig</groupId> <artifactId>shindig-common</artifactId> <type>jar</type> </dependency>