Author: thomas.diesler(a)jboss.com Date: 2007-03-03 10:18:14 -0500 (Sat, 03 Mar 2007) New Revision: 2511 Added: trunk/integration-jboss40/src/java/ trunk/integration-jboss40/src/java/org/ trunk/integration-jboss40/src/resources/ trunk/integration-jboss40/src/resources/jbossws.beans/ trunk/integration-jboss40/src/resources/jbossws.sar/ Removed: trunk/integration-jboss40/src/java/org/ trunk/integration-jboss40/src/main/ trunk/integration-jboss40/src/resources/jbossws.beans/ trunk/integration-jboss40/src/resources/jbossws.sar/ Modified: trunk/integration-jboss40/.classpath trunk/integration-jboss40/build.xml Log: Remove redundant directory 'main' Modified: trunk/integration-jboss40/.classpath =================================================================== --- trunk/integration-jboss40/.classpath 2007-03-03 11:53:17 UTC (rev 2510) +++ trunk/integration-jboss40/.classpath 2007-03-03 15:18:14 UTC (rev 2511) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/> Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-03-03 11:53:17 UTC (rev 2510) +++ trunk/integration-jboss40/build.xml 2007-03-03 15:18:14 UTC (rev 2511) @@ -19,7 +19,7 @@ <import file="${basedir}/../integration-jboss42/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> - <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src/main"/> + <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src"/> <property name="jboss40.java.dir" value="${jboss40.src.dir}/java"/> <property name="jboss40.resources.dir" value="${jboss40.src.dir}/resources"/> <property name="jboss40.output.dir" value="${integration.jboss40.dir}/output"/> @@ -27,7 +27,7 @@ <property name="jboss40.output.classes14.dir" value="${jboss40.output.dir}/classes14"/> <property name="jboss40.output.lib.dir" value="${jboss40.output.dir}/lib"/> - <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/> + <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src"/> <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> <property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/> <property name="jboss42.output.dir" value="${integration.jboss42.dir}/output"/> @@ -207,7 +207,7 @@ <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> </fileset> - <fileset dir="${core.dir}/src/main/resources"> + <fileset dir="${core.dir}/src/resources"> <include name="schema/**"/> <include name="dtd/**"/> </fileset> Copied: trunk/integration-jboss40/src/java (from rev 2509, trunk/integration-jboss40/src/main/java) Copied: trunk/integration-jboss40/src/java/org (from rev 2510, trunk/integration-jboss40/src/main/java/org) Copied: trunk/integration-jboss40/src/resources (from rev 2509, trunk/integration-jboss40/src/main/resources) Copied: trunk/integration-jboss40/src/resources/jbossws.beans (from rev 2510, trunk/integration-jboss40/src/main/resources/jbossws.beans) Copied: trunk/integration-jboss40/src/resources/jbossws.sar (from rev 2510, trunk/integration-jboss40/src/main/resources/jbossws.sar)