Author: julien_viet Date: 2010-10-23 10:51:19 -0400 (Sat, 23 Oct 2010) New Revision: 4799 Added: portal/trunk/packaging/tomcat/pkg/pom.xml Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml portal/trunk/packaging/tomcat/pom.xml portal/trunk/pom.xml Log: GTNPORTAL-1591 : start to recreate lib for tomcat server based on maven dependency management Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-10-23 10:37:05 UTC (rev 4798) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-10-23 14:51:19 UTC (rev 4799) @@ -36,7 +36,7 @@ var mopVersion = "${org.gatein.mop.version}"; var chromatticVersion = "${version.chromattic}"; - var reflectVersion = "${version.reflect}"; + var reflectVersion = "${version.reflext}"; var idmVersion = "${org.picketlink.idm}"; var pcVersion = "${org.gatein.pc.version}"; var wciVersion = "${org.gatein.wci.version}"; Added: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-23 14:51:19 UTC (rev 4799) @@ -0,0 +1,813 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + <artifactId>exo.portal.packaging.tomcat.pkg</artifactId> + <packaging>pom</packaging> + <name>GateIn for Tomcat packaging</name> + + <!-- + +Dependencies I am not certain they should be included, needs to be checked + + 91815 Oct 23 13:38 xapool-1.5.0.jar +334148 Oct 23 13:38 sjsxp-1.0.jar + 19129 Oct 23 13:38 maven-jaxb2-plugin-0.1.jar +367444 Oct 23 13:38 log4j-1.2.14.jar +854901 Oct 23 13:38 jaxb-impl-2.1.7.jar +231114 Oct 23 13:38 xjavadoc-1.2.3.jar +194354 Oct 23 13:38 xml-apis-1.3.04.jar +148932 Oct 23 13:38 xdoclet-1.2.3.jar + 57251 Oct 23 13:38 xdoclet-hibernate-module-1.2.3.jar + 56047 Oct 23 13:38 xdoclet-xdoclet-module-1.2.3.jar + 72741 Oct 23 13:38 howl-logger-0.1.11.jar + 25863 Oct 23 13:38 stax-api-1.0.jar +124316 Oct 23 13:38 jotm-2.0.10.jar + 5798 Oct 23 13:38 jotm_jrmp_stubs-2.0.10.jar + + --> + + <dependencies> + + <!-- SLF4J --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </dependency> + + <!-- Apache commons --> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + </dependency> + + <!-- JBoss --> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>2.2.9.GA</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>2.0.1.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + <version>2.0.5.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.2.6.GA</version> + </dependency> + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossjts</artifactId> + <version>4.6.1.GA</version> + </dependency> + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossts-common</artifactId> + <version>4.6.1.GA</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + </dependency> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.13.GA</version> + </dependency> + + <!-- JCR stack --> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.remote</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.ldap</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.xml-processing</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.webdav</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.command</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.ext</artifactId> + </dependency> + + <!-- Reflext --> + <dependency> + <groupId>org.reflext</groupId> + <artifactId>reflext.api</artifactId> + </dependency> + <dependency> + <groupId>org.reflext</groupId> + <artifactId>reflext.core</artifactId> + </dependency> + <dependency> + <groupId>org.reflext</groupId> + <artifactId>reflext.jlr</artifactId> + </dependency> + <dependency> + <groupId>org.reflext</groupId> + <artifactId>reflext.spi</artifactId> + </dependency> + + <!-- Chromattic --> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.common</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.metamodel</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ext</artifactId> + </dependency> + + <!-- Picket link --> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-api</artifactId> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-cache</artifactId> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-common</artifactId> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-core</artifactId> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-hibernate</artifactId> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-ldap</artifactId> + </dependency> + + <!-- Gatein common --> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + </dependency> + + <!-- Gatein wci --> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + </dependency> + + <!-- Gatein PC --> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-controller</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + </dependency> + + <!-- GateIn MOP --> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + </dependency> + + <!-- GateIn Captcha --> + <dependency> + <groupId>org.gatein.captcha</groupId> + <artifactId>simplecaptcha</artifactId> + </dependency> + + <!-- GateIn Shinding --> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-features</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + </dependency> + + <!-- GateIn --> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.application-registry</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.management</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.controller</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.resources</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.security</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.server</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.dashboard</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.eXo</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.framework</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portal</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portlet</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein.portal.component.wsrp</artifactId> + </dependency> + + <!-- Provided --> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.2</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.ccpp</groupId> + <artifactId>ccpp</artifactId> + <version>1.0</version> + </dependency> + + <!-- Hibernate --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>1.0.2.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + </dependency> + + <!-- Various --> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-jmx</artifactId> + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.6rc1</version> + </dependency> + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>1.5.3</version> + </dependency> + <dependency> + <groupId>bouncycastle</groupId> + <artifactId>bcmail-jdk14</artifactId> + <version>136</version> + </dependency> + <dependency> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk14</artifactId> + <version>136</version> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>caja</artifactId> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>json_simple</artifactId> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>1.3.4</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>1.6.0</version> + </dependency> + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </dependency> + <dependency> + <groupId>html-parser</groupId> + <artifactId>html-parser</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + </dependency> + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>2.1.0</version> + </dependency> + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-bind</artifactId> + <version>${org.jibx.version}</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + <version>${org.jibx.version}</version> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + </dependency> + <dependency> + <groupId>org.jsecurity</groupId> + <artifactId>jsecurity</artifactId> + <version>0.9.0</version> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </dependency> + <dependency> + <groupId>de.odysseus.juel</groupId> + <artifactId>juel-api</artifactId> + <version>2.1.2</version> + </dependency> + <dependency> + <groupId>de.odysseus.juel</groupId> + <artifactId>juel-impl</artifactId> + <version>2.1.2</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-memory</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-spellchecker</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>3.6</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml</artifactId> + <version>3.6</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-scratchpad</artifactId> + <version>3.6</version> + </dependency> + <dependency> + <groupId>org.apache.portals.bridges</groupId> + <artifactId>portals-bridges-common</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>quartz</groupId> + <artifactId>quartz</artifactId> + <version>1.5.2</version> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + </dependency> + <dependency> + <groupId>org.apache.sanselan</groupId> + <artifactId>sanselan</artifactId> + <version>0.97-incubator</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons</groupId> + <artifactId>ws-commons-util</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + </dependency> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.3.4.O</version> + </dependency> + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <!-- copy jboss-as to working directory etc... --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/assembly/tomcat-init.xml</descriptor> + </descriptors> + </configuration> + <version>2.2-beta-5</version> + <executions> + <execution> + <id>init-assembly</id> + <phase>process-resources</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Modified: portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml 2010-10-23 10:37:05 UTC (rev 4798) +++ portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml 2010-10-23 14:51:19 UTC (rev 4799) @@ -1,66 +1,139 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - - <id>tomcat</id> - <includeBaseDirectory>false</includeBaseDirectory> - <formats> - <format>dir</format> - </formats> - - <fileSets> - <!-- copy tomcat - without unix executables --> - <fileSet> - <directory>${tomcat.dir}</directory> - <outputDirectory>tomcat</outputDirectory> - <excludes> - <exclude>bin/*.sh</exclude> - <exclude>bin/startup.*</exclude> - <exclude>bin/shutdown.*</exclude> - </excludes> - <fileMode>0644</fileMode> - </fileSet> - <!-- copy tomcat - only unix executabls --> - <fileSet> - <directory>${tomcat.dir}/bin</directory> - <outputDirectory>tomcat/bin</outputDirectory> - <includes> - <include>*.sh</include> - </includes> - <excludes> - <exclude>startup.*</exclude> - <exclude>shutdown.*</exclude> - </excludes> - - <fileMode>0755</fileMode> - </fileSet> - - <!-- configurations, etc.--> - <fileSet> - <directory>${basedir}/src/main/resources/tomcat</directory> - <outputDirectory>tomcat</outputDirectory> - <excludes> - <exclude>bin/*.sh</exclude> - </excludes> - <fileMode>0644</fileMode> - </fileSet> - <!-- startup scripts --> - <fileSet> - <directory>${basedir}/src/main/resources/tomcat/bin</directory> - <outputDirectory>tomcat/bin</outputDirectory> - <includes> - <include>*.sh</include> - </includes> - <fileMode>0755</fileMode> - </fileSet> - </fileSets> - - <files> - <!-- copy gatein configuration file --> - <file> - <source>${basedir}/../../../component/common/src/main/java/conf/configuration-tomcat.properties</source> - <outputDirectory>tomcat/gatein/conf</outputDirectory> - <destName>configuration.properties</destName> - </file> - </files> + + <id>tomcat</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + </formats> + + <dependencySets> + <dependencySet> + <outputDirectory>tomcat/lib</outputDirectory> + <includes> + <include>org.slf4j:*</include> + <include>commons-*:*</include> + <include>org.jboss*:*</include> + <include>jboss.*:*</include> + <include>javassist:*</include> + <include>jgroups:*</include> + <include>org.exoplatform.kernel:*</include> + <include>org.exoplatform.core:*</include> + <include>org.exoplatform.jcr:*</include> + <include>org.exoplatform.ws:*</include> + <include>org.picketlink.idm:*</include> + <include>org.reflext:*</include> + <include>org.chromattic:*</include> + <include>org.gatein.common:*</include> + <include>org.gatein.wci:*</include> + <include>org.gatein.pc:*</include> + <include>org.gatein.mop:*</include> + <include>org.gatein.shindig:*</include> + <include>org.gatein.captcha:*</include> + <include>org.exoplatform.portal:*</include> + <include>javax.*:*</include> + <include>org.hibernate:*</include> + <include>com.google.code.guice:*</include> + <include>antlr:*</include> + <include>aopalliance:*</include> + <include>asm:*</include> + <include>bouncycastle:*</include> + <include>caja:*</include> + <include>cglib:*</include> + <include>oswego-concurrent:*</include> + <include>dom4j:*</include> + <include>net.sf.ehcache:*</include> + <include>com.jhlabs:*</include> + <include>com.googlecode.collections:*</include> + <include>org.groovy.codehaus:*</include> + <include>hsqldb:*</include> + <include>html-parser:*</include> + <include>com.ibm.icu:*</include> + <include>com.lowagie:*</include> + <include>net.jcip:*</include> + <include>jdom:*</include> + <include>org.jibx:*</include> + <include>joda-time:*</include> + <include>rhino:*</include> + <include>org.jsecurity:*</include> + <include>org.json:*</include> + <include>de.odysseus.juel:*</include> + <include>org.apache.lucene:*</include> + <include>net.sourceforge.nekohtml:*</include> + <include>org.apache.pdfbox:*</include> + <include>picocontainer:*</include> + <include>org.apache.poi:*</include> + <include>org.apache.portals.bridges:*</include> + <include>quartz:*</include> + <include>rome:*</include> + <include>org.apache.sanselan:*</include> + <include>org.apache.ws.commons:*</include> + <include>apache-xerces:*</include> + <include>org.apache.xmlbeans:*</include> + <include>xpp3:*</include> + <include>com.thoughtworks.xstream:*</include> + <include>net.oauth:*</include> + </includes> + </dependencySet> + </dependencySets> + + <fileSets> + + <!-- copy tomcat - without unix executables --> + <fileSet> + <directory>${tomcat.dir}</directory> + <outputDirectory>tomcat</outputDirectory> + <excludes> + <exclude>bin/*.sh</exclude> + <exclude>bin/startup.*</exclude> + <exclude>bin/shutdown.*</exclude> + </excludes> + <fileMode>0644</fileMode> + </fileSet> + + <!-- copy tomcat - only unix executabls --> + <fileSet> + <directory>${tomcat.dir}/bin</directory> + <outputDirectory>tomcat/bin</outputDirectory> + <includes> + <include>*.sh</include> + </includes> + <excludes> + <exclude>startup.*</exclude> + <exclude>shutdown.*</exclude> + </excludes> + <fileMode>0755</fileMode> + </fileSet> + + <!-- configurations, etc.--> + <fileSet> + <directory>${basedir}/src/main/resources/tomcat</directory> + <outputDirectory>tomcat</outputDirectory> + <excludes> + <exclude>bin/*.sh</exclude> + </excludes> + <fileMode>0644</fileMode> + </fileSet> + + <!-- startup scripts --> + <fileSet> + <directory>${basedir}/src/main/resources/tomcat/bin</directory> + <outputDirectory>tomcat/bin</outputDirectory> + <includes> + <include>*.sh</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + </fileSets> + + <files> + <!-- copy gatein configuration file --> + <file> + <source>${basedir}/../../../component/common/src/main/java/conf/configuration-tomcat.properties</source> + <outputDirectory>tomcat/gatein/conf</outputDirectory> + <destName>configuration.properties</destName> + </file> + </files> + </assembly> Modified: portal/trunk/packaging/tomcat/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pom.xml 2010-10-23 10:37:05 UTC (rev 4798) +++ portal/trunk/packaging/tomcat/pom.xml 2010-10-23 14:51:19 UTC (rev 4799) @@ -10,4 +10,9 @@ <artifactId>exo.portal.packaging.tomcat</artifactId> <packaging>pom</packaging> <name>GateIn Tomcat package</name> + + <modules> + <module>pkg</module> + </modules> + </project> \ No newline at end of file Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-10-23 10:37:05 UTC (rev 4798) +++ portal/trunk/pom.xml 2010-10-23 14:51:19 UTC (rev 4799) @@ -55,7 +55,7 @@ <org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version> <javax.servlet.version>2.5</javax.servlet.version> <version.chromattic>1.0.4</version.chromattic> - <version.reflect>1.0.0</version.reflect> + <version.reflext>1.0.0</version.reflext> <jcip.version>1.0</jcip.version> <!-- ************** --> @@ -108,11 +108,31 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.cache</artifactId> <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.command</artifactId> <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> @@ -133,6 +153,16 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.remote</artifactId> <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> @@ -153,23 +183,78 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.mc-int</artifactId> <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.mc-kernel-extras</artifactId> <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.xml-processing</artifactId> + <version>${org.exoplatform.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.database</artifactId> <version>${org.exoplatform.core.version}</version> @@ -185,9 +270,19 @@ </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.ldap</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + <version>${org.exoplatform.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.exoplatform.core</groupId> @@ -205,26 +300,81 @@ </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.ldap</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.ldap</artifactId> + <version>${org.exoplatform.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.document</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + <version>${org.exoplatform.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.core</artifactId> - <version>${org.exoplatform.jcr.version}</version> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + <version>${org.exoplatform.jcr.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.command</artifactId> + <version>${org.exoplatform.jcr.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> <version>${org.exoplatform.jcr.version}</version> @@ -240,30 +390,140 @@ </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.webdav</artifactId> - <version>${org.exoplatform.jcr.version}</version> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.webdav</artifactId> + <version>${org.exoplatform.jcr.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.web</artifactId> - <version>${org.exoplatform.jcr.version}</version> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + <version>${org.exoplatform.jcr.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ftp</artifactId> - <version>${org.exoplatform.jcr.version}</version> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.command</artifactId> + <version>${org.exoplatform.jcr.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.servlet</artifactId> - <version>${org.exoplatform.ws.version}</version> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + <version>${org.exoplatform.jcr.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.commons</artifactId> + <version>${org.exoplatform.ws.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <version>${org.exoplatform.ws.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.ext</artifactId> + <version>${org.exoplatform.ws.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.rest.core</artifactId> <version>${org.exoplatform.ws.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + <version>${org.exoplatform.ws.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> <!-- GateIn components --> <dependency> @@ -522,8 +782,30 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.tomcat.plugin</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> + </dependency> + <!-- Reflext --> + <dependency> + <groupId>org.reflext</groupId> + <artifactId>reflext.api</artifactId> + <version>${version.reflext}</version> + </dependency> + <dependency> + <groupId>org.reflext</groupId> + <artifactId>reflext.core</artifactId> + <version>${version.reflext}</version> + </dependency> + <dependency> + <groupId>org.reflext</groupId> + <artifactId>reflext.jlr</artifactId> + <version>${version.reflext}</version> + </dependency> + <dependency> + <groupId>org.reflext</groupId> + <artifactId>reflext.spi</artifactId> + <version>${version.reflext}</version> + </dependency> + <!-- Chromattic --> <dependency> <groupId>org.chromattic</groupId> @@ -551,10 +833,25 @@ <artifactId>chromattic.ext</artifactId> <version>${version.chromattic}</version> </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.common</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.metamodel</artifactId> + <version>${version.chromattic}</version> + </dependency> <!-- Picketlink --> <dependency> <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-api</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-core</artifactId> <version>${org.picketlink.idm}</version> </dependency> @@ -580,6 +877,11 @@ </dependency> <dependency> <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-common</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-cache</artifactId> <version>${org.picketlink.idm}</version> </dependency> @@ -596,6 +898,52 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.2</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xerces</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> <version>1.2.2</version> @@ -612,6 +960,27 @@ <version>1.4</version> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.7</version> + </dependency> + + <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> <version>20070829</version> @@ -646,16 +1015,6 @@ <artifactId>junit</artifactId> <version>3.8.1</version> </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0</version> - </dependency> <dependency> <groupId>caja</groupId> @@ -683,9 +1042,9 @@ <version>2.0</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-jmx</artifactId> + <version>2.0</version> </dependency> <dependency> <groupId>rome</groupId> @@ -717,11 +1076,6 @@ <artifactId>htmlparser</artifactId> <version>1.0.7</version> </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.7</version> - </dependency> <dependency> <groupId>org.gatein.shindig</groupId> @@ -774,7 +1128,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>${org.slf4j.version}</version> <scope>test</scope> </dependency> </dependencies>