[portal-commits] JBoss Portal SVN: r13600 - modules/web/trunk/web.

Author: chris.laprun(a)jboss.com Date: 2009-07-24 13:46:15 -0400 (Fri, 24 Jul 2009) New Revision: 13600 Modified: modules/web/trunk/web/pom.xml Log: - Avoid bundling shared libs. Modified: modules/web/trunk/web/pom.xml =================================================================== --- modules/web/trunk/web/pom.xml 2009-07-23 16:09:29 UTC (rev 13599) +++ modules/web/trunk/web/pom.xml 2009-07-24 17:46:15 UTC (rev 13600) @@ -9,7 +9,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>web-web</artifactId> <packaging>jar</packaging> - <name>JBoss Unit</name> + <name>JBoss Portal Web Module</name> <dependencies> @@ -21,28 +21,32 @@ <dependency> <groupId>org.jboss.portal.common</groupId> <artifactId>common-common</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> </exclusion> </exclusions> </dependency> - <dependency> + <dependency> <groupId>sun-servlet</groupId> <artifactId>servlet-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>catalina</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> + <scope>provided</scope> </dependency> <!-- SCOPE TEST --> @@ -99,6 +103,7 @@ <dependency> <groupId>jboss</groupId> <artifactId>jboss-remoting</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> @@ -126,12 +131,14 @@ <scope>test</scope> </dependency> <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>saxpath</groupId> - <artifactId>saxpath</artifactId> + <groupId>saxpath</groupId> + <artifactId>saxpath</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>cargo</groupId> @@ -149,18 +156,20 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> + <scope>test</scope> </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-ant</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> @@ -169,7 +178,7 @@ <groupId>org.jvnet.maven-antrun-extended-plugin</groupId> <artifactId>maven-antrun-extended-plugin</artifactId> <version>1.13</version> - + <dependencies> <dependency> <groupId>org.jboss.unit</groupId> @@ -177,7 +186,7 @@ <version>${version.jboss.unit}</version> </dependency> - <!--stuff to run servers for tests--> + <!--stuff to run servers for tests--> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-ant</artifactId> @@ -212,47 +221,73 @@ <!-- --> <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/> - <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> - <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> - <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/> + <property name="dependency.commons-logging.jar" + value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> + <property name="dependency.commons-httpclient.jar" + value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> + <property name="dependency.activation.jar" + value="${maven.dependency.javax.activation.activation.jar.path}"/> <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/> - <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> + <property name="dependency.cargo-manager.war" + value="${maven.dependency.cargo.cargo-manager.war.path}"/> <!-- JBoss Portal --> - <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> - <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> + <property name="dependency.portal-common-common.jar" + value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> + <property name="dependency.portal-common-mc.jar" + value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> <!-- JBoss Unit --> - <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> - <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> - <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> - <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/> - <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/> - <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> + <property name="dependency.jboss-unit.jar" + value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> + <property name="dependency.jboss-unit-mc.jar" + value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> + <property name="dependency.jboss-unit-remote.jar" + value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> + <property name="dependency.portal-test.jar" + value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/> + <property name="dependency.portal-test-generic.jar" + value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/> + <property name="dependency.jboss-remoting.jar" + value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> <!-- JBoss Microcontainer --> - <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/> - <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/> - <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/> - <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/> - <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> - <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> - <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/> - <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> - <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> - <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/> - <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/> - <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/> - <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> + <property name="dependency.concurrent.jar" + value="${maven.dependency.concurrent.concurrent.jar.path}"/> + <property name="dependency.jboss-logging-spi.jar" + value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/> + <property name="dependency.jboss-logging-jdk.jar" + value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/> + <property name="dependency.jboss-logging-log4j.jar" + value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/> + <property name="dependency.jboss-kernel.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> + <property name="dependency.jboss-dependency.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> + <property name="dependency.jboss-reflect.jar" + value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/> + <property name="dependency.jboss-common-core.jar" + value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> + <property name="dependency.jaxb.jar" + value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> + <property name="dependency.jboss-mdr.jar" + value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/> + <property name="dependency.resolver.jar" + value="${maven.dependency.apache-xerces.resolver.jar.path}"/> + <property name="dependency.xercesImpl.jar" + value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/> + <property name="dependency.xml-apis.jar" + value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/> <!-- Cargo Jetty deployer --> - <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/> + <property name="dependency.cargo.jetty-deployer" + value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/> <ant antfile="${basedir}/src/test/build.xml"> <target name="tests"/> </ant> - + </tasks> </configuration> <goals>