[gatein-commits] gatein SVN: r2221 - in portal/trunk: packaging/module/src/main/javascript and 1 other directories.

Author: thomas.heute(a)jboss.com Date: 2010-03-12 09:18:20 -0500 (Fri, 12 Mar 2010) New Revision: 2221 Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js Log: - Rolling back 2011 + the sample should be in 'deploy' not in gatein.ear, this will be taken care by the packager which is being deployed + the display-name needs to match the war name Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml 2010-03-12 13:57:57 UTC (rev 2220) +++ portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml 2010-03-12 14:18:20 UTC (rev 2221) @@ -24,7 +24,7 @@ <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.5"> - <display-name>simpleDeployableSkin</display-name> + <display-name>gatein-sample-skin</display-name> <filter> <filter-name>ResourceRequestFilter</filter-name> <filter-class>org.exoplatform.portal.application.ResourceRequestFilter</filter-class> 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-12 13:57:57 UTC (rev 2220) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-12 14:18:20 UTC (rev 2221) @@ -1,276 +1,271 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -eXo.require("eXo.projects.Module"); -eXo.require("eXo.projects.Product"); - -function getModule(params) -{ - - var kernel = params.kernel; - var core = params.core; - var jcr = params.eXoJcr; - var ws = params.ws; - var module = new Module(); - - module.version = "${project.version}"; - module.relativeMavenRepo = "org/exoplatform/portal"; - module.relativeSRCRepo = "portal"; - module.name = "portal"; - - var mopVersion = "${org.gatein.mop.version}"; - var chromatticVersion = "${version.chromattic}"; - var reflectVersion = "${version.reflect}"; - var idmVersion = "${org.picketlink.idm}"; - var pcVersion = "${org.gatein.pc.version}"; - var wciVersion = "${org.gatein.wci.version}"; - var commonVersion = "${org.gatein.common.version}"; - var wsrpVersion = "${org.gatein.wsrp.version}"; - var shindigVersion = "${org.shindig.version}"; - var groovyVersion = "${org.codehaus.groovy.version}"; - var rhinoVersion = "${rhino.version}"; - var jcipVersion = "${jcip.version}"; - - //TODO versions for gatein components - - module.component = {} - module.component.resources = - new Project("org.exoplatform.portal", "exo.portal.component.resources", "jar", module.version); - - module.component.common = - new Project("org.exoplatform.portal", "exo.portal.component.common", "jar", module.version). - addDependency(new Project("org.gatein.common", "common-logging", "jar", commonVersion)); - - module.component.pc = - new Project("org.exoplatform.portal", "exo.portal.component.pc", "jar", module.version). - addDependency(new Project("javax.portlet", "portlet-api", "jar", "2.0")). - addDependency(new Project("javax.ccpp", "ccpp", "jar", "1.0")). - addDependency(new Project("javax.xml.bind", "jaxb-api", "jar", "2.1")). - addDependency(new Project("org.gatein.pc", "pc-api", "jar", pcVersion)). - addDependency(new Project("org.gatein.pc", "pc-bridge", "jar", pcVersion)). - addDependency(new Project("org.gatein.pc", "pc-portlet", "jar", pcVersion)). - addDependency(new Project("org.gatein.pc", "pc-mc", "jar", pcVersion)). - addDependency(new Project("org.gatein.pc", "pc-controller", "jar", pcVersion)). - addDependency(new Project("org.gatein.pc", "pc-federation", "jar", pcVersion)). - addDependency(new Project("org.gatein.wci", "wci-wci", "jar", wciVersion)). - addDependency(new Project("org.gatein.wci", "wci-tomcat", "jar", wciVersion)). - addDependency(new Project("org.gatein.wci", "wci-exo", "jar", wciVersion)). - addDependency(new Project("org.gatein.common", "common-common", "jar", commonVersion)). - addDependency(new Project("log4j", "log4j", "jar", "1.2.14")). - addDependency(new Project("org.jboss", "jbossxb", "jar", "2.0.1.GA")). - addDependency(new Project("org.jboss.logging", "jboss-logging-spi", "jar", "2.0.5.GA")). - addDependency(new Project("org.apache.portals.bridges", "portals-bridges-common", "jar", "1.0.4")). - addDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA")); - - - module.component.wsrp = new Project("org.exoplatform.portal", "gatein.portal.component.wsrp", "jar", module.version) - .addDependency(new Project("org.gatein.wsrp", "wsrp-producer", "war", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-admin-gui", "war", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-producer-lib", "jar",wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-common", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp1-ws", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-consumer", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-integration-api", "jar", wsrpVersion)); - - module.component.xmlParser = - new Project("org.exoplatform.portal", "exo.portal.component.xml-parser", "jar", module.version). - //addDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.0")). - addDependency(new Project("commons-codec", "commons-codec", "jar", "1.3")); - - module.component.scripting = - new Project("org.exoplatform.portal", "exo.portal.component.scripting", "jar", module.version). - addDependency(module.component.xmlParser). - addDependency(new Project("rhino", "js", "jar", rhinoVersion)). - addDependency(new Project("org.codehaus.groovy", "groovy-all", "jar", groovyVersion)); - - module.component.management = - new Project("org.exoplatform.portal", "exo.portal.component.management", "jar", module.version); - - module.component.web = - new Project("org.exoplatform.portal", "exo.portal.component.web", "jar", module.version). - addDependency(module.component.scripting); - - module.component.portal = - new Project("org.exoplatform.portal", "exo.portal.component.portal", "jar", module.version). - addDependency(new Project("org.gatein.mop", "mop-api", "jar", mopVersion)). - addDependency(new Project("org.gatein.mop", "mop-spi", "jar", mopVersion)). - addDependency(new Project("org.gatein.mop", "mop-core", "jar", mopVersion)). - addDependency(new Project("org.chromattic", "chromattic.api", "jar", chromatticVersion)). - addDependency(new Project("org.chromattic", "chromattic.common", "jar", chromatticVersion)). - addDependency(new Project("org.chromattic", "chromattic.spi", "jar", chromatticVersion)). - addDependency(new Project("org.chromattic", "chromattic.metamodel", "jar", chromatticVersion)). - addDependency(new Project("org.chromattic", "chromattic.core", "jar", chromatticVersion)). - addDependency(new Project("org.chromattic", "chromattic.apt", "jar", chromatticVersion)). - addDependency(new Project("org.chromattic", "chromattic.ext", "jar", chromatticVersion)). - addDependency(new Project("org.reflext", "reflext.api", "jar", reflectVersion)). - addDependency(new Project("org.reflext", "reflext.core", "jar", reflectVersion)). - addDependency(new Project("org.reflext", "reflext.spi", "jar", reflectVersion)). - addDependency(new Project("org.reflext", "reflext.jlr", "jar", reflectVersion)). - addDependency(new Project("org.reflext", "reflext.api", "jar", reflectVersion)). - addDependency(module.component.web); - - module.component.identity = - new Project("org.exoplatform.portal", "exo.portal.component.identity", "jar", module.version). - addDependency(new Project("org.picketlink.idm", "picketlink-idm-core", "jar", idmVersion)). - addDependency(new Project("org.picketlink.idm", "picketlink-idm-common", "jar", idmVersion)). - addDependency(new Project("org.picketlink.idm", "picketlink-idm-api", "jar", idmVersion)). - addDependency(new Project("org.picketlink.idm", "picketlink-idm-spi", "jar", idmVersion)). - addDependency(new Project("org.picketlink.idm", "picketlink-idm-hibernate", "jar", idmVersion)). - addDependency(new Project("org.picketlink.idm", "picketlink-idm-ldap", "jar", idmVersion)). - addDependency(new Project("org.picketlink.idm", "picketlink-idm-cache", "jar", idmVersion)); - - module.component.applicationRegistry = - new Project("org.exoplatform.portal", "exo.portal.component.application-registry", "jar", module.version). - addDependency(module.component.portal). - addDependency(new Project("com.sun.xml.stream", "sjsxp", "jar", "1.0")); - - module.webui = {}; - module.webui.core = - new Project("org.exoplatform.portal", "exo.portal.webui.core", "jar", module.version). - addDependency(module.component.web); - - module.webui.eXo = - new Project("org.exoplatform.portal", "exo.portal.webui.eXo", "jar", module.version). - addDependency(module.component.applicationRegistry). - addDependency(module.webui.core); - - module.webui.portal = - new Project("org.exoplatform.portal", "exo.portal.webui.portal", "jar", module.version). - addDependency(module.component.common). - addDependency(module.component.management). - addDependency(module.component.resources). - addDependency(module.component.identity). - addDependency(module.component.pc). - addDependency(module.component.wsrp). - addDependency(module.webui.eXo). - - addDependency(kernel.container). - addDependency(kernel.component.common). - addDependency(kernel.component.remote). - addDependency(kernel.component.cache). - addDependency(kernel.component.command). - addDependency(new Project("org.exoplatform.kernel", "exo.kernel.component.ext.cache.impl.jboss.v3", "jar", kernel.version)). - - addDependency(core.component.database). - addDependency(core.component.organization). - addDependency(core.component.organization.ldap). - addDependency(core.component.ldap). - addDependency(core.component.security.core). - addDependency(core.component.xmlProcessing). - addDependency(core.component.documents). - - addDependency(jcr.services.jcr); - - module.portlet = {}; - - module.portlet.exoadmin = - new Project("org.exoplatform.portal", "exo.portal.portlet.exoadmin", "exo-portlet", module.version); - - module.portlet.web = - new Project("org.exoplatform.portal", "exo.portal.portlet.web", "exo-portlet", module.version); - - module.portlet.dashboard = - new Project("org.exoplatform.portal", "exo.portal.portlet.dashboard", "exo-portlet", module.version). - addDependency(new Project("org.exoplatform.portal", "exo.portal.component.dashboard", "jar", module.version)); - - module.sample = {}; - module.sample.framework = - new Project("org.exoplatform.portal", "exo.portal.sample.framework", "war", module.version); - module.sample.framework.deployName = "eXoSampleFramework"; - - 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("net.oauth", "core", "jar", "20080621")). - addDependency(new Project("com.google.collections", "google-collections", "jar", "1.0-rc2")). - 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("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("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")). - addDependency(new Project("net.sf.ehcache", "ehcache", "jar", "1.6.0")). - addDependency(new Project("xml-apis", "xml-apis", "jar", "1.3.04")). - addDependency(new Project("com.ibm.icu", "icu4j", "jar", "3.8")). - 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", "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")). - addDependency(new Project("de.odysseus.juel", "juel-impl", "jar", "2.1.2")). - addDependency(new Project("org.jsecurity", "jsecurity", "jar", "0.9.0")). - addDependency(new Project("aopalliance", "aopalliance", "jar", "1.0")). - addDependency(new Project("org.exoplatform.portal", "exo.portal.gadgets-core", "jar", module.version)); - module.eXoGadgetServer.deployName = "eXoGadgetServer"; - - module.eXoGadgets = new Project("org.exoplatform.portal", "exo.portal.eXoGadgets", "war", module.version); - module.eXoGadgets.deployName = "eXoGadgets"; - - module.web = {} - module.web.eXoResources = - new Project("org.exoplatform.portal", "exo.portal.web.eXoResources", "war", module.version); - module.web.rest = - new Project("org.exoplatform.portal", "exo.portal.web.rest", "war", module.version). - addDependency(ws.frameworks.servlet); - - module.examples = {} - module.examples.skins = {} - module.examples.skins.simpleSkin = new Project("org.gatein.portal.examples.skins", "gatein-sample-skin", "war", module.version); - //module.examples.skins.simpleSkin.deployName = "gatein-sample-skin"; - - module.web.portal = - new Project("org.exoplatform.portal", "exo.portal.web.portal", "exo-portal", module.version). - addDependency(jcr.frameworks.web). - addDependency(jcr.frameworks.command); - - module.server = {} - - module.server.tomcat = {} - module.server.tomcat.patch = - new Project("org.exoplatform.portal", "exo.portal.server.tomcat.patch", "jar", module.version); - - module.server.jboss = {} - module.server.jboss.patch = - new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch", "jar", module.version); - - module.server.jbossear = {} - module.server.jbossear.patch = - new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch-ear", "jar", module.version); - - module.sample.extension = - new Project("org.exoplatform.portal", "gatein-sample-extension", "ear", module.version). - addDependency(new Project("org.exoplatform.portal", "gatein-sample-portal", "ear", module.version)). - addDependency(new Project("org.exoplatform.portal", "starter-gatein", "ear", module.version)); - - <!-- needed so that GTN can be run on the IBM jdk, to be removed when the IBM jdk no longer needs this hack --> - module.ibm = {}; - module.ibm.jdk = {}; - module.ibm.jdk.support =new Project("net.jcip", "jcip-annotations", "jar", jcipVersion); - - return module; -} +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +eXo.require("eXo.projects.Module"); +eXo.require("eXo.projects.Product"); + +function getModule(params) +{ + + var kernel = params.kernel; + var core = params.core; + var jcr = params.eXoJcr; + var ws = params.ws; + var module = new Module(); + + module.version = "${project.version}"; + module.relativeMavenRepo = "org/exoplatform/portal"; + module.relativeSRCRepo = "portal"; + module.name = "portal"; + + var mopVersion = "${org.gatein.mop.version}"; + var chromatticVersion = "${version.chromattic}"; + var reflectVersion = "${version.reflect}"; + var idmVersion = "${org.picketlink.idm}"; + var pcVersion = "${org.gatein.pc.version}"; + var wciVersion = "${org.gatein.wci.version}"; + var commonVersion = "${org.gatein.common.version}"; + var wsrpVersion = "${org.gatein.wsrp.version}"; + var shindigVersion = "${org.shindig.version}"; + var groovyVersion = "${org.codehaus.groovy.version}"; + var rhinoVersion = "${rhino.version}"; + var jcipVersion = "${jcip.version}"; + + //TODO versions for gatein components + + module.component = {} + module.component.resources = + new Project("org.exoplatform.portal", "exo.portal.component.resources", "jar", module.version); + + module.component.common = + new Project("org.exoplatform.portal", "exo.portal.component.common", "jar", module.version). + addDependency(new Project("org.gatein.common", "common-logging", "jar", commonVersion)); + + module.component.pc = + new Project("org.exoplatform.portal", "exo.portal.component.pc", "jar", module.version). + addDependency(new Project("javax.portlet", "portlet-api", "jar", "2.0")). + addDependency(new Project("javax.ccpp", "ccpp", "jar", "1.0")). + addDependency(new Project("javax.xml.bind", "jaxb-api", "jar", "2.1")). + addDependency(new Project("org.gatein.pc", "pc-api", "jar", pcVersion)). + addDependency(new Project("org.gatein.pc", "pc-bridge", "jar", pcVersion)). + addDependency(new Project("org.gatein.pc", "pc-portlet", "jar", pcVersion)). + addDependency(new Project("org.gatein.pc", "pc-mc", "jar", pcVersion)). + addDependency(new Project("org.gatein.pc", "pc-controller", "jar", pcVersion)). + addDependency(new Project("org.gatein.pc", "pc-federation", "jar", pcVersion)). + addDependency(new Project("org.gatein.wci", "wci-wci", "jar", wciVersion)). + addDependency(new Project("org.gatein.wci", "wci-tomcat", "jar", wciVersion)). + addDependency(new Project("org.gatein.wci", "wci-exo", "jar", wciVersion)). + addDependency(new Project("org.gatein.common", "common-common", "jar", commonVersion)). + addDependency(new Project("log4j", "log4j", "jar", "1.2.14")). + addDependency(new Project("org.jboss", "jbossxb", "jar", "2.0.1.GA")). + addDependency(new Project("org.jboss.logging", "jboss-logging-spi", "jar", "2.0.5.GA")). + addDependency(new Project("org.apache.portals.bridges", "portals-bridges-common", "jar", "1.0.4")). + addDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA")); + + + module.component.wsrp = new Project("org.exoplatform.portal", "gatein.portal.component.wsrp", "jar", module.version) + .addDependency(new Project("org.gatein.wsrp", "wsrp-producer", "war", wsrpVersion)) + .addDependency(new Project("org.gatein.wsrp", "wsrp-admin-gui", "war", wsrpVersion)) + .addDependency(new Project("org.gatein.wsrp", "wsrp-producer-lib", "jar",wsrpVersion)) + .addDependency(new Project("org.gatein.wsrp", "wsrp-common", "jar", wsrpVersion)) + .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp1-ws", "jar", wsrpVersion)) + .addDependency(new Project("org.gatein.wsrp", "wsrp-consumer", "jar", wsrpVersion)) + .addDependency(new Project("org.gatein.wsrp", "wsrp-integration-api", "jar", wsrpVersion)); + + module.component.xmlParser = + new Project("org.exoplatform.portal", "exo.portal.component.xml-parser", "jar", module.version). + //addDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.0")). + addDependency(new Project("commons-codec", "commons-codec", "jar", "1.3")); + + module.component.scripting = + new Project("org.exoplatform.portal", "exo.portal.component.scripting", "jar", module.version). + addDependency(module.component.xmlParser). + addDependency(new Project("rhino", "js", "jar", rhinoVersion)). + addDependency(new Project("org.codehaus.groovy", "groovy-all", "jar", groovyVersion)); + + module.component.management = + new Project("org.exoplatform.portal", "exo.portal.component.management", "jar", module.version); + + module.component.web = + new Project("org.exoplatform.portal", "exo.portal.component.web", "jar", module.version). + addDependency(module.component.scripting); + + module.component.portal = + new Project("org.exoplatform.portal", "exo.portal.component.portal", "jar", module.version). + addDependency(new Project("org.gatein.mop", "mop-api", "jar", mopVersion)). + addDependency(new Project("org.gatein.mop", "mop-spi", "jar", mopVersion)). + addDependency(new Project("org.gatein.mop", "mop-core", "jar", mopVersion)). + addDependency(new Project("org.chromattic", "chromattic.api", "jar", chromatticVersion)). + addDependency(new Project("org.chromattic", "chromattic.common", "jar", chromatticVersion)). + addDependency(new Project("org.chromattic", "chromattic.spi", "jar", chromatticVersion)). + addDependency(new Project("org.chromattic", "chromattic.metamodel", "jar", chromatticVersion)). + addDependency(new Project("org.chromattic", "chromattic.core", "jar", chromatticVersion)). + addDependency(new Project("org.chromattic", "chromattic.apt", "jar", chromatticVersion)). + addDependency(new Project("org.chromattic", "chromattic.ext", "jar", chromatticVersion)). + addDependency(new Project("org.reflext", "reflext.api", "jar", reflectVersion)). + addDependency(new Project("org.reflext", "reflext.core", "jar", reflectVersion)). + addDependency(new Project("org.reflext", "reflext.spi", "jar", reflectVersion)). + addDependency(new Project("org.reflext", "reflext.jlr", "jar", reflectVersion)). + addDependency(new Project("org.reflext", "reflext.api", "jar", reflectVersion)). + addDependency(module.component.web); + + module.component.identity = + new Project("org.exoplatform.portal", "exo.portal.component.identity", "jar", module.version). + addDependency(new Project("org.picketlink.idm", "picketlink-idm-core", "jar", idmVersion)). + addDependency(new Project("org.picketlink.idm", "picketlink-idm-common", "jar", idmVersion)). + addDependency(new Project("org.picketlink.idm", "picketlink-idm-api", "jar", idmVersion)). + addDependency(new Project("org.picketlink.idm", "picketlink-idm-spi", "jar", idmVersion)). + addDependency(new Project("org.picketlink.idm", "picketlink-idm-hibernate", "jar", idmVersion)). + addDependency(new Project("org.picketlink.idm", "picketlink-idm-ldap", "jar", idmVersion)). + addDependency(new Project("org.picketlink.idm", "picketlink-idm-cache", "jar", idmVersion)); + + module.component.applicationRegistry = + new Project("org.exoplatform.portal", "exo.portal.component.application-registry", "jar", module.version). + addDependency(module.component.portal). + addDependency(new Project("com.sun.xml.stream", "sjsxp", "jar", "1.0")); + + module.webui = {}; + module.webui.core = + new Project("org.exoplatform.portal", "exo.portal.webui.core", "jar", module.version). + addDependency(module.component.web); + + module.webui.eXo = + new Project("org.exoplatform.portal", "exo.portal.webui.eXo", "jar", module.version). + addDependency(module.component.applicationRegistry). + addDependency(module.webui.core); + + module.webui.portal = + new Project("org.exoplatform.portal", "exo.portal.webui.portal", "jar", module.version). + addDependency(module.component.common). + addDependency(module.component.management). + addDependency(module.component.resources). + addDependency(module.component.identity). + addDependency(module.component.pc). + addDependency(module.component.wsrp). + addDependency(module.webui.eXo). + + addDependency(kernel.container). + addDependency(kernel.component.common). + addDependency(kernel.component.remote). + addDependency(kernel.component.cache). + addDependency(kernel.component.command). + addDependency(new Project("org.exoplatform.kernel", "exo.kernel.component.ext.cache.impl.jboss.v3", "jar", kernel.version)). + + addDependency(core.component.database). + addDependency(core.component.organization). + addDependency(core.component.organization.ldap). + addDependency(core.component.ldap). + addDependency(core.component.security.core). + addDependency(core.component.xmlProcessing). + addDependency(core.component.documents). + + addDependency(jcr.services.jcr); + + module.portlet = {}; + + module.portlet.exoadmin = + new Project("org.exoplatform.portal", "exo.portal.portlet.exoadmin", "exo-portlet", module.version); + + module.portlet.web = + new Project("org.exoplatform.portal", "exo.portal.portlet.web", "exo-portlet", module.version); + + module.portlet.dashboard = + new Project("org.exoplatform.portal", "exo.portal.portlet.dashboard", "exo-portlet", module.version). + addDependency(new Project("org.exoplatform.portal", "exo.portal.component.dashboard", "jar", module.version)); + + module.sample = {}; + module.sample.framework = + new Project("org.exoplatform.portal", "exo.portal.sample.framework", "war", module.version); + module.sample.framework.deployName = "eXoSampleFramework"; + + 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("net.oauth", "core", "jar", "20080621")). + addDependency(new Project("com.google.collections", "google-collections", "jar", "1.0-rc2")). + 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("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("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")). + addDependency(new Project("net.sf.ehcache", "ehcache", "jar", "1.6.0")). + addDependency(new Project("xml-apis", "xml-apis", "jar", "1.3.04")). + addDependency(new Project("com.ibm.icu", "icu4j", "jar", "3.8")). + 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", "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")). + addDependency(new Project("de.odysseus.juel", "juel-impl", "jar", "2.1.2")). + addDependency(new Project("org.jsecurity", "jsecurity", "jar", "0.9.0")). + addDependency(new Project("aopalliance", "aopalliance", "jar", "1.0")). + addDependency(new Project("org.exoplatform.portal", "exo.portal.gadgets-core", "jar", module.version)); + module.eXoGadgetServer.deployName = "eXoGadgetServer"; + + module.eXoGadgets = new Project("org.exoplatform.portal", "exo.portal.eXoGadgets", "war", module.version); + module.eXoGadgets.deployName = "eXoGadgets"; + + module.web = {} + module.web.eXoResources = + new Project("org.exoplatform.portal", "exo.portal.web.eXoResources", "war", module.version); + module.web.rest = + new Project("org.exoplatform.portal", "exo.portal.web.rest", "war", module.version). + addDependency(ws.frameworks.servlet); + + module.web.portal = + new Project("org.exoplatform.portal", "exo.portal.web.portal", "exo-portal", module.version). + addDependency(jcr.frameworks.web). + addDependency(jcr.frameworks.command); + + module.server = {} + + module.server.tomcat = {} + module.server.tomcat.patch = + new Project("org.exoplatform.portal", "exo.portal.server.tomcat.patch", "jar", module.version); + + module.server.jboss = {} + module.server.jboss.patch = + new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch", "jar", module.version); + + module.server.jbossear = {} + module.server.jbossear.patch = + new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch-ear", "jar", module.version); + + module.sample.extension = + new Project("org.exoplatform.portal", "gatein-sample-extension", "ear", module.version). + addDependency(new Project("org.exoplatform.portal", "gatein-sample-portal", "ear", module.version)). + addDependency(new Project("org.exoplatform.portal", "starter-gatein", "ear", module.version)); + + <!-- needed so that GTN can be run on the IBM jdk, to be removed when the IBM jdk no longer needs this hack --> + module.ibm = {}; + module.ibm.jdk = {}; + module.ibm.jdk.support =new Project("net.jcip", "jcip-annotations", "jar", jcipVersion); + + return module; +} Modified: portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js =================================================================== --- portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-12 13:57:57 UTC (rev 2220) +++ portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-12 14:18:20 UTC (rev 2221) @@ -1,67 +1,66 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -eXo.require("eXo.projects.Module") ; -eXo.require("eXo.projects.Product") ; - -function getProduct(version) { - var product = new Product(); - - product.name = "eXoPortal" ; - product.portalwar = "portal.war" ; - product.codeRepo = "portal" ;//module in modules/portal/module.js - product.serverPluginVersion = "${project.version}"; - - var kernel = Module.GetModule("kernel") ; - var core = Module.GetModule("core") ; - var ws = Module.GetModule("ws", {kernel : kernel, core : core}); - var eXoJcr = Module.GetModule("jcr", {kernel : kernel, core : core, ws : ws}) ; - var portal = Module.GetModule("portal", {kernel : kernel, ws:ws, core : core, eXoJcr : eXoJcr}); - - product.addDependencies(portal.web.rest) ; - product.addDependencies(portal.portlet.exoadmin) ; - product.addDependencies(portal.portlet.web) ; - product.addDependencies(portal.portlet.dashboard) ; - product.addDependencies(portal.eXoGadgetServer) ; - product.addDependencies(portal.eXoGadgets) ; - product.addDependencies(portal.webui.portal); - - product.addDependencies(portal.web.eXoResources); - product.addDependencies(portal.examples.skins.simpleSkin); - - product.addDependencies(portal.web.portal) ; - product.addDependencies(portal.sample.extension) ; - - product.addDependencies(portal.ibm.jdk.support); - - product.addServerPatch("tomcat", portal.server.tomcat.patch) ; - product.addServerPatch("jboss", portal.server.jboss.patch) ; - product.addServerPatch("jbossear", portal.server.jbossear.patch) ; - - /* cleanup duplicated lib */ - product.removeDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.0")); - product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.1")); - product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.1")); - product.removeDependency(new Project("c3p0", "c3p0", "jar", "0.9.1.2")); - - product.module = portal ; - product.dependencyModule = [ kernel, core, ws, eXoJcr]; - - return product ; -} +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +eXo.require("eXo.projects.Module") ; +eXo.require("eXo.projects.Product") ; + +function getProduct(version) { + var product = new Product(); + + product.name = "eXoPortal" ; + product.portalwar = "portal.war" ; + product.codeRepo = "portal" ;//module in modules/portal/module.js + product.serverPluginVersion = "${project.version}"; + + var kernel = Module.GetModule("kernel") ; + var core = Module.GetModule("core") ; + var ws = Module.GetModule("ws", {kernel : kernel, core : core}); + var eXoJcr = Module.GetModule("jcr", {kernel : kernel, core : core, ws : ws}) ; + var portal = Module.GetModule("portal", {kernel : kernel, ws:ws, core : core, eXoJcr : eXoJcr}); + + product.addDependencies(portal.web.rest) ; + product.addDependencies(portal.portlet.exoadmin) ; + product.addDependencies(portal.portlet.web) ; + product.addDependencies(portal.portlet.dashboard) ; + product.addDependencies(portal.eXoGadgetServer) ; + product.addDependencies(portal.eXoGadgets) ; + product.addDependencies(portal.webui.portal); + + product.addDependencies(portal.web.eXoResources); + + product.addDependencies(portal.web.portal) ; + product.addDependencies(portal.sample.extension) ; + + product.addDependencies(portal.ibm.jdk.support); + + product.addServerPatch("tomcat", portal.server.tomcat.patch) ; + product.addServerPatch("jboss", portal.server.jboss.patch) ; + product.addServerPatch("jbossear", portal.server.jbossear.patch) ; + + /* cleanup duplicated lib */ + product.removeDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.0")); + product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.1")); + product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.2")); + product.removeDependency(new Project("c3p0", "c3p0", "jar", "0.9.1.2")); + + product.module = portal ; + product.dependencyModule = [ kernel, core, ws, eXoJcr]; + + return product ; +}