Author: julien(a)jboss.com Date: 2008-04-20 18:59:46 -0400 (Sun, 20 Apr 2008) New Revision: 10659 Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/log4j.properties modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/logging.properties Modified: modules/portlet/trunk/build/distrib/distrib.xml modules/portlet/trunk/build/pom.xml modules/portlet/trunk/controller/pom.xml modules/portlet/trunk/portal/pom.xml modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml modules/portlet/trunk/portal/src/assemble/simple-portal-war.xml modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/test/pom.xml modules/portlet/trunk/test/src/test/build.xml Log: update portlet container to MC 2.0.0.Beta13 Modified: modules/portlet/trunk/build/distrib/distrib.xml =================================================================== --- modules/portlet/trunk/build/distrib/distrib.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/build/distrib/distrib.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -224,8 +224,7 @@ <echo message="Useful variables:"/> <echo message="no-doc: do not generate documentation if set to true. Currently: ${no-doc}"/> <echo message="no-zip: do not compress packages if set to true. Currently: ${no-zip}"/> - <echo - message="no-tomcat: do not generate Tomcat distribution even if Tomcat path is set. Currently: ${no-tomcat}"/> + <echo message="no-tomcat: do not generate Tomcat distribution even if Tomcat path is set. Currently: ${no-tomcat}"/> <echo message="no-jboss: do not generate JBoss distribution even if JBoss path is set. Currently: ${no-jboss}"/> </target> </project> Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/build/pom.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -30,8 +30,8 @@ <version.javax.servlet>2.5</version.javax.servlet> <version.javax.servlet.jsp>2.1</version.javax.servlet.jsp> <version.apache.tomcat>5.5.12</version.apache.tomcat> - <version.jboss-logging>2.0.3.GA</version.jboss-logging> - <version.jbossxb>2.0.0.CR5</version.jbossxb> + <version.jboss-logging>2.0.4.GA</version.jboss-logging> + <version.jbossxb>2.0.0.CR8</version.jbossxb> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common> <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web> @@ -39,14 +39,15 @@ <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> - <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer> + <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer> + <version.jboss.reflect>2.0.0.Beta12</version.jboss.reflect> <version.cargo>0.9-portal</version.cargo> <version.junit>3.8.1</version.junit> <version.ant>1.7.0</version.ant> <version.sun-jaxb>2.1.4</version.sun-jaxb> <version.portlet-api>2.0</version.portlet-api> <version.ccpp-api>1.0</version.ccpp-api> - <version.xerces>2.7.1</version.xerces> + <version.xerces>2.9.1</version.xerces> </properties> <repositories> @@ -176,10 +177,17 @@ <version>${version.jboss.portal.common}</version> </dependency> <dependency> + <groupId>org.jboss.portal.common</groupId> + <artifactId>common-mc</artifactId> + <version>${version.jboss.portal.common}</version> + </dependency> + + <dependency> <groupId>org.jboss.portal.web</groupId> <artifactId>web-web</artifactId> <version>${version.jboss.portal.web}</version> </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -197,16 +205,12 @@ </dependency> <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>${version.concurrent}</version> + <groupId>jboss</groupId> + <artifactId>jboss-remoting</artifactId> + <version>${version.jboss-remoting}</version> </dependency> + <dependency> - <groupId>org.jboss.portal.common</groupId> - <artifactId>common-mc</artifactId> - <version>${version.jboss.portal.common}</version> - </dependency> - <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> <version>${version.jboss.unit}</version> @@ -236,107 +240,46 @@ <artifactId>portal-test-generic</artifactId> <version>${version.jboss.unit}</version> </dependency> + <dependency> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>${version.concurrent}</version> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> <version>${version.jbossxb}</version> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-logging-jdk</artifactId> - <version>${version.jboss-logging}</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <version>${version.jboss-logging}</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-remoting</artifactId> - <version>${version.jboss-remoting}</version> - </dependency> - <dependency> <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> + <artifactId>jboss-kernel</artifactId> <version>${version.jboss.microcontainer}</version> </dependency> <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-classloader</artifactId> - <version>${version.jboss.microcontainer}</version> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <version>${version.jboss.reflect}</version> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - <version>${version.jboss.microcontainer}</version> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <version>${version.log4j}</version> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - <version>${version.jboss.microcontainer}</version> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-jdk</artifactId> + <version>${version.jboss-logging}</version> </dependency> <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - <version>${version.jboss.microcontainer}</version> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-log4j</artifactId> + <version>${version.jboss-logging}</version> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-impl</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-managed</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-metatype</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${version.apache.commons-logging}</version> Modified: modules/portlet/trunk/controller/pom.xml =================================================================== --- modules/portlet/trunk/controller/pom.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/controller/pom.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -33,6 +33,7 @@ <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> <type>test-jar</type> + <!--<scope>test</scope>--> </dependency> <!--TEST SCOPE--> @@ -50,18 +51,6 @@ <artifactId>xml-apis</artifactId> </dependency> - <!-- - <dependency> - <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet-jsr168api</artifactId> - <version>${project.version}</version> - </dependency> - --> - <!--dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - </dependency--> - </dependencies> <build> Modified: modules/portlet/trunk/portal/pom.xml =================================================================== --- modules/portlet/trunk/portal/pom.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/portal/pom.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -14,6 +14,17 @@ <dependencies> <dependency> + <groupId>org.jboss.portal.common</groupId> + <artifactId>common-mc</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.portal.web</groupId> + <artifactId>web-web</artifactId> + <type>jar</type> + </dependency> + + <dependency> <groupId>org.jboss.portal.portlet</groupId> <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> @@ -22,125 +33,39 @@ <groupId>org.jboss.portal.portlet</groupId> <artifactId>portlet-controller</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-portlet</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.portal.portlet</groupId> <artifactId>portlet-mc</artifactId> <version>${project.version}</version> </dependency> + <dependency> <groupId>concurrent</groupId> <artifactId>concurrent</artifactId> </dependency> + <dependency> - <groupId>org.jboss.portal.common</groupId> - <artifactId>common-mc</artifactId> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> </dependency> + <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-remote</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-mc</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test-generic</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency> - <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-jdk</artifactId> + <artifactId>jboss-common-logging-jdk</artifactId> </dependency> <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-log4j</artifactId> + <artifactId>jboss-common-logging-log4j</artifactId> </dependency> + <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-remoting</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-classloader</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-impl</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-managed</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-metatype</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -148,18 +73,8 @@ <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> + <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-manager</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.portal.web</groupId> - <artifactId>web-web</artifactId> - <type>jar</type> - </dependency> - <dependency> <groupId>javax.ccpp</groupId> <artifactId>ccpp</artifactId> </dependency> Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml =================================================================== --- modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -7,7 +7,41 @@ <componentDescriptors> <componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor> - <componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor> + <!--<componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor>--> </componentDescriptors> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <includes> + + <include>org.jboss.portal.common:common-common</include> + <include>org.jboss.portal.common:common-portal</include> + <include>org.jboss.portal.web:web-web</include> + <include>org.jboss.portal.portlet:portlet-portlet</include> + + <include>javax.ccpp:ccpp</include> + <include>javax.portlet:portlet-api</include> + + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> + <includes> + + <include>org.jboss.portal.common:common-mc</include> + <include>org.jboss.portal.portlet:portlet-controller</include> + <include>org.jboss.portal.portlet:portlet-mc</include> + + <include>org.jboss:jboss-common-core</include> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-mdr</include> + <include>org.jboss:jbossxb</include> + + </includes> + </dependencySet> + </dependencySets> + </assembly> Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml =================================================================== --- modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/portal/src/assemble/simple-portal-lib.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -4,12 +4,14 @@ <dependencySet> <outputDirectory>lib</outputDirectory> <includes> +<!-- <include>org.jboss.portal.common:common-common</include> <include>org.jboss.portal.common:common-portal</include> <include>org.jboss.portal.web:web-web</include> <include>org.jboss.portal.portlet:portlet-portlet</include> <include>javax.portlet:portlet-api</include> <include>javax.ccpp:ccpp</include> +--> </includes> </dependencySet> </dependencySets> Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml =================================================================== --- modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -7,25 +7,56 @@ <componentDescriptors> <componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor> - <componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor> + <!--<componentDescriptor>src/assemble/simple-portal-lib.xml</componentDescriptor>--> </componentDescriptors> <dependencySets> <dependencySet> <outputDirectory>lib</outputDirectory> <includes> - <include>log4j:log4j</include> - <include>concurrent:concurrent</include> + + <include>org.jboss.portal.common:common-common</include> + <include>org.jboss.portal.common:common-portal</include> + <include>org.jboss.portal.web:web-web</include> + <include>org.jboss.portal.portlet:portlet-portlet</include> + + <include>javax.xml.bind:jaxb-api</include> + <include>apache-log4j:log4j</include> + <include>javax.ccpp:ccpp</include> <include>javax.activation:activation</include> - <include>javax.xml.bind:jaxb-api</include> + <include>javax.portlet:portlet-api</include> + <include>apache-xerces:xercesImpl</include> - <include>jboss:jboss-logging-spi</include> - <include>jboss:jboss-logging-jdk</include> - <include>jboss:jboss-logging-log4j</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + <include>apache-taglibs:jstl</include> <include>apache-taglibs:standard</include> + </includes> </dependencySet> + <dependencySet> + <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> + <includes> + + <include>org.jboss.portal.common:common-mc</include> + <include>org.jboss.portal.portlet:portlet-controller</include> + <include>org.jboss.portal.portlet:portlet-mc</include> + + <include>jboss:jboss-common-logging-spi</include> + <include>jboss:jboss-common-logging-log4j</include> + <include>jboss:jboss-common-logging-jdk</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-mdr</include> + <include>org.jboss:jbossxb</include> + + <include>concurrent:concurrent</include> + + </includes> + </dependencySet> </dependencySets> </assembly> Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-war.xml =================================================================== --- modules/portlet/trunk/portal/src/assemble/simple-portal-war.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/portal/src/assemble/simple-portal-war.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -14,36 +14,4 @@ </fileSets> - <dependencySets> - <dependencySet> - <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> - <includes> - <include>org.jboss.portal.common:common-mc</include> - <include>org.jboss.portal.portlet:portlet-controller</include> - <include>org.jboss.portal.portlet:portlet-mc</include> - <include>trove:trove</include> - <include>org.jboss:jboss-common-core</include> - <include>org.jboss:jboss-vfs</include> - <include>org.jboss:javassist</include> - <include>org.jboss:jbossxb</include> - <include>org.jboss.aop:jboss-aop</include> - <include>org.jboss.microcontainer:jboss-aop-mc-int</include> - <include>org.jboss.microcontainer:jboss-classloader</include> - <include>org.jboss.microcontainer:jboss-dependency</include> - <include>org.jboss.microcontainer:jboss-container</include> - <include>org.jboss.microcontainer:jboss-deployers-client-spi</include> - <include>org.jboss.microcontainer:jboss-deployers-client</include> - <include>org.jboss.microcontainer:jboss-deployers-core-spi</include> - <include>org.jboss.microcontainer:jboss-deployers-core</include> - <include>org.jboss.microcontainer:jboss-deployers-impl</include> - <include>org.jboss.microcontainer:jboss-deployers-spi</include> - <include>org.jboss.microcontainer:jboss-deployers-structure-spi</include> - <include>org.jboss.microcontainer:jboss-deployers-vfs-spi</include> - <include>org.jboss.microcontainer:jboss-deployers-vfs</include> - <include>org.jboss.microcontainer:jboss-kernel</include> - <include>org.jboss.microcontainer:jboss-managed</include> - </includes> - </dependencySet> - </dependencySets> - </component> \ No newline at end of file Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/log4j.properties 2008-04-20 22:59:46 UTC (rev 10659) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/logging.properties =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/classes/logging.properties 2008-04-20 22:59:46 UTC (rev 10659) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = servlet-examples. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -24,6 +24,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.mc.PortletApplicationDeployer"> + <alias>PortletApplicationRegistry</alias> <property name="servletContainer"><inject bean="ServletContainer"/></property> <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> </bean> Modified: modules/portlet/trunk/test/pom.xml =================================================================== --- modules/portlet/trunk/test/pom.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/test/pom.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -14,6 +14,16 @@ <dependencies> <dependency> + <groupId>org.jboss.portal.common</groupId> + <artifactId>common-mc</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.portal.web</groupId> + <artifactId>web-web</artifactId> + </dependency> + + <dependency> <groupId>org.jboss.portal.portlet</groupId> <artifactId>portlet-portlet</artifactId> <version>${project.version}</version> @@ -34,15 +44,13 @@ <artifactId>portlet-mc</artifactId> <version>${project.version}</version> </dependency> + <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> </dependency> + <dependency> - <groupId>org.jboss.portal.common</groupId> - <artifactId>common-mc</artifactId> - </dependency> - <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> </dependency> @@ -66,83 +74,38 @@ <groupId>org.jboss.unit</groupId> <artifactId>portal-test-generic</artifactId> </dependency> + <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-jdk</artifactId> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-logging-log4j</artifactId> - </dependency> - <dependency> - <groupId>jboss</groupId> <artifactId>jboss-remoting</artifactId> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-classloader</artifactId> + <artifactId>jboss-kernel</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <scope>test</scope> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-jdk</artifactId> </dependency> <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-log4j</artifactId> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-impl</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-managed</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-metatype</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -165,13 +128,6 @@ <groupId>javax.ccpp</groupId> <artifactId>ccpp</artifactId> </dependency> - <!-- - <dependency> - <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet-jsr168api</artifactId> - <version>${project.version}</version> - </dependency> - --> <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> @@ -255,66 +211,56 @@ <property name="runtime_classpath" refid="maven.runtime.classpath"/> <property name="test_classpath" refid="maven.test.classpath"/> <property name="plugin_classpath" refid="maven.plugin.classpath"/> - <property name="project.version" value="${project.version}"/> - <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/> - <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/> - <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/> - <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/> - <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/> - <property name="dependency.jboss-vfs.jar" value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/> - <property name="dependency.jboss-aop-mc-int.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/> - <property name="dependency.jboss-classloader.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/> - <property name="dependency.jboss-container.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/> - <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> - <property name="dependency.jboss-deployers-client-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client-spi.jar.path}"/> - <property name="dependency.jboss-deployers-client.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client.jar.path}"/> - <property name="dependency.jboss-deployers-core-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core-spi.jar.path}"/> - <property name="dependency.jboss-deployers-core.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core.jar.path}"/> - <property name="dependency.jboss-deployers-impl.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-impl.jar.path}"/> - <property name="dependency.jboss-deployers-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-spi.jar.path}"/> - <property name="dependency.jboss-deployers-structure-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-structure-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs.jar.path}"/> - <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> - <property name="dependency.jboss-managed.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/> - <property name="dependency.jboss-metatype.jar" value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/> - <property name="dependency.jboss-aop.jar" value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/> - <property name="dependency.pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/> - <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/> - <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.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}"/> - <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> - <property name="dependency.portal-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> - <property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/> - <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.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.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}"/> + <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.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.portal-web.jar" value="${maven.dependency.org.jboss.portal.web.web-web.jar.path}"/> <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/> <property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/> - <property name="dependency.portal-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/> + <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.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-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/> + <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> + + <property name="dependency.portal-web-web.jar" value="${maven.dependency.org.jboss.portal.web.web-web.jar.path}"/> + + <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/> <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/> <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-mc.jar.path}"/> <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-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}"/> + + <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/> + <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.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.javassist.jar" value="${maven.dependency.org.jboss.javassist.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}"/> + <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.cargo.cargo-core-uberjar.jar.path}"/> <property name="dependency.cargo-ant.jar" value="${maven.dependency.cargo.cargo-ant.jar.path}"/> - <property name="dependency.jaxb-api.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> + <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> - <!-- JSTL for Tomcat --> <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/> <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/> Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-04-20 22:55:30 UTC (rev 10658) +++ modules/portlet/trunk/test/src/test/build.xml 2008-04-20 22:59:46 UTC (rev 10659) @@ -45,93 +45,102 @@ <echo message="Preparing environment"/> - <!--Paths--> - <path id="mc.concurrent"> - <pathelement path="${dependency.concurrent.jar}"/> - </path> - <path id="mc.trove"> - <pathelement path="${dependency.trove.jar}"/> - </path> - <path id="mc.xerces"> - <pathelement path="${dependency.xercesImpl.jar}"/> - <pathelement path="${dependency.resolver.jar}"/> - <pathelement path="${dependency.xml-apis.jar}"/> - </path> - <path id="mc.javassist"> - <pathelement path="${dependency.javassist.jar}"/> - </path> - <path id="mc.jboss_common_logging_spi"> + <path id="jboss-logging"> <pathelement path="${dependency.jboss-logging-spi.jar}"/> - </path> - <path id="mc.jboss_common_logging_jdk"> <pathelement path="${dependency.jboss-logging-jdk.jar}"/> - </path> - <path id="mc.jboss_common_logging_log4j"> <pathelement path="${dependency.jboss-logging-log4j.jar}"/> </path> - <path id="mc.jboss_common_core"> - <pathelement path="${dependency.jboss-common-core.jar}"/> + + <path id="jboss-microcontainer"> + <pathelement path="${dependency.jboss-kernel.jar}"/> + <pathelement path="${dependency.jboss-dependency.jar}"/> + <pathelement path="${dependency.jboss-reflect.jar}"/> + <pathelement path="${dependency.jboss-mdr.jar}"/> + <pathelement path="${dependency.jbossxb.jar}"/> </path> - <path id="mc.jboss_vfs"> - <pathelement path="${dependency.jboss-vfs.jar}"/> + + <path id="portal-common"> + <pathelement path="${dependency.portal-common-mc.jar}"/> </path> - <path id="mc.jboss_xb"> - <pathelement path="${dependency.jbossxb.jar}"/> + + <path id="portal-common-shared"> + <pathelement path="${dependency.portal-common-portal.jar}"/> + <pathelement path="${dependency.portal-common-common.jar}"/> </path> - <path id="mc.jboss_aop"> - <pathelement path="${dependency.jboss-aop.jar}"/> + + <path id="portal-web"> </path> - <path id="mc.jboss_microcontainer"> - <pathelement path="${dependency.jboss-aop-mc-int.jar}"/> - <pathelement path="${dependency.jboss-classloader.jar}"/> - <pathelement path="${dependency.jboss-container.jar}"/> - <pathelement path="${dependency.jboss-dependency.jar}"/> - <pathelement path="${dependency.jboss-container-metadata.jar}"/> - <pathelement path="${dependency.jboss-container-metadata-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-core.jar}"/> - <pathelement path="${dependency.jboss-deployers-core-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-client.jar}"/> - <pathelement path="${dependency.jboss-deployers-client-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-impl.jar}"/> - <pathelement path="${dependency.jboss-deployers-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-structure-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-vfs.jar}"/> - <pathelement path="${dependency.jboss-deployers-vfs-spi.jar}"/> - <pathelement path="${dependency.jboss-managed.jar}"/> - <pathelement path="${dependency.jboss-metatype.jar}"/> - <pathelement path="${dependency.jboss-kernel.jar}"/> + + <path id="portal-web-shared"> + <pathelement path="${dependency.portal-web-web.jar}"/> </path> - <path id="mc.portal-common"> - <pathelement path="${dependency.portal-common-mc.jar}"/> + + <path id="portal-portlet"> + <pathelement path="${dependency.portal-portlet-controller.jar}"/> + <pathelement path="${dependency.portal-portlet-mc.jar}"/> + <pathelement path="${dependency.portal-portlet-tests.jar}"/> </path> - <path id="mc.jboss-unit"> + + <path id="portal-portlet-shared"> + <path location="${dependency.portal-portlet-portlet.jar}"/> + <path location="${dependency.jsr168api.jar}"/> + </path> + + <path id="jboss-unit"> + </path> + + <path id="jboss-unit-shared"> <pathelement path="${dependency.jboss-unit.jar}"/> <pathelement path="${dependency.jboss-unit-mc.jar}"/> <pathelement path="${dependency.jboss-unit-remote.jar}"/> <pathelement path="${dependency.portal-test-generic.jar}"/> <pathelement path="${dependency.portal-test.jar}"/> - </path> - <path id="mc.portal-test-generic"> - <pathelement path="${dependency.portal-test-generic.jar}"/> - </path> - <path id="mc.jboss-remoting"> <pathelement path="${dependency.jboss-remoting.jar}"/> </path> - <path id="mc.log4j"> - <pathelement path="${dependency.log4j.jar}"/> + + <path id="jboss-4.2"> + <path refid="portal-common"/> + <path refid="portal-web"/> + <path refid="portal-portlet"/> + <path refid="jboss-microcontainer"/> + <path location="${dependency.jboss-common-core.jar}"/> </path> - <path id="mc.portal-portlet"> - <pathelement path="${dependency.portal-portlet.jar}"/> + + <path id="jboss-4.2-shared"> + <path refid="portal-common-shared"/> + <path refid="portal-web-shared"/> + <path refid="portal-portlet-shared"/> + <path refid="jboss-unit-shared"/> + <path location="${dependency.ccpp.jar}"/> </path> - <path id="mc.portal-portlet-controller"> - <pathelement path="${dependency.portal-portlet-controller.jar}"/> + + <path id="tomcat-6.0"> + <path refid="portal-common"/> + <path refid="portal-web"/> + <path refid="portal-portlet"/> + <path refid="jboss-unit"/> + <path refid="jboss-microcontainer"/> + <pathelement path="${dependency.javassist.jar}"/> + <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.resolver.jar}"/> + <pathelement path="${dependency.xml-apis.jar}"/> + <pathelement path="${dependency.trove.jar}"/> </path> - <path id="mc.portal-portlet-mc"> - <pathelement path="${dependency.portal-portlet-mc.jar}"/> + + <path id="tomcat-6.0-shared"> + <path refid="portal-common-shared"/> + <path refid="portal-web-shared"/> + <path refid="portal-portlet-shared"/> + <path refid="jboss-unit-shared"/> + <path refid="jboss-logging"/> + <path location="${dependency.jboss-common-core.jar}"/> + <path location="${dependency.log4j.jar}"/> + <path location="${dependency.concurrent.jar}"/> + <path location="${dependency.activation.jar}"/> + <path location="${dependency.jaxb.jar}"/> + <path location="${dependency.ccpp.jar}"/> </path> - <path id="mc.jaxb-api"> - <pathelement path="${dependency.jaxb-api.jar}"/> - </path> + </target> <!--Lets make the check in one place so the build fail in the beggining instead of end--> @@ -300,11 +309,11 @@ <!-- JSR 168 TLD --> <zipfileset - src="${dependency.portal-portlet.jar}" + src="${dependency.portal-portlet-portlet.jar}" includes="META-INF/portlet.tld" fullpath="META-INF/portlet.tld"/> <zipfileset - src="${dependency.portal-portlet.jar}" + src="${dependency.portal-portlet-portlet.jar}" includes="META-INF/portlet_2_0.tld" fullpath="META-INF/portlet_2_0.tld"/> </jar> @@ -394,31 +403,8 @@ <fileset dir="${target}/test-classes/jboss-4.2/portlet-test-war"/> </copy> <copy todir="${test.temp.dir}/jboss-4.2/portlet-test-war/WEB-INF/lib" flatten="true"> - - <!-- --> <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> - - <!-- --> - <path refid="mc.portal-common"/> - - <path refid="mc.portal-portlet-controller"/> - <path refid="mc.portal-portlet-mc"/> - - <!-- Remote plugin --> - <path refid="mc.jboss-remoting"/> - <path refid="mc.portal-test-generic"/> - - - <!-- MC 2.0.0.Beta4 --> - <path refid="mc.trove"/> - <path refid="mc.javassist"/> - <path refid="mc.jboss_common_core"/> - <path refid="mc.jboss_vfs"/> - <path refid="mc.jboss_xb"/> - <path refid="mc.jboss_aop"/> - <path refid="mc.jboss_microcontainer"/> - <path refid="mc.jaxb-api"/> - + <path refid="jboss-4.2"/> </copy> <mkdir dir="${test.temp.lib}/jboss-4.2"/> <jar jarfile="${test.temp.lib}/jboss-4.2/portlet-test.war"> @@ -431,30 +417,8 @@ <fileset dir="${target}/test-classes/tomcat-6.0/portlet-test-war"/> </copy> <copy todir="${test.temp.dir}/tomcat-6.0/portlet-test-war/WEB-INF/lib" flatten="true"> - - <!-- --> <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> - - <!-- --> - <path refid="mc.portal-common"/> - - <path refid="mc.portal-portlet-controller"/> - <path refid="mc.portal-portlet-mc"/> - - <!-- Remote plugin --> - <path refid="mc.jboss-remoting"/> - <path refid="mc.portal-test-generic"/> - - <!-- MC 2.0.0.Beta4 --> - <path refid="mc.trove"/> - <path refid="mc.xerces"/> - <path refid="mc.javassist"/> - <path refid="mc.jboss_common_core"/> - <path refid="mc.jboss_vfs"/> - <path refid="mc.jboss_xb"/> - <path refid="mc.jboss_aop"/> - <path refid="mc.jboss_microcontainer"/> - + <path refid="tomcat-6.0"/> </copy> <mkdir dir="${test.temp.lib}/tomcat-6.0"/> <jar jarfile="${test.temp.lib}/tomcat-6.0/portlet-test.war"> @@ -495,17 +459,8 @@ <!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>--> <sharedClasspath> - <path location="${dependency.portal-common.jar}"/> - <path location="${dependency.portal-common-portal.jar}"/> - <path location="${dependency.portal-portlet.jar}"/> - <path location="${dependency.portal-web.jar}"/> - <path location="${dependency.jsr168api.jar}"/> - <path location="${dependency.ccpp.jar}"/> + <path refid="jboss-4.2-shared"/> - <path location="${dependency.jboss-unit.jar}"/> - <path location="${dependency.jboss-unit-remote.jar}"/> - <path location="${dependency.portal-test.jar}"/> - </sharedClasspath> <configuration home="${test.jboss-4.2.tempdir}"> <property name="cargo.servlet.port" value="8080"/> @@ -602,25 +557,8 @@ wait="${cargo.wait}"> <sharedClasspath> - <path location="${dependency.log4j.jar}"/> - <path location="${dependency.concurrent.jar}"/> - <path location="${dependency.activation.jar}"/> - <path location="${dependency.jaxb-api.jar}"/> + <path refid="tomcat-6.0-shared"/> - <path refid="mc.jboss_common_logging_spi"/> - <path refid="mc.jboss_common_logging_jdk"/> - - <path location="${dependency.portal-common.jar}"/> - <path location="${dependency.portal-common-portal.jar}"/> - <path location="${dependency.portal-portlet.jar}"/> - <path location="${dependency.portal-web.jar}"/> - <path location="${dependency.jsr168api.jar}"/> - <path location="${dependency.ccpp.jar}"/> - - <path location="${dependency.jboss-unit.jar}"/> - <path location="${dependency.jboss-unit-remote.jar}"/> - <path location="${dependency.portal-test.jar}"/> - </sharedClasspath> <configuration> <property name="cargo.servlet.port" value="8080"/> @@ -718,23 +656,15 @@ <fileset dir="${target}/test-classes/jboss-4.2/portlet-tck-war"/> </copy> +<!-- <copy todir="${tck-jboss}/portlet-tck-war/WEB-INF/lib" flatten="true"> - <!-- --> <fileset dir="${target}" includes="portlet-test-lib.jar"/> - - <!-- --> <path refid="mc.portal-common"/> - <path refid="mc.portal-portlet-controller"/> <path refid="mc.portal-portlet-mc"/> - - <!-- Remote plugin --> <path refid="mc.jboss-remoting"/> <path refid="mc.portal-test-generic"/> - - - <!-- MC 2.0.0.Beta4 --> <path refid="mc.trove"/> <path refid="mc.javassist"/> <path refid="mc.jboss_common_core"/> @@ -745,6 +675,7 @@ </copy> +--> <mkdir dir="${tck-jboss}/tck-portal"/> @@ -752,24 +683,24 @@ <fileset dir="${tck-jboss}/portlet-tck-war"/> </jar> +<!-- <copy todir="${tck-jboss}/tck-portal" flatten="true"> - <!--Stuff from shared classpath--> <path location="${dependency.portal-common.jar}"/> <path location="${dependency.portal-common-portal.jar}"/> <path location="${dependency.portal-portlet.jar}"/> <path location="${dependency.portal-web.jar}"/> <path location="${dependency.jsr168api.jar}"/> <path location="${dependency.ccpp.jar}"/> - <path location="${dependency.jaxb-api.jar}"/> + <path location="${dependency.jaxb.jar}"/> <path location="${dependency.jboss-unit.jar}"/> <path location="${dependency.jboss-unit-remote.jar}"/> <path location="${dependency.portal-test.jar}"/> - + </copy> +--> - <!--TOMCAT--> <copy todir="${tck-tomcat}/portlet-tck-war"> @@ -779,22 +710,15 @@ <fileset dir="${target}/test-classes/tomcat-6.0/portlet-tck-war"/> </copy> +<!-- <copy todir="${tck-tomcat}/portlet-tck-war/WEB-INF/lib" flatten="true"> - <!-- --> <fileset dir="${target}" includes="portlet-test-lib.jar"/> - - <!-- --> <path refid="mc.portal-common"/> - <path refid="mc.portal-portlet-controller"/> <path refid="mc.portal-portlet-mc"/> - - <!-- Remote plugin --> <path refid="mc.jboss-remoting"/> <path refid="mc.portal-test-generic"/> - - <!-- MC 2.0.0.Beta4 --> <path refid="mc.trove"/> <path refid="mc.xerces"/> <path refid="mc.javassist"/> @@ -804,8 +728,8 @@ <path refid="mc.jboss_aop"/> <path refid="mc.jboss_microcontainer"/> - </copy> +--> <mkdir dir="${tck-tomcat}/tck-portal"/> @@ -813,32 +737,28 @@ <fileset dir="${tck-tomcat}/portlet-tck-war"/> </jar> +<!-- <copy todir="${tck-tomcat}/tck-portal" flatten="true"> - <!--Stuff from shared classpath--> <path location="${dependency.log4j.jar}"/> <path location="${dependency.concurrent.jar}"/> <path location="${dependency.activation.jar}"/> - <path location="${dependency.jaxb-api.jar}"/> - + <path location="${dependency.jaxb.jar}"/> <path refid="mc.jboss_common_logging_spi"/> <path refid="mc.jboss_common_logging_jdk"/> - <path location="${dependency.portal-common.jar}"/> <path location="${dependency.portal-common-portal.jar}"/> <path location="${dependency.portal-portlet.jar}"/> <path location="${dependency.portal-web.jar}"/> <path location="${dependency.jsr168api.jar}"/> <path location="${dependency.ccpp.jar}"/> - <path location="${dependency.jboss-unit.jar}"/> <path location="${dependency.jboss-unit-remote.jar}"/> <path location="${dependency.portal-test.jar}"/> </copy> +--> - - <delete file="${target}/portlet-test-lib.jar"/> </target>