Author: thomas.diesler(a)jboss.com Date: 2006-12-21 08:46:32 -0500 (Thu, 21 Dec 2006) New Revision: 1687 Added: branches/tdiesler/trunk/build/.classpath branches/tdiesler/trunk/build/.project Modified: branches/tdiesler/trunk/build/ branches/tdiesler/trunk/build/ant.properties.example branches/tdiesler/trunk/build/build.xml branches/tdiesler/trunk/build/import/build-thirdparty.xml Log: partial commit Property changes on: branches/tdiesler/trunk/build ___________________________________________________________________ Name: svn:ignore + output thirdparty ant.properties version.properties.md5 Added: branches/tdiesler/trunk/build/.classpath =================================================================== --- branches/tdiesler/trunk/build/.classpath 2006-12-21 13:31:07 UTC (rev 1686) +++ branches/tdiesler/trunk/build/.classpath 2006-12-21 13:46:32 UTC (rev 1687) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path=""/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path=""/> +</classpath> Added: branches/tdiesler/trunk/build/.project =================================================================== --- branches/tdiesler/trunk/build/.project 2006-12-21 13:31:07 UTC (rev 1686) +++ branches/tdiesler/trunk/build/.project 2006-12-21 13:46:32 UTC (rev 1687) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>build</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Modified: branches/tdiesler/trunk/build/ant.properties.example =================================================================== --- branches/tdiesler/trunk/build/ant.properties.example 2006-12-21 13:31:07 UTC (rev 1686) +++ branches/tdiesler/trunk/build/ant.properties.example 2006-12-21 13:46:32 UTC (rev 1687) @@ -4,7 +4,7 @@ # Required JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1 +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 # The JBoss server instance jboss.server.instance=default Modified: branches/tdiesler/trunk/build/build.xml =================================================================== --- branches/tdiesler/trunk/build/build.xml 2006-12-21 13:31:07 UTC (rev 1686) +++ branches/tdiesler/trunk/build/build.xml 2006-12-21 13:46:32 UTC (rev 1687) @@ -13,9 +13,9 @@ <project default="main" name="JBossWS"> - <import file="${basedir}/src/ant/build-thirdparty.xml"/> - <import file="${basedir}/src/ant/build-samples.xml"/> - <import file="${basedir}/src/ant/build-release.xml"/> + <import file="${basedir}/import/build-thirdparty.xml"/> + <import file="${basedir}/import/build-samples.xml"/> + <import file="${basedir}/import/build-release.xml"/> <!-- ================================================================== --> <!-- Setup --> @@ -36,7 +36,7 @@ <property name="build.src.dist" value="${build.dir}/src-dist"/> <property name="build.api" value="${build.dir}/api"/> <property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/> - <property name="src.dir" value="${basedir}/src/main"/> + <property name="src.dir" value="${basedir}/../jbossws/src/main"/> <property name="src.etc.dir" value="${src.dir}/etc"/> <property name="src.java.dir" value="${src.dir}/java"/> <property name="src.resources.dir" value="${src.dir}/resources"/> @@ -46,6 +46,10 @@ <property name="test.etc.dir" value="${test.dir}/etc"/> <property name="test.java.dir" value="${test.dir}/java"/> <property name="test.resources.dir" value="${test.dir}/resources"/> + + <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/> + <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/> + <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/> <property name="thirdparty.dir" value="${basedir}/thirdparty"/> @@ -162,7 +166,7 @@ <target name="compile-integration" depends="compile-jboss50-integration,compile-jboss42-integration,compile-tomcat-integration"/> <target name="compile-jboss50-integration" depends="compile-core"> <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac srcdir="${integration.jboss50.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss50/**"/> <classpath path="${build.classes14.dir}"/> @@ -172,7 +176,7 @@ </target> <target name="compile-jboss42-integration" depends="compile-core"> <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac srcdir="${integration.jboss42.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/**"/> <classpath path="${build.classes14.dir}"/> @@ -182,7 +186,7 @@ </target> <target name="compile-tomcat-integration" depends="compile-core"> <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac srcdir="${integration.tomcat.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/tomcat/**"/> <classpath path="${build.classes14.dir}"/> Modified: branches/tdiesler/trunk/build/import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/build/import/build-thirdparty.xml 2006-12-21 13:31:07 UTC (rev 1686) +++ branches/tdiesler/trunk/build/import/build-thirdparty.xml 2006-12-21 13:46:32 UTC (rev 1687) @@ -128,6 +128,10 @@ <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/> </path> + <!-- The classpath for the jboss42 integration --> + <path id="tomcat.integration.classpath"> + </path> + </target> </project>