[gatein-commits] gatein SVN: r2013 - in portal/trunk: component/web and 6 other directories.

Author: thomas.heute(a)jboss.com Date: 2010-03-05 12:26:51 -0500 (Fri, 05 Mar 2010) New Revision: 2013 Modified: portal/trunk/component/web/pom.xml portal/trunk/gadgets/core/pom.xml portal/trunk/gadgets/eXoGadgets/pom.xml portal/trunk/gadgets/server/pom.xml portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/packaging/profiles.xml portal/trunk/pom.xml portal/trunk/webui/portal/pom.xml Log: GTNPORTAL-792: Produce Shindig source repository Use our fork of Shindig Modified: portal/trunk/component/web/pom.xml =================================================================== --- portal/trunk/component/web/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/component/web/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -71,8 +71,8 @@ <artifactId>exo.portal.component.scripting</artifactId> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> Modified: portal/trunk/gadgets/core/pom.xml =================================================================== --- portal/trunk/gadgets/core/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/gadgets/core/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -35,7 +35,7 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <version>${org.shindig.version}</version> <type>jar</type> @@ -68,12 +68,12 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <type>jar</type> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <type>jar</type> </dependency> Modified: portal/trunk/gadgets/eXoGadgets/pom.xml =================================================================== --- portal/trunk/gadgets/eXoGadgets/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/gadgets/eXoGadgets/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -47,10 +47,11 @@ <artifactId>exo.portal.webui.portal</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-common</artifactId> - <scope>provided</scope> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + <scope>provided</scope> </dependency> </dependencies> Modified: portal/trunk/gadgets/server/pom.xml =================================================================== --- portal/trunk/gadgets/server/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/gadgets/server/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -48,18 +48,18 @@ <dependencies> <!-- project dependencies --> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> <type>war</type> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> <scope>provided</scope> </dependency> Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-05 17:26:51 UTC (rev 2013) @@ -205,10 +205,10 @@ 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.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("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("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")). Modified: portal/trunk/packaging/profiles.xml =================================================================== --- portal/trunk/packaging/profiles.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/packaging/profiles.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -29,7 +29,7 @@ ex: On Windows 'c:/AS' ex: On Linux '/home/user/AS' --> - <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies> + <exo.projects.directory.dependencies>/home/theute/Portal/Development/workspace_GateIn/portal/packaging</exo.projects.directory.dependencies> <!-- If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir) @@ -41,7 +41,7 @@ <!-- Replace with the name of the directory containing Tomcat 6 --> - <exo.projects.app.tomcat.version>tomcat-6.0.16</exo.projects.app.tomcat.version> + <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version> <!-- Replace with the name of the directory containing JBoss AS 5.1 --> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -42,7 +42,7 @@ <org.exoplatform.ws.version>2.1.0-CR2</org.exoplatform.ws.version> <org.exoplatform.jcr.version>1.12.0-CR2</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> - <org.shindig.version>SNAPSHOT-r790473</org.shindig.version> + <org.shindig.version>1.0-r790473-Patch01</org.shindig.version> <org.gatein.common.version>2.0.0-CR03</org.gatein.common.version> <org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version> <org.gatein.pc.version>2.1.0-CR05</org.gatein.pc.version> @@ -637,33 +637,33 @@ </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> <version>${org.shindig.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> <version>${org.shindig.version}</version> </dependency> Modified: portal/trunk/webui/portal/pom.xml =================================================================== --- portal/trunk/webui/portal/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/webui/portal/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -76,11 +76,13 @@ <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> </dependency> + <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-common</artifactId> - <type>jar</type> - </dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + <type>jar</type> + </dependency> + <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId>