Thanks Mike!!!!
Dave
On Apr 16, 2009, at 8:14 AM, mschra..bjectstyle.org wrote:
> Author: mschrag
> Date: 2009-04-16 08:14:09 -0400 (Thu, 16 Apr 2009)
> New Revision: 5722
>
> Modified:
> trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/WebObjects
> Application/build.xml
> trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/WebObjects
> Framework/build.xml
> trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/Wonder
> Application/build.xml
> trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/Wonder
> Framework/build.xml
> Log:
> WOL-991 JavaClient specific build.xml content could be improved
>
> Modified: trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/WebObjects
> Application/build.xml
> ===================================================================
> --- trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/WebObjects
> Application/build.xml 2009-04-15 17:47:32 UTC (rev 5721)
> +++ trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/WebObjects
> Application/build.xml 2009-04-16 12:14:09 UTC (rev 5722)
>.. -77,10 +77,11 @@
> <target name="build.woapp" depends="compile">
> <taskdef name="woapplication"
> classname="org.objectstyle.woproject.ant.WOApplication"/>
>
> - <woapplication name="${build.app.name}" frameworksBaseURL="/
> WebObjects/${project.name}.woa/Frameworks" destDir="${dest.dir}"
> customInfoPListContent="${customInfoPListContent}" principalClass="$
> {principalClass}" webXML="${webXML}" webXML_CustomContent="$
> {webXML_CustomContent}"
> servletAdaptor="com.webobjects.jspservlet.WOServletAdaptor">
> + <woapplication name="${build.app.name}" frameworksBaseURL="/
> WebObjects/${build.app.name}.woa/Frameworks" destDir="${dest.dir}"
> customInfoPListContent="${customInfoPListContent}" principalClass="$
> {principalClass}" webXML="${webXML}" webXML_CustomContent="$
> {webXML_CustomContent}"
> servletAdaptor="com.webobjects.jspservlet.WOServletAdaptor">
> <classes dir="${classes.dir}">
> <includesfile name="woproject/classes.include.patternset" />
> <excludesfile name="woproject/classes.exclude.patternset" />
> + <exclude if="javaClient" name="**/client/**/*.*"/>
> </classes>
>
> <wsresources dir=".">
>.. -91,6 +92,7 @@
> <resources dir=".">
> <includesfile name="woproject/resources.include.patternset" />
> <excludesfile name="woproject/resources.exclude.patternset" />
> + <exclude if="javaClient" name="**/client/**/*.*"/>
> </resources>
>
> <frameworks root="ProjectLocal" embed="${embed.ProjectLocal}"
> eclipse="true" />
>.. -108,12 +110,9 @@
>
> <target name="javaclient" if="javaClient" depends="build.woapp">
> <mkdir dir="${dest.dir}/${build.app.name}.woa/Contents/
> WebServerResources/Java" />
> - <jar basedir="${classes.dir}" includes="**/client/**/*.class,**/
> common/**/*.class" jarfile="${dest.dir}/${build.app.name}.woa/
> Contents/WebServerResources/Java/${build.app.name}.jar"/>
> + <jar basedir="${classes.dir}" excludes="**/server/**/*.*, **/
> server/**/" jarfile="${dest.dir}/${build.app.name}.woa/Contents/
> WebServerResources/Java/${build.app.name}.jar"/>
> + </target>
>
> - <!-- project user.d2wmodel file (D2JC only) -->
> - <copy file="user.d2wmodel" tofile="${dest.dir}/$
> {build.app.name}.woa/Contents/Resources/user.d2wmodel"/>
> - </target>
> -
> <target name="war" if="servletDeployment" depends="ssdd">
> <war destfile="${dest.dir}/${build.app.name}.war" webxml="$
> {dest.dir}/${build.app.name}/WEB-INF/web.xml">
> <fileset dir="${dest.dir}/${build.app.name}">
>
> Modified: trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/WebObjects
> Framework/build.xml
> ===================================================================
> --- trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/WebObjects
> Framework/build.xml 2009-04-15 17:47:32 UTC (rev 5721)
> +++ trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/WebObjects
> Framework/build.xml 2009-04-16 12:14:09 UTC (rev 5722)
>.. -1,7 +1,7 @@
> <project name="${WOLipsContext.getProjectName()}" default="build"
> basedir=".">
> - <target name="build"
> depends="init.build,build.woframework,package" />
> + <target name="build"
> depends="init.build,build.woframework,javaclient,package" />
>
> - <target name="install" depends="init.install,build.woframework" />
> + <target name="install"
> depends="init.install,build.woframework,javaclient" />
>
> <target name="clean" depends="init.properties">
> <delete dir="bin" />
>.. -56,6 +56,7 @@
> <classes dir="${classes.dir}">
> <includesfile name="woproject/classes.include.patternset" />
> <excludesfile name="woproject/classes.exclude.patternset" />
> + <exclude if="javaClient" name="**/client/**/*.*"/>
> </classes>
>
> <wsresources dir=".">
>.. -66,6 +67,7 @@
> <resources dir=".">
> <includesfile name="woproject/resources.include.patternset" />
> <excludesfile name="woproject/resources.exclude.patternset" />
> + <exclude if="javaClient" name="**/client/**/*.*"/>
> </resources>
>
> <lib dir="Libraries">
>.. -74,6 +76,11 @@
> </woframework>
> </target>
>
> + <target name="javaclient" if="javaClient"
> depends="build.woframework">
> + <mkdir dir="${dest.dir}/${project.name}.framework/
> WebServerResources/Java" />
> + <jar basedir="${classes.dir}" excludes="**/server/**/*.*, **/
> server/**/" jarfile="${dest.dir}/${project.name}.framework/
> WebServerResources/Java/${project.name}.jar"/>
> + </target>
> +
> <target name="compile" depends="init.build">
> <taskdef name="wocompile"
> classname="org.objectstyle.woproject.ant.WOCompile" />
>
>
> Modified: trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/Wonder
> Application/build.xml
> ===================================================================
> --- trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/Wonder
> Application/build.xml 2009-04-15 17:47:32 UTC (rev 5721)
> +++ trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/Wonder
> Application/build.xml 2009-04-16 12:14:09 UTC (rev 5722)
>.. -77,10 +77,11 @@
> <target name="build.woapp" depends="compile">
> <taskdef name="woapplication"
> classname="org.objectstyle.woproject.ant.WOApplication"/>
>
> - <woapplication name="${build.app.name}" frameworksBaseURL="/
> WebObjects/${project.name}.woa/Frameworks" destDir="${dest.dir}"
> customInfoPListContent="${customInfoPListContent}" principalClass="$
> {principalClass}" webXML="${webXML}" webXML_CustomContent="$
> {webXML_CustomContent}"
> servletAdaptor="er.extensions.jspservlet.ERXServletAdaptor">
> + <woapplication name="${build.app.name}" frameworksBaseURL="/
> WebObjects/${build.app.name}.woa/Frameworks" destDir="${dest.dir}"
> customInfoPListContent="${customInfoPListContent}" principalClass="$
> {principalClass}" webXML="${webXML}" webXML_CustomContent="$
> {webXML_CustomContent}"
> servletAdaptor="er.extensions.jspservlet.ERXServletAdaptor">
> <classes dir="${classes.dir}">
> <includesfile name="woproject/classes.include.patternset" />
> <excludesfile name="woproject/classes.exclude.patternset" />
> + <exclude if="javaClient" name="**/client/**/*.*"/>
> </classes>
>
> <wsresources dir=".">
>.. -91,6 +92,7 @@
> <resources dir=".">
> <includesfile name="woproject/resources.include.patternset" />
> <excludesfile name="woproject/resources.exclude.patternset" />
> + <exclude if="javaClient" name="**/client/**/*.*"/>
> </resources>
>
> <frameworks root="ProjectLocal" embed="${embed.ProjectLocal}"
> eclipse="true" />
>.. -108,10 +110,7 @@
>
> <target name="javaclient" if="javaClient" depends="build.woapp">
> <mkdir dir="${dest.dir}/${build.app.name}.woa/Contents/
> WebServerResources/Java" />
> - <jar basedir="${classes.dir}" includes="**/client/**/*.class,**/
> common/**/*.class" jarfile="${dest.dir}/${build.app.name}.woa/
> Contents/WebServerResources/Java/${build.app.name}.jar"/>
> -
> - <!-- project user.d2wmodel file (D2JC only) -->
> - <copy file="user.d2wmodel" tofile="${dest.dir}/$
> {build.app.name}.woa/Contents/Resources/user.d2wmodel"/>
> + <jar basedir="${classes.dir}" excludes="**/server/**/*.*, **/
> server/**/" jarfile="${dest.dir}/${build.app.name}.woa/Contents/
> WebServerResources/Java/${build.app.name}.jar"/>
> </target>
>
> <target name="war" if="servletDeployment" depends="ssdd">
>
> Modified: trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/Wonder
> Framework/build.xml
> ===================================================================
> --- trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/Wonder
> Framework/build.xml 2009-04-15 17:47:32 UTC (rev 5721)
> +++ trunk/woproject/wolips/core/plugins/
> org.objectstyle.wolips.templateengine/ProjectTemplates/Wonder
> Framework/build.xml 2009-04-16 12:14:09 UTC (rev 5722)
>.. -1,7 +1,7 @@
> <project name="${WOLipsContext.getProjectName()}" default="build"
> basedir=".">
> - <target name="build"
> depends="init.build,build.woframework,package" />
> + <target name="build"
> depends="init.build,build.woframework,javaclient,package" />
>
> - <target name="install" depends="init.install,build.woframework" />
> + <target name="install"
> depends="init.install,build.woframework,javaclient" />
>
> <target name="clean" depends="init.properties">
> <delete dir="bin" />
>.. -56,6 +56,7 @@
> <classes dir="${classes.dir}">
> <includesfile name="woproject/classes.include.patternset" />
> <excludesfile name="woproject/classes.exclude.patternset" />
> + <exclude if="javaClient" name="**/client/**/*.*"/>
> </classes>
>
> <wsresources dir=".">
>.. -66,6 +67,7 @@
> <resources dir=".">
> <includesfile name="woproject/resources.include.patternset" />
> <excludesfile name="woproject/resources.exclude.patternset" />
> + <exclude if="javaClient" name="**/client/**/*.*"/>
> </resources>
>
> <lib dir="Libraries">
>.. -74,6 +76,11 @@
> </woframework>
> </target>
>
> + <target name="javaclient" if="javaClient"
> depends="build.woframework">
> + <mkdir dir="${dest.dir}/${project.name}.framework/
> WebServerResources/Java" />
> + <jar basedir="${classes.dir}" excludes="**/server/**/*.*, **/
> server/**/" jarfile="${dest.dir}/${project.name}.framework/
> WebServerResources/Java/${project.name}.jar"/>
> + </target>
> +
> <target name="compile" depends="init.build">
> <taskdef name="wocompile"
> classname="org.objectstyle.woproject.ant.WOCompile" />
>
>
>
>
This archive was generated by hypermail 2.0.0 : Thu Apr 16 2009 - 08:23:57 EDT