Author: thomas.diesler(a)jboss.com Date: 2008-05-02 08:26:49 -0400 (Fri, 02 May 2008) New Revision: 6855 Modified: stack/native/trunk/modules/jaxws-ext/pom.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml Log: Fix jdk1.6 compile Modified: stack/native/trunk/modules/jaxws-ext/pom.xml =================================================================== --- stack/native/trunk/modules/jaxws-ext/pom.xml 2008-05-02 12:26:41 UTC (rev 6854) +++ stack/native/trunk/modules/jaxws-ext/pom.xml 2008-05-02 12:26:49 UTC (rev 6855) @@ -22,25 +22,4 @@ </dependency> </dependencies> - <!-- Profiles --> - <profiles> - <profile> - <id>jdk16</id> - <activation> - <jdk>1.6</jdk> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerVersion>1.5</compilerVersion> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-02 12:26:41 UTC (rev 6854) +++ stack/native/trunk/pom.xml 2008-05-02 12:26:49 UTC (rev 6855) @@ -450,7 +450,30 @@ <!-- Profiles --> <profiles> + <!-- + Name: jdk16 + Descr: Compile with jdk1.6 + --> + <profile> + <id>jdk16</id> + <activation> + <jdk>1.6</jdk> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerVersion>1.5</compilerVersion> + <fork>true</fork> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: bindist Descr: Build the binary distribution --> Modified: stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-02 12:26:41 UTC (rev 6854) +++ stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-02 12:26:49 UTC (rev 6855) @@ -380,7 +380,7 @@ </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/> </target> <!-- ================================================================== -->