[portal-commits] JBoss Portal SVN: r10164 - in modules/portlet/trunk: docs/user-guide/en and 3 other directories.

Author: julien(a)jboss.com Date: 2008-03-02 12:52:11 -0500 (Sun, 02 Mar 2008) New Revision: 10164 Added: modules/portlet/trunk/docs/user-guide/en/modules/simpleportal.xml modules/portlet/trunk/portal/src/assembly/samples-basic.xml modules/portlet/trunk/portal/src/assembly/samples-cart-event-portlet.xml modules/portlet/trunk/portal/src/assembly/samples-google-map-portlet.xml modules/portlet/trunk/portal/src/assembly/samples-google-weather-portlet.xml modules/portlet/trunk/portal/src/assembly/samples-remotecontrol-portlet.xml modules/portlet/trunk/portal/src/assembly/samples.xml modules/portlet/trunk/portal/src/assembly/simple-portal-lib.xml modules/portlet/trunk/portal/src/assembly/simple-portal-tomcat60.xml modules/portlet/trunk/portal/src/assembly/simple-portal-war.xml Modified: modules/portlet/trunk/build/distrib/distrib.xml modules/portlet/trunk/docs/user-guide/en/master.xml modules/portlet/trunk/portal/pom.xml modules/portlet/trunk/portal/src/assembly/simple-portal-jboss42.xml Log: - packaging for AS42 and tomcat working again - packaging of samples - update distrib.xml to use portal module now - documentation update Modified: modules/portlet/trunk/build/distrib/distrib.xml =================================================================== --- modules/portlet/trunk/build/distrib/distrib.xml 2008-02-29 23:50:12 UTC (rev 10163) +++ modules/portlet/trunk/build/distrib/distrib.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -2,20 +2,21 @@ <property name="source.dir" value="../.."/> <property name="src.docs.dir" value="${source.dir}/docs"/> - <property name="pc.release.version" value="2.0.0.B1"/> - <property name="demo.release.version" value="2.0.0.B1"/> + <property name="pc.release.version" value="2.0.0.CR1"/> + <property name="demo.release.version" value="2.0.0.CR1"/> + <property name="maven.version" value="2.0-SNAPSHOT"/> <!-- --> <property name="pc.release.name" value="jboss-portletcontainer-${pc.release.version}"/> <property name="demo.release.name" value="jboss-portletcontainer-${demo.release.version}"/> <property name="pc.release.name.src" value="${pc.release.name}-src"/> - <property name="demo.release.name.as42" value="${demo.release.name}-jbossas42"/> - <property name="demo.release.name.tomcat6" value="${demo.release.name}-tomcat6"/> + <property name="demo.release.name.jboss42" value="${demo.release.name}-jbossas42"/> + <property name="demo.release.name.tomcat60" value="${demo.release.name}-tomcat6"/> <!-- --> <property name="pc.build.src" value="output/${pc.release.name.src}"/> - <property name="pc.build.bin.as42" value="output/${demo.release.name.as42}"/> - <property name="pc.build.bin.tomcat6" value="output/${demo.release.name.tomcat6}"/> + <property name="pc.build.bin.as42" value="output/${demo.release.name.jboss42}"/> + <property name="pc.build.bin.tomcat6" value="output/${demo.release.name.tomcat60}"/> <!-- Clean --> <target name="clean"> @@ -39,9 +40,11 @@ <!-- Build JBoss Portlet Container documentation --> <target name="doc.build" unless="no-doc"> +<!-- <sequential> <ant dir="${src.docs.dir}/user-guide" antfile="build.xml"/> </sequential> +--> </target> <!-- Package the different distributions --> @@ -51,8 +54,8 @@ <mkdir dir="output"/> <antcall target="package-src"/> - <antcall target="package-as42"/> - <antcall target="package-tomcat6"/> + <antcall target="package-jboss42"/> + <antcall target="package-tomcat60"/> </target> <!-- @@ -74,7 +77,7 @@ <!-- | JBoss Portlet Container binary distribution for AS 4.2.x --> - <target name="package-as42" description="package AS binary" if="JBOSS_4_2_HOME"> + <target name="package-jboss42" description="package AS binary" if="JBOSS_4_2_HOME"> <copy todir="${pc.build.bin.as42}"> <fileset dir="${JBOSS_4_2_HOME}" includes="**/*"/> </copy> @@ -82,39 +85,33 @@ <param name="bin.dir" value="${pc.build.bin.as42}"/> <param name="deploy.dir" value="${pc.build.bin.as42}/server/default/deploy"/> </antcall> - <!--<copy todir="${pc.build.bin.as42}/simple-portal"> - <fileset dir="${source.dir}/test/target/portal/as42/simple-portal" includes="**/*"/> - </copy>--> <copy todir="${pc.build.bin.as42}/server/default/deploy/simple-portal"> - <fileset dir="${source.dir}/test/target/portal/as42/simple-portal" includes="**/*"/> + <fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-jboss42.dir/simple-portal"/> </copy> <antcall target="__zip"> - <param name="release.name" value="${demo.release.name.as42}"/> + <param name="release.name" value="${demo.release.name.jboss42}"/> </antcall> </target> <!-- | JBoss Portlet Container binary distribution for Tomcat 6.x --> - <target name="package-tomcat6" description="package Tomcat binary" if="TOMCAT_6_HOME"> + <target name="package-tomcat60" description="package Tomcat binary" if="TOMCAT_6_0_HOME"> <copy todir="${pc.build.bin.tomcat6}"> - <fileset dir="${TOMCAT_6_HOME}" includes="**/*"/> + <fileset dir="${TOMCAT_6_0_HOME}" includes="**/*"/> </copy> <antcall target="__package-binary"> <param name="bin.dir" value="${pc.build.bin.tomcat6}"/> <param name="deploy.dir" value="${pc.build.bin.tomcat6}/webapps"/> </antcall> - <!--<copy todir="${pc.build.bin.tomcat6}/simple-portal"> - <fileset dir="${source.dir}/test/target/portal/tomcat" includes="**/*"/> - </copy>--> <copy todir="${pc.build.bin.tomcat6}/lib"> - <fileset dir="${source.dir}/test/target/portal/tomcat/copy-to-tomcat-lib" includes="**/*.jar"/> + <fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/lib" includes="**/*.jar"/> </copy> - <copy todir="${pc.build.bin.tomcat6}/webapps"> - <fileset dir="${source.dir}/test/target/portal/tomcat/" includes="**/*.war"/> - </copy> + <jar file="${pc.build.bin.tomcat6}/webapps/simple-portal.war"> + <fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/simple-portal.war" includes="**"/> + </jar> <antcall target="__zip"> - <param name="release.name" value="${demo.release.name.tomcat6}"/> + <param name="release.name" value="${demo.release.name.tomcat60}"/> </antcall> </target> @@ -135,15 +132,11 @@ <copy todir="${bin.dir}/lib" flatten="true"> <fileset dir="${source.dir}" includes="**/target/*.jar" excludes="**/*sources.jar"/> </copy> - <copy todir="${bin.dir}/samples" flatten="true"> - <fileset dir="${source.dir}/test/target/portal/samples" includes="*.war"/> - </copy> + <copy file="${source.dir}/portal/target/portlet-portal-${maven.version}-samples-basic.war" tofile="${bin.dir}/samples/samples-basic.war"/> </target> <target name="__package-bundled-binary" unless="bin-alone"> - <copy todir="${deploy.dir}" flatten="true"> - <fileset dir="${source.dir}/test/target/portal/samples" includes="*.war"/> - </copy> + <copy file="${source.dir}/portal/target/portlet-portal-${maven.version}-samples-basic.war" tofile="${deploy.dir}/samples-basic.war"/> </target> <target name="__package-distrib"> @@ -155,16 +148,15 @@ </target> <target name="__package-doc" unless="no-doc"> +<!-- <sequential> - <mkdir dir="${todir}"/> + <mkdir dir="${todir}"/> sam <mkdir dir="${todir}/user-guide"/> <copy todir="${todir}/user-guide"> <fileset dir="${src.docs.dir}/user-guide/build/en/"/> </copy> - <!--<copy todir="${todir}/docs/licenses"> - <fileset dir="output/docs/licenses"/> - </copy>--> </sequential> +--> </target> <target name="__zip" unless="no-zip"> @@ -186,17 +178,17 @@ </not> </and> </condition> - <condition property="TOMCAT_6_HOME" value="${env.TOMCAT_6_HOME}"> + <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}"> <and> - <isset property="env.TOMCAT_6_HOME"/> + <isset property="env.TOMCAT_6_0_HOME"/> <not> - <isset property="TOMCAT_6_HOME"/> + <isset property="TOMCAT_6_0_HOME"/> </not> </and> </condition> - <echo message="Set JBOSS_4_2_HOME and/or TOMCAT_6_HOME variables for binary distributions:"/> + <echo message="Set JBOSS_4_2_HOME and/or TOMCAT_6_0_HOME variables for binary distributions:"/> <echo message="JBoss AS 4.2.x home: ${JBOSS_4_2_HOME}"/> - <echo message="Tomcat 6.x home: ${TOMCAT_6_HOME}"/> + <echo message="Tomcat 6.x home: ${TOMCAT_6_0_HOME}"/> </target> </project> Modified: modules/portlet/trunk/docs/user-guide/en/master.xml =================================================================== --- modules/portlet/trunk/docs/user-guide/en/master.xml 2008-02-29 23:50:12 UTC (rev 10163) +++ modules/portlet/trunk/docs/user-guide/en/master.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -3,6 +3,7 @@ "../../docbook-support/support/docbook-dtd/docbookx.dtd" [ <!ENTITY introduction SYSTEM "modules/introduction.xml"> <!ENTITY installation SYSTEM "modules/installation.xml"> + <!ENTITY simpleportal SYSTEM "modules/simpleportal.xml"> ]> <book lang="en"> <bookinfo> @@ -23,5 +24,6 @@ <toc/> <!-- Introduction --> &introduction; <!-- Installation --> &installation; + <!-- Simple portal --> &simpleportal; </book> Copied: modules/portlet/trunk/docs/user-guide/en/modules/simpleportal.xml (from rev 10161, modules/portlet/trunk/docs/user-guide/en/modules/introduction.xml) =================================================================== --- modules/portlet/trunk/docs/user-guide/en/modules/simpleportal.xml (rev 0) +++ modules/portlet/trunk/docs/user-guide/en/modules/simpleportal.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<chapter id="simpleportal"> + <chapterinfo> + <author> + <firstname>Julien</firstname> + <surname>Viet</surname> + <email&gt;julien(a)jboss.org&lt;/email&gt; + </author> + </chapterinfo> + <title>Simple Portal</title> + <sect1> + <title>Motivation</title> + <para>The JBoss Portlet Container product has developed a portal called <emphasis>Simple Portal</emphasis>. The + goal of the simple portal is to provide an easy to use portal for small sized sites that do require only + aggregation of portlets in portal pages. In particular the following features are not addressed by the + simple portal product</para> + <itemizedlist> + <listitem>Security: the simple portal relies on the servlet container authentication and does not provide + any kind of security enforcement.</listitem> + <listitem>Dynamic page creation: the simple portal relies on JSP pages to create portal pages.</listitem> + <listitem>Identity integration: integration with identity system is not provided, in particular + access to the user's identity and profile.</listitem> + </itemizedlist> + <para>On the other hand the simple portal is much simpler than a traditionnal portal server because it just + consist in a few modules that handles the basic concerns of portal which is the aggregation of portlet components + in a web page.</para> + <para>Therefore the goals of this product are restricted to</para> + <itemizedlist> + <listitem>Portlet development</listitem> + <listitem>Static portals build on top of the JSR286 specification</listitem> + </itemizedlist> + </sect1> + <sect1> + <title>Development</title> + + <para></para> + + <sect2> + <title>Portlet deployment</title> + <para>The simple portal integrates with a few web containers in order to provide handling of portlet + deployment and runtime. This feature is provided by a component of the JBoss Portal project called + the <emphasis>Web SPI</emphasis> which provides a Service Provider Interface that the JBoss Portal + products can rely on. In particular the JBoss Portlet Container uses the Web SPI in order to be + aware of the deployment life cycle of war files that contains portlet components. The SPI defines + two levels of integrations.</para> + <para>The SPI implementation level 1 works with any web container and relies on the fact that the portlet + developer needs to insert a specific servlet in the <file>web.xml</file> file of its portlet application.</para> + <para>The SPI implementation level 2 is based on more advanced integration with specific web containers + and provides a transparent integration which means that any portlet application can be deployed without + requiring any proprietary modification of the war file, keeping your application vendor agnostic. A few + containers are supported:</para> + <itemizedlist> + <listitem>Tomcat 6.0.x</listitem> + <listitem>JBoss Application Server 4.2.x</listitem> + </itemizedlist> + </sect2> + <sect2> + <title>Page creation</title> + <para>The simple portal relies on the JSP technology to build pages for several good reasons:</para> + <itemizedlist> + <listitem>JSPs are good enough technology for building portal pages. If you think about what + a portal page is, you'll realize that JSP is sufficient. Obviously this does not mean that + a portlet applications is required to use JSP, as usual portlet applications are developed using your + favorite web framework.</listitem> + <listitem>Every java web developer knows JSP.</listitem> + <listitem>It is easy and straightforward to create a portal JSP page and there is no need for advanced + tooling.</listitem> + <listitem>A lot of various frameworks are compatible with JSP and it is possible to leverage them. + For instance if you are familliar with Sitemesh for skinning an application then you can mix it with the + portal tag library.</listitem> + </itemizedlist> + <page>If you need a more advanced page creation system then you should rather consider to use a more advanced + portal product such as JBoss Portal which will fullfill your needs.</page> + </sect2> + <sect2> + <title>Portlet coordination</title> + </sect2> + </sect1> + <sect1> + <title>Debugging</title> + </sect1> + <sect1> + <title>Administration</title> + </sect1> + <sect1> + <title>Extension</title> + <para>Talk about mixing JSP with templating framework or other taglib</para> + </sect1> +</chapter> Modified: modules/portlet/trunk/portal/pom.xml =================================================================== --- modules/portlet/trunk/portal/pom.xml 2008-02-29 23:50:12 UTC (rev 10163) +++ modules/portlet/trunk/portal/pom.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -169,13 +169,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> @@ -200,202 +193,45 @@ <configuration> <descriptors> <descriptor>src/assembly/simple-portal-jboss42.xml</descriptor> + <descriptor>src/assembly/simple-portal-tomcat60.xml</descriptor> + <descriptor>src/assembly/samples-basic.xml</descriptor> + <descriptor>src/assembly/samples-cart-event-portlet.xml</descriptor> + <descriptor>src/assembly/samples-google-map-portlet.xml</descriptor> + <descriptor>src/assembly/samples-google-weather-portlet.xml</descriptor> + <descriptor>src/assembly/samples-remotecontrol-portlet.xml</descriptor> </descriptors> </configuration> </plugin> -<!-- <plugin> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-maven2</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>execute</goal> - </goals> - </execution> - </executions> - <configuration> - <testsuites> - <testsuite> - <config>test/local-jboss-unit.xml</config> - </testsuite> - </testsuites> - <reports> - <xml>target/tests/reports/xml/local</xml> - <html>target/tests/reports/html/local</html> - </reports> - </configuration> - </plugin> - <plugin> + <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> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - - --> -<!-- stuff to run servers for tests --> -<!-- - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - </dependency> - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> - </dependency> - - </dependencies> <executions> <execution> - <id>test</id> - <phase>integration-test</phase> + <id>blah</id> + <phase>blah</phase> + <configuration> <tasks> - - <property name="compile_classpath" refid="maven.compile.classpath"/> - <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.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.org.jboss.portal.portlet.portlet-jsr168api.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.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.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}"/> - - --> -<!-- 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}"/> - - <ant antfile="${basedir}/src/test/build.xml"> - <target name="tests"/> - <target name="package-simple-portal"/> - <target name="package-tck-portal"/> - </ant> - + <echo message="blah"/> + <echo message="blah"/> + <echo message="blah"/> + <echo message="blah"/> </tasks> </configuration> + <goals> <goal>run</goal> </goals> + </execution> </executions> + </plugin> ---> + </plugins> </build> Added: modules/portlet/trunk/portal/src/assembly/samples-basic.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/samples-basic.xml (rev 0) +++ modules/portlet/trunk/portal/src/assembly/samples-basic.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,22 @@ +<assembly> + <id>samples-basic</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources/samples/basic-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/basic/**</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Added: modules/portlet/trunk/portal/src/assembly/samples-cart-event-portlet.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/samples-cart-event-portlet.xml (rev 0) +++ modules/portlet/trunk/portal/src/assembly/samples-cart-event-portlet.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,22 @@ +<assembly> + <id>samples-google-weather-portlet</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources/samples/cart-event-portlet-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/event/*.class</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Added: modules/portlet/trunk/portal/src/assembly/samples-google-map-portlet.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/samples-google-map-portlet.xml (rev 0) +++ modules/portlet/trunk/portal/src/assembly/samples-google-map-portlet.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,22 @@ +<assembly> + <id>samples-google-map-portlet</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources/samples/google-map-portlet-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/GoogleClippingPortlet.class</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Added: modules/portlet/trunk/portal/src/assembly/samples-google-weather-portlet.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/samples-google-weather-portlet.xml (rev 0) +++ modules/portlet/trunk/portal/src/assembly/samples-google-weather-portlet.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,23 @@ +<assembly> + <id>samples-google-weather-portlet</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources/samples/google-weather-portlet-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/GoogleClippingPortlet.class</include> + <include>org/jboss/portal/portlet/portal/samples/GoogleWeatherClippingPortlet.class</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Added: modules/portlet/trunk/portal/src/assembly/samples-remotecontrol-portlet.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/samples-remotecontrol-portlet.xml (rev 0) +++ modules/portlet/trunk/portal/src/assembly/samples-remotecontrol-portlet.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,22 @@ +<assembly> + <id>samples-google-weather-portlet</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources/samples/remotecontrol-portlet-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.class</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Added: modules/portlet/trunk/portal/src/assembly/samples.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/samples.xml (rev 0) +++ modules/portlet/trunk/portal/src/assembly/samples.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,73 @@ +<assembly> + <id>samples</id> + <formats> + <format>dir</format> + </formats> + <baseDirectory>samples</baseDirectory> + + <fileSets> + + <fileSet> + <directory>src/main/resources/samples/google-map-portlet-war</directory> + <outputDirectory>samples-google-map-portlet.war</outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>samples-google-map-portlet.war/WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/GoogleClippingPortlet.class</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/resources/samples/google-weather-portlet-war</directory> + <outputDirectory>samples-google-weather-portlet.war</outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>samples-google-weather-portlet.war/WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/GoogleClippingPortlet.class</include> + <include>org/jboss/portal/portlet/portal/samples/GoogleWeatherClippingPortlet.class</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/resources/samples/remotecontrol-portlet-war</directory> + <outputDirectory>samples-remotecontrol-portlet.war</outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>samples-remotecontrol-portlet.war/WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.class</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/resources/samples/cart-event-portlet-war</directory> + <outputDirectory>samples-cart-event-portlet.war</outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>samples-cart-event-portlet.war/WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/event/*.class</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/resources/samples/basic-war</directory> + <outputDirectory>samples-basic.war</outputDirectory> + </fileSet> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>samples-basic.war/WEB-INF/classes</outputDirectory> + <includes> + <include>org/jboss/portal/portlet/portal/samples/basic/**</include> + </includes> + </fileSet> + + </fileSets> + +</assembly> \ No newline at end of file Modified: modules/portlet/trunk/portal/src/assembly/simple-portal-jboss42.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/simple-portal-jboss42.xml 2008-02-29 23:50:12 UTC (rev 10163) +++ modules/portlet/trunk/portal/src/assembly/simple-portal-jboss42.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -5,64 +5,9 @@ </formats> <baseDirectory>simple-portal</baseDirectory> - <dependencySets> + <componentDescriptors> + <componentDescriptor>src/assembly/simple-portal-war.xml</componentDescriptor> + <componentDescriptor>src/assembly/simple-portal-lib.xml</componentDescriptor> + </componentDescriptors> - <dependencySet> - <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> - <include>javax.xml.bind:jaxb-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>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> - - <fileSets> - - <fileSet> - <directory>src/main/resources/simple-portal-war</directory> - <outputDirectory>simple-portal.war</outputDirectory> - </fileSet> - - <fileSet> - <directory>target/classes</directory> - <outputDirectory>simple-portal.war/WEB-INF/classes</outputDirectory> - </fileSet> - - </fileSets> - </assembly> Added: modules/portlet/trunk/portal/src/assembly/simple-portal-lib.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/simple-portal-lib.xml (rev 0) +++ modules/portlet/trunk/portal/src/assembly/simple-portal-lib.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,17 @@ +<component> + + <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.portlet:portlet-api</include> + <include>javax.ccpp:ccpp</include> + </includes> + </dependencySet> + </dependencySets> + +</component> \ No newline at end of file Added: modules/portlet/trunk/portal/src/assembly/simple-portal-tomcat60.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/simple-portal-tomcat60.xml (rev 0) +++ modules/portlet/trunk/portal/src/assembly/simple-portal-tomcat60.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,30 @@ +<assembly> + <id>simple-portal-tomcat60</id> + <formats> + <format>dir</format> + </formats> + <baseDirectory>simple-portal</baseDirectory> + + <componentDescriptors> + <componentDescriptor>src/assembly/simple-portal-war.xml</componentDescriptor> + <componentDescriptor>src/assembly/simple-portal-lib.xml</componentDescriptor> + </componentDescriptors> + + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <includes> + <include>log4j:log4j</include> + <include>concurrent:concurrent</include> + <include>javax.activation:activation</include> + <include>javax.xml.bind:jaxb-api</include> + <include>apache-xerces:xercesImpl</include> + <include>jboss:jboss-logging-spi</include> + <include>jboss:jboss-logging-jdk</include> + <include>apache-taglibs:jstl</include> + <include>apache-taglibs:standard</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> Added: modules/portlet/trunk/portal/src/assembly/simple-portal-war.xml =================================================================== --- modules/portlet/trunk/portal/src/assembly/simple-portal-war.xml (rev 0) +++ modules/portlet/trunk/portal/src/assembly/simple-portal-war.xml 2008-03-02 17:52:11 UTC (rev 10164) @@ -0,0 +1,49 @@ +<component> + + <fileSets> + + <fileSet> + <directory>src/main/resources/simple-portal-war</directory> + <outputDirectory>simple-portal.war</outputDirectory> + </fileSet> + + <fileSet> + <directory>target/classes</directory> + <outputDirectory>simple-portal.war/WEB-INF/classes</outputDirectory> + </fileSet> + + </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