[jboss-cvs] jboss-seam ...
Peter Muir
peter at bleepbleep.org.uk
Tue Jun 19 17:57:45 EDT 2007
User: pmuir
Date: 07/06/19 17:57:45
Modified: jboss-seam .classpath build.xml
Added: jboss-seam pom.xml
Log:
JBSEAM-1013 - port seam ui to a4j cdk
Revision Changes Path
1.59 +1 -1 jboss-seam/.classpath
(In the diff below, changes in quantity of whitespace are not shown.)
Index: .classpath
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/.classpath,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- .classpath 17 Jun 2007 23:30:40 -0000 1.58
+++ .classpath 19 Jun 2007 21:57:45 -0000 1.59
@@ -6,8 +6,8 @@
<classpathentry kind="src" path="src/mail"/>
<classpathentry kind="src" path="src/pdf"/>
<classpathentry kind="src" path="src/debug"/>
- <classpathentry kind="src" path="src/ui"/>
<classpathentry kind="src" path="src/gen"/>
+ <classpathentry kind="src" path="ui/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/portlet-api-lib.jar"/>
<classpathentry kind="lib" path="lib/servlet-api.jar"/>
1.199 +29 -55 jboss-seam/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build.xml,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- build.xml 18 Jun 2007 15:35:19 -0000 1.198
+++ build.xml 19 Jun 2007 21:57:45 -0000 1.199
@@ -51,8 +51,8 @@
<property name="meldware.dir" value="${mail.dir}/buni-meldware" />
<property name="src.java.dir" value="src/main" />
- <property name="src.ui.dir" value="src/ui" />
- <property name="src.ui-cdk.dir" value="ui" />
+ <property name="src.ui.dir" value="ui/src" />
+ <property name="ui.dir" value="ui" />
<property name="src.pdf.dir" value="src/pdf" />
<property name="src.ioc.dir" value="src/ioc" />
<property name="src.mail.dir" value="src/mail" />
@@ -80,11 +80,12 @@
<property name="dist.name" value="${name}-${version}.${patchlevel}" />
<property name="dist.dir" value="${imported.basedir}/../${dist.name}" />
+ <property name="dist.ui.dir" value="${dist.dir}/ui" />
<property name="dist.doc.dir" value="${dist.dir}/doc" />
<property name="dist.api.dir" value="${dist.dir}/doc/api" />
<property name="dist.ref.dir" value="${dist.dir}/doc/reference" />
<property name="dist.src.java.dir" value="${dist.dir}/src/main" />
- <property name="dist.src.ui.dir" value="${dist.dir}/src/ui" />
+ <property name="dist.src.ui.dir" value="${dist.dir}/ui/src" />
<property name="dist.src.pdf.dir" value="${dist.dir}/src/pdf" />
<property name="dist.src.ioc.dir" value="${dist.dir}/src/ioc" />
<property name="dist.src.mail.dir" value="${dist.dir}/src/mail" />
@@ -136,6 +137,10 @@
<include name="jboss-seam-remoting.jar" if="example.seam.remoting.lib" />
</zipfileset>
+ <zipfileset id="example.seam.ui.jar" dir="${lib.dir}" prefix="WEB-INF/lib" description="the jars needed for seam ui">
+ <include name="commons-beanutils*.jar" if="example.seam.ui.lib" />
+ </zipfileset>
+
<zipfileset id="example.itext.jar" dir="${lib.dir}" prefix="WEB-INF/lib" description="the itext jar">
<include name="itext-*.jar" if="example.seam.pdf.lib" />
<include name="jfreechart-*.jar" if="example.seam.pdf.lib" />
@@ -408,9 +413,10 @@
<delete dir="${build.dir}" />
<delete dir="test-output" />
<delete dir="report" />
+ <antcall target="cleanui" />
</target>
- <target name="cleanui-cdk" description="Cleans up CDK based Seam UI">
+ <target name="cleanui" unless="example.name">
<antcall target="cdk">
<param name="maven-target" value="clean" />
</antcall>
@@ -517,19 +523,6 @@
</target>
- <target name="initui" description="Initialize the build for the UI package">
- <echo message="Build ${Name} UI ${version}" />
-
- <mkdir dir="${uiclasses.dir}" />
- <copy todir="${uiclasses.dir}">
- <fileset dir="${src.ui.dir}">
- <patternset refid="meta.files" />
- <patternset refid="resource.files" />
- </fileset>
- </copy>
-
- </target>
-
<target name="initpdf" description="Initialize the build for the PDF package">
<echo message="Build ${Name} PDF ${version}" />
@@ -637,12 +630,6 @@
</javac>
</target>
- <target name="compileui" depends="initui,select-compiler" description="Compile the Java source code for the UI package">
- <javac source="1.5" target="1.5" destdir="${uiclasses.dir}" classpathref="build.classpath" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on">
- <src path="${src.ui.dir}" />
- </javac>
- </target>
-
<target name="compilepdf" depends="initpdf,select-compiler" description="Compile the Java source code for the PDF package">
<javac source="1.5" target="1.5" destdir="${pdfclasses.dir}" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on">
<src path="${src.pdf.dir}" />
@@ -1032,44 +1019,28 @@
</target>
- <target name="jarui" depends="compileui" description="Build the distribution .jar file for the UI package">
- <mkdir dir="${dist.dir}" />
-
- <jar jarfile="${basedir}/${name}-ui.jar" basedir="${uiclasses.dir}">
- <include name="**/*.class" />
- <patternset refid="meta.files" />
- <patternset refid="resource.files" />
- <manifest>
- <attribute name="Seam-Version" value="${version}.${patchlevel}" />
- <attribute name="Implementation-Version" value="${version}.${patchlevel}" />
- </manifest>
- </jar>
- <copy file="${basedir}/${name}-ui.jar" todir="${dist.dir}" />
-
- </target>
-
- <target name="jarui-cdk" description="Build the distribution .jar file for the UI package based on A4J CDK">
+ <target name="jarui" description="Build the distribution .jar file for the UI package based on A4J CDK">
<mkdir dir="${dist.dir}" />
<antcall target="cdk">
<param name="maven-target" value="package" />
</antcall>
- <copy file="${src.ui-cdk.dir}/jboss-seam-ui/target/jboss-seam-ui.jar" tofile="${basedir}/${name}-ui.jar" />
+ <copy file="${ui.dir}/target/jboss-seam-ui.jar" tofile="${basedir}/${name}-ui.jar" />
<copy file="${basedir}/${name}-ui.jar" todir="${dist.dir}" />
</target>
<!-- Call out to maven to build Seam ui based on the cdk-->
<target name="cdk">
- <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="${basedir}/${src.ui-cdk.dir}/jboss-seam-ui">
+ <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="${basedir}">
<classpath>
- <fileset dir="${basedir}/${src.ui-cdk.dir}/maven/core/boot">
+ <fileset dir="${basedir}/maven/core/boot">
<include name="*.jar" />
</fileset>
- <fileset dir="${basedir}/${src.ui-cdk.dir}/maven/bin">
+ <fileset dir="${basedir}/maven/bin">
<include name="*.*" />
</fileset>
</classpath>
- <sysproperty key="classworlds.conf" value="${basedir}/${src.ui-cdk.dir}/maven/bin/m2.conf" />
- <sysproperty key="maven.home" value="${basedir}/${src.ui-cdk.dir}/maven" />
+ <sysproperty key="classworlds.conf" value="${basedir}/maven/bin/m2.conf" />
+ <sysproperty key="maven.home" value="${basedir}/maven" />
<sysproperty key="seam.dir" value="${basedir}" />
<sysproperty key="seam.version" value="${version}" />
<sysproperty key="tlddoc.dir" value="${dist.ui.tld.dir}" />
@@ -1179,20 +1150,20 @@
</packageset>
</javadoc>
- <copy file="${doc.api.dir}/package.html" todir="${dist.api.dir}" />
-
- </target>
- <target name="javadoc-ui" description="Javadoc and TLD doc for Seam UI">
<antcall target="cdk">
- <param name="maven-target" value="javadoc:javadoc taglib:taglibdoc" />
+ <param name="maven-target" value="javadoc:javadoc" />
</antcall>
+
+ <copy file="${doc.api.dir}/package.html" todir="${dist.api.dir}" />
+
<copy todir="${dist.ui.api.dir}">
- <fileset dir="${src.ui-cdk.dir}/jboss-seam-ui/target/site">
- <include name="tlddoc/**"/>
+ <fileset dir="${ui.dir}/target/site">
+ <!--<include name="tlddoc/**"/>-->
<include name="apidocs/**"/>
</fileset>
</copy>
+
</target>
<target name="refdoc" description="Generate and copy reference documentation">
@@ -1218,6 +1189,8 @@
<copy file="changelog.txt" todir="${dist.dir}" />
<copy file="build.properties" todir="${dist.dir}" />
<copy file="build.xml" todir="${dist.dir}" />
+ <copy file="pom.xml" todir="${dist.dir}" />
+ <copy file="${ui.dir}/pom.xml" todir="${dist.src.ui.dir}" />
<copy file="seam" todir="${dist.dir}" />
<copy file="seam-text.g" todir="${dist.dir}" />
<copy file="seam.bat" todir="${dist.dir}" />
@@ -1261,6 +1234,7 @@
<jar destfile="${build.dir}/${example.name}.war">
<zipfileset refid="example.war.docroot" />
<zipfileset refid="example.war.webinf.lib" />
+ <zipfileset refid="example.seam.ui.jar"/>
<zipfileset refid="example.seam.misc.jar" />
<zipfileset refid="example.facelets.jar" />
<zipfileset refid="example.urlrewrite.jar" />
1.1 date: 2007/06/19 21:57:45; author: pmuir; state: Exp;jboss-seam/pom.xml
Index: pom.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.ui</groupId>
<artifactId>jboss-seam-ui</artifactId>
<url>http://jboss.com/products/seam</url>
<version>${seam.version}</version>
<name>Seam Project</name>
<packaging>pom</packaging>
<modules>
<module>ui</module>
</modules>
<pluginRepositories>
<pluginRepository>
<releases />
<snapshots>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
<id>repository.jboss.com</id>
<name>JBoss Repository</name>
<url>http://repository.jboss.com/maven2</url>
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<releases />
<snapshots>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
<id>maven-repository.dev.java.net</id>
<name>Java.net Repository</name>
<url>
https://maven-repository.dev.java.net/nonav/repository
</url>
<layout>legacy</layout>
</repository>
<repository>
<releases />
<snapshots>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
<id>repository.jboss.com</id>
<name>JBoss Repository</name>
<url>http://repository.jboss.com/maven2</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jsp-api</artifactId>
<scope>system</scope>
<version>transient</version>
<systemPath>${seam.dir}/lib/jsp-api.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<scope>system</scope>
<version>transient</version>
<systemPath>${seam.dir}/jboss-seam.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>antlr</artifactId>
<scope>system</scope>
<version>transient</version>
<systemPath>${seam.dir}/lib/antlr-2.7.6.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>ajax4jsf</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/ajax4jsf-1.1.1.jar
</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>myfaces-api</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/jsf-api.jar
</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jbpm</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/jbpm-jpdl.jar
</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-cache-jdk50</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/jboss-cache-jdk50.jar
</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jgroups</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/jgroups.jar
</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-ejb3-all</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/jboss-embedded-all.jar
</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>hibernate-all</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/hibernate-all.jar
</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>facelets</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/jsf-facelets.jar
</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-el-api</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/jboss-el-api.jar
</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>commons-beanutils</artifactId>
<version>transient</version>
<scope>system</scope>
<systemPath>
${seam.dir}/lib/commons-beanutils-1.7.0.jar
</systemPath>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
More information about the jboss-cvs-commits
mailing list