Author: alessio.soldano(a)jboss.com Date: 2013-02-13 10:22:51 -0500 (Wed, 13 Feb 2013) New Revision: 17311 Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestProvidedScopeHelper.java projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsConsumeHelper.java Log: [JBWS-3295] changing default output dir for wsconsume mojo to "${project.build.directory}/generated-sources/wsconsume" to be in synch with Maven conventions Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2013-02-13 14:45:18 UTC (rev 17310) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2013-02-13 15:22:51 UTC (rev 17311) @@ -72,7 +72,7 @@ * Sets the source directory. This directory will contain any generated Java source. * If the directory does not exist, it will be created. * - * @parameter default-value="${project.build.directory}/wsconsume/java" + * @parameter default-value="${project.build.directory}/generated-sources/wsconsume" */ protected File sourceDirectory; Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java 2013-02-13 14:45:18 UTC (rev 17310) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java 2013-02-13 15:22:51 UTC (rev 17311) @@ -46,7 +46,7 @@ public boolean verify(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception { //fist execution checks - File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "bar" + File.separator + "EndpointService.java"); if (!endpointServiceFile.exists()) { @@ -65,7 +65,7 @@ } //second execution checks - File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "test" + File.separator + "bar" + File.separator + "EndpointService.java"); if (!endpointServiceFile2.exists()) { @@ -134,7 +134,7 @@ public void setup(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception { //first execution - File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "bar" + File.separator + "EndpointService.java"); if (endpointServiceFile.exists()) { @@ -142,7 +142,7 @@ } //second execution - File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "test" + File.separator + "bar" + File.separator + "EndpointService.java"); if (endpointServiceFile2.exists()) { Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestProvidedScopeHelper.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestProvidedScopeHelper.java 2013-02-13 14:45:18 UTC (rev 17310) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestProvidedScopeHelper.java 2013-02-13 15:22:51 UTC (rev 17311) @@ -42,7 +42,7 @@ public boolean verify(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception { //fist execution checks - File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "bar" + File.separator + "EndpointService.java"); if (!endpointServiceFile.exists()) { @@ -56,7 +56,7 @@ } //second execution checks - File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "test" + File.separator + "bar" + File.separator + "EndpointService.java"); if (!endpointServiceFile2.exists()) { @@ -120,7 +120,7 @@ public void setup(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception { //first execution - File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "bar" + File.separator + "EndpointService.java"); if (endpointServiceFile.exists()) { @@ -128,7 +128,7 @@ } //second execution - File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "test" + File.separator + "bar" + File.separator + "EndpointService.java"); if (endpointServiceFile2.exists()) { Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsConsumeHelper.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsConsumeHelper.java 2013-02-13 14:45:18 UTC (rev 17310) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsConsumeHelper.java 2013-02-13 15:22:51 UTC (rev 17311) @@ -40,7 +40,7 @@ public boolean verify(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception { //fist execution checks - File endpointFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "bar" + File.separator + "Endpoint.java"); if (!endpointFile.exists()) { @@ -87,7 +87,7 @@ @Override public void setup(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception { - File endpointFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File endpointFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated-sources" + File.separator + "wsconsume" + File.separator + "foo" + File.separator + "bar" + File.separator + "Endpoint.java"); if (endpointFile.exists()) {