Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2.eclipse.codegen.plugin</artifactId> <name>Apache Axis2 - tool - Eclipse Codegen Plugin</name> @@ -91,9 +91,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>axis2-jibx</artifactId> + <artifactId>axis2-jibx-codegen</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> </dependencies> <build> <resources> @@ -186,11 +190,23 @@ <manifestLocation>META-INF</manifestLocation> <instructions> <!-- Embed all dependencies, except those which are provided by the Eclipse runtime --> - <Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|wstx-asl|geronimo-activation_1.1_spec|geronimo-javamail_1.4_spec|geronimo-stax-api_1.0_spec|ant*</Embed-Dependency> + <Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|woodstox-core-asl|ant*</Embed-Dependency> <Embed-Directory>lib</Embed-Directory> <Embed-Transitive>true</Embed-Transitive> <!-- Exclude imports that are actually not used --> - <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.apache.xmlbeans.*,!org.xmlpull.*,!org.apache.commons.io*,!org.relaxng.datatype,*</Import-Package> + <Import-Package> + !org.dom4j*, + !nu.xom, + !org.jdom*, + !javax.portlet, + !com.sun.*, + !org.jvnet.ws.databinding, + !org.apache.xmlbeans.*, + !org.xmlpull.*, + !org.apache.commons.io*, + !org.relaxng.datatype, + * + </Import-Package> <Export-Package /> <Bundle-Name>Axis2 Codegen Wizard Plug-in</Bundle-Name> <Bundle-Activator>org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin</Bundle-Activator> @@ -201,8 +217,8 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>gmaven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <executions> <execution> <id>extract-bundle-symbolicname-and-version</id> @@ -211,13 +227,15 @@ <goal>execute</goal> </goals> <configuration> - <source> - import java.util.jar.Manifest - - Manifest manifest = new Manifest(new FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF"))) - project.properties["bundle-symbolic-name"] = manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*") - project.properties["bundle-version"] = manifest.mainAttributes.getValue("Bundle-Version") - </source> + <scripts> + <script> + import java.util.jar.Manifest + + Manifest manifest = new Manifest(new FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF"))) + project.properties["bundle-symbolic-name"] = manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*") + project.properties["bundle-version"] = manifest.mainAttributes.getValue("Bundle-Version") + </script> + </scripts> </configuration> </execution> </executions> @@ -254,10 +272,15 @@ <build> <plugins> <plugin> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <createChecksum>true</createChecksum> - </configuration> + <groupId>net.nicoulaj.maven.plugins</groupId> + <artifactId>checksum-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>artifacts</goal> + </goals> + </execution> + </executions> </plugin> </plugins> </build>
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Sun Dec 17 22:34:08 2017 @@ -175,7 +175,7 @@ public class WSDL2JavaGenerator { String baseUri; if ("file".equals(url.getProtocol())){ - baseUri = new File(url.getFile()).getParentFile().toURL().toExternalForm(); + baseUri = new File(url.getFile()).getParentFile().toURI().toURL().toExternalForm(); }else{ baseUri = url.toExternalForm().substring(0, url.toExternalForm().lastIndexOf("/") Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Sun Dec 17 22:34:08 2017 @@ -39,6 +39,7 @@ import org.apache.axis2.tool.core.JarFil import org.apache.axis2.tool.core.SrcCompiler; import org.apache.axis2.wsdl.codegen.CodeGenConfiguration; import org.apache.axis2.wsdl.codegen.CodeGenerationEngine; +import org.apache.axis2.wsdl.codegen.CodegenConfigLoader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.Log4JLogger; @@ -267,7 +268,8 @@ public class CodeGenWizard extends Wizar //Fix for the CodeGenConfiguration Contructor Change //CodeGenConfiguration codegenConfig = new CodeGenConfiguration(service, optionsMap); - CodeGenConfiguration codegenConfig = new CodeGenConfiguration(optionsMap); + CodeGenConfiguration codegenConfig = new CodeGenConfiguration(); + CodegenConfigLoader.loadConfig(codegenConfig, optionsMap); codegenConfig.addAxisService(service); //set the wsdl definision for codegen config for skeleton generarion. Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java Sun Dec 17 22:34:08 2017 @@ -56,7 +56,7 @@ public class ClassFileReader { if (classPathEntry.startsWith("http://";)) { urls[i] = new URL(classPathEntry); } else { - urls[i] = new File(classPathEntry).toURL(); + urls[i] = new File(classPathEntry).toURI().toURL(); } } } catch (MalformedURLException e) { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java Sun Dec 17 22:34:08 2017 @@ -20,12 +20,12 @@ package org.apache.axis2.tool.codegen.eclipse.util; import org.apache.axis2.util.URLProcessor; +import org.apache.axis2.wsdl.WSDLUtil; import javax.wsdl.Definition; import javax.wsdl.Port; import javax.wsdl.Service; import javax.wsdl.WSDLException; -import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; import java.util.ArrayList; @@ -49,7 +49,7 @@ public class WSDLPropertyReader { private Definition wsdlDefinition = null; public void readWSDL(String filepath) throws WSDLException { - WSDLReader reader = WSDLFactory.newInstance().newWSDLReader(); + WSDLReader reader = WSDLUtil.newWSDLReaderWithPopulatedExtensionRegistry(); wsdlDefinition = reader.readWSDL(filepath); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java Sun Dec 17 22:34:08 2017 @@ -46,7 +46,7 @@ public class ClassFileHandler { if (!fileEndpoint.exists()){ throw new IOException("the location is invalid"); } - final URL[] urlList = {fileEndpoint.toURL()}; + final URL[] urlList = {fileEndpoint.toURI().toURL()}; URLClassLoader clazzLoader = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() { public URLClassLoader run() { return new URLClassLoader(urlList); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2.eclipse.service.plugin</artifactId> <name>Apache Axis2 - tool - Eclipse service Plugin</name> @@ -163,11 +163,21 @@ <manifestLocation>META-INF</manifestLocation> <instructions> <!-- Embed all dependencies, except those which are provided by the Eclipse runtime --> - <Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|wstx-asl|geronimo-activation_1.1_spec|geronimo-javamail_1.4_spec|geronimo-stax-api_1.0_spec|ant*</Embed-Dependency> + <Embed-Dependency>*;scope=compile|runtime;groupId=!org.eclipse.*;artifactId=!commons-logging|woodstox-core-asl|ant*</Embed-Dependency> <Embed-Directory>lib</Embed-Directory> <Embed-Transitive>true</Embed-Transitive> <!-- Exclude imports that are actually not used --> - <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.apache.commons.io*,!org.relaxng.datatype,*</Import-Package> + <Import-Package> + !org.dom4j*, + !nu.xom, + !org.jdom*, + !javax.portlet, + !com.sun.*, + !org.jvnet.ws.databinding, + !org.apache.commons.io*, + !org.relaxng.datatype, + * + </Import-Package> <Export-Package /> <Bundle-Name>Axis2 Service Maker</Bundle-Name> <Bundle-Activator>org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver</Bundle-Activator> @@ -178,8 +188,8 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>gmaven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <executions> <execution> <id>extract-bundle-symbolicname-and-version</id> @@ -188,13 +198,15 @@ <goal>execute</goal> </goals> <configuration> - <source> - import java.util.jar.Manifest - - Manifest manifest = new Manifest(new FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF"))) - project.properties["bundle-symbolic-name"] = manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*") - project.properties["bundle-version"] = manifest.mainAttributes.getValue("Bundle-Version") - </source> + <scripts> + <script> + import java.util.jar.Manifest + + Manifest manifest = new Manifest(new FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF"))) + project.properties["bundle-symbolic-name"] = manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*") + project.properties["bundle-version"] = manifest.mainAttributes.getValue("Bundle-Version") + </script> + </scripts> </configuration> </execution> </executions> @@ -231,10 +243,15 @@ <build> <plugins> <plugin> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <createChecksum>true</createChecksum> - </configuration> + <groupId>net.nicoulaj.maven.plugins</groupId> + <artifactId>checksum-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>artifacts</goal> + </goals> + </execution> + </executions> </plugin> </plugins> </build> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java Sun Dec 17 22:34:08 2017 @@ -46,7 +46,7 @@ public class ClassFileHandler { if (!fileEndpoint.exists()){ throw new IOException("the location is invalid"); } - final URL[] urlList = {fileEndpoint.toURL()}; + final URL[] urlList = {fileEndpoint.toURI().toURL()}; URLClassLoader clazzLoader = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() { public URLClassLoader run() { return new URLClassLoader(urlList); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java Sun Dec 17 22:34:08 2017 @@ -222,7 +222,7 @@ public class ServiceXMLGenerationPage ex //get a URL from the class file location try { String classFileLocation = getClassFileLocation(); - URL classFileURL = new File(classFileLocation).toURL(); + URL classFileURL = new File(classFileLocation).toURI().toURL(); ArrayList listofURLs = new ArrayList(); listofURLs.add(classFileURL); @@ -232,7 +232,7 @@ public class ServiceXMLGenerationPage ex if (libFileList!=null){ int count = libFileList.length; for (int i=0;i<count;i++){ - listofURLs.add(new File(libFileList[i]).toURL()); + listofURLs.add(new File(libFileList[i]).toURI().toURL()); } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java Sun Dec 17 22:34:08 2017 @@ -197,7 +197,7 @@ public class WSDLOptionsPage extends Abs //get a URL from the class file location try { String classFileLocation = getClassFileLocation(); - URL classFileURL = new File(classFileLocation).toURL(); + URL classFileURL = new File(classFileLocation).toURI().toURL(); ClassLoader loader = new URLClassLoader(new URL[] { classFileURL }); Class clazz = loader.loadClass(classNameTextBox.getText()); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml Sun Dec 17 22:34:08 2017 @@ -18,6 +18,7 @@ --> <assembly> + <id>plugin</id> <includeBaseDirectory>false</includeBaseDirectory> <formats> <format>zip</format> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-idea-plugin</artifactId> <name>Apache Axis2 - tool - Intellij IDEA Plugin</name> @@ -45,7 +45,7 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-core</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -85,12 +85,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-activation_1.1_spec</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>com.intellij</groupId> @@ -118,7 +114,7 @@ </dependency> <dependency> <groupId>org.apache.woden</groupId> - <artifactId>woden-impl-commons</artifactId> + <artifactId>woden-core</artifactId> </dependency> <dependency> <groupId>log4j</groupId> @@ -152,14 +148,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -181,6 +169,7 @@ <descriptors> <descriptor>${pom.basedir}/idea-plugin-aseembly.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> @@ -199,10 +188,15 @@ <build> <plugins> <plugin> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <createChecksum>true</createChecksum> - </configuration> + <groupId>net.nicoulaj.maven.plugins</groupId> + <artifactId>checksum-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>artifacts</goal> + </goals> + </execution> + </executions> </plugin> </plugins> </build> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java Sun Dec 17 22:34:08 2017 @@ -43,7 +43,7 @@ public class ClassLoadingTestBean { if (classPathEntry.startsWith("http://";)) { urls[i] = new URL(classPathEntry); } else { - urls[i] = new File(classPathEntry).toURL(); + urls[i] = new File(classPathEntry).toURI().toURL(); } } } catch (MalformedURLException e) { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java Sun Dec 17 22:34:08 2017 @@ -29,14 +29,15 @@ import org.apache.axis2.description.WSDL import org.apache.axis2.util.CommandLineOption; import org.apache.axis2.util.CommandLineOptionConstants; import org.apache.axis2.util.URLProcessor; +import org.apache.axis2.wsdl.WSDLUtil; import org.apache.axis2.wsdl.codegen.CodeGenConfiguration; import org.apache.axis2.wsdl.codegen.CodeGenerationEngine; +import org.apache.axis2.wsdl.codegen.CodegenConfigLoader; import javax.wsdl.Definition; import javax.wsdl.Port; import javax.wsdl.Service; import javax.wsdl.WSDLException; -import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; import java.io.File; @@ -259,7 +260,7 @@ public class CodegenBean { String baseUri; if ("file".equals(url.getProtocol())) { - baseUri = new File(url.getFile()).getParentFile().toURL().toExternalForm(); + baseUri = new File(url.getFile()).getParentFile().toURI().toURL().toExternalForm(); } else { baseUri = url.toExternalForm().substring(0, url.toExternalForm().lastIndexOf("/") @@ -383,7 +384,8 @@ public class CodegenBean { if (!"xmlbeans".equals(getDatabindingName())) { Thread.currentThread().setContextClassLoader(Class.class.getClassLoader()); } - CodeGenConfiguration codegenConfig = new CodeGenConfiguration(fillOptionMap()); + CodeGenConfiguration codegenConfig = new CodeGenConfiguration(); + CodegenConfigLoader.loadConfig(codegenConfig, fillOptionMap()); codegenConfig.addAxisService(getAxisService(WSDLFileName)); codegenConfig.setWsdlDefinition(wsdlDefinition); //set the baseURI @@ -391,7 +393,8 @@ public class CodegenBean { new CodeGenerationEngine(codegenConfig).generate(); } catch (Throwable e) { try { - CodeGenConfiguration codegenConfig = new CodeGenConfiguration(fillOptionMap()); + CodeGenConfiguration codegenConfig = new CodeGenConfiguration(); + CodegenConfigLoader.loadConfig(codegenConfig, fillOptionMap()); codegenConfig.addAxisService(getAxisService(WSDLFileName)); codegenConfig.setWsdlDefinition(wsdlDefinition); //set the baseURI @@ -412,7 +415,7 @@ public class CodegenBean { public void readWSDL() throws WSDLException { - WSDLReader reader = WSDLFactory.newInstance().newWSDLReader(); + WSDLReader reader = WSDLUtil.newWSDLReaderWithPopulatedExtensionRegistry(); wsdlDefinition = reader.readWSDL(WSDLFileName) ; if (wsdlDefinition != null) { wsdlDefinition.setDocumentBaseURI(WSDLFileName); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java Sun Dec 17 22:34:08 2017 @@ -191,7 +191,7 @@ public class ServiceXMLGenerationPage ex //get a URL from the class file location try { String classFileLocation = archiveBean.getClassLoc().getPath(); - URL classFileURL = new File(classFileLocation).toURL(); + URL classFileURL = new File(classFileLocation).toURI().toURL(); ArrayList listofURLs = new ArrayList(); listofURLs.add(classFileURL); @@ -206,7 +206,7 @@ public class ServiceXMLGenerationPage ex if (libFileList!=null){ int count = libFileList.length; for (int i=0;i<count;i++){ - listofURLs.add(new File(libFileList[i]).toURL()); + listofURLs.add(new File(libFileList[i]).toURI().toURL()); } } txtServiceName.setText("MyService" + count); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/WSDLFileSelectionPage.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/WSDLFileSelectionPage.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/WSDLFileSelectionPage.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/WSDLFileSelectionPage.java Sun Dec 17 22:34:08 2017 @@ -23,12 +23,12 @@ import org.apache.axis2.tools.component. import org.apache.axis2.tools.component.WizardPanel; import org.apache.axis2.tools.idea.WSDLFileFilter; import org.apache.axis2.tools.wizardframe.CodegenFrame; +import org.apache.axis2.wsdl.WSDLUtil; import org.apache.ideaplugin.bean.ArchiveBean; import javax.swing.*; import javax.swing.border.EmptyBorder; import javax.wsdl.WSDLException; -import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; import java.awt.*; import java.awt.event.ActionEvent; @@ -205,7 +205,7 @@ public class WSDLFileSelectionPage exten private void checkWSDLFile(){ if (txtWSDL.getText().equals("") ) { try{ - WSDLReader reader = WSDLFactory.newInstance().newWSDLReader(); + WSDLReader reader = WSDLUtil.newWSDLReaderWithPopulatedExtensionRegistry(); reader.readWSDL(txtWSDL.getText().trim()) ; }catch(WSDLException e1) { txtWSDL.setText(""); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-java2wsdl-maven-plugin</artifactId> <name>Apache Axis2 - tool - Java2WSDL Maven Plugin</name> @@ -39,6 +39,12 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin</developerConnection> <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin</url> </scm> + <distributionManagement> + <site> + <id>site</id> + <url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/core-staging/tools/maven-plugins/axis2-java2wsdl-maven-plugin</url> + </site> + </distributionManagement> <build> <sourceDirectory>src/main/java</sourceDirectory> <testSourceDirectory>src/test/java</testSourceDirectory> @@ -74,6 +80,21 @@ <goalPrefix>axis2</goalPrefix> </configuration> </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>install</goal> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + <configuration> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> @@ -81,11 +102,23 @@ <groupId>org.apache.axis2</groupId> <artifactId>axis2-java2wsdl</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-adb</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -93,12 +126,24 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> + <!-- Maven supports SLF4J --> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> </dependency> </dependencies> + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reportSets> + <reportSet> + <reports /> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> </project> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java Sun Dec 17 22:34:08 2017 @@ -229,15 +229,15 @@ public class Java2WSDLMojo extends Abstr Java2WSDLConstants.OUTPUT_FILENAME_OPTION, outputFile.getName() ); - Artifact artifact = project.getArtifact(); - Set artifacts = project.getArtifacts(); - String[] artifactFileNames = new String[artifacts.size() + (artifact == null ? 0 : 1)]; + Artifact projectArtifact = project.getArtifact(); + Set<Artifact> artifacts = project.getArtifacts(); + String[] artifactFileNames = new String[artifacts.size() + (projectArtifact == null ? 0 : 1)]; int j = 0; - for(Iterator i = artifacts.iterator(); i.hasNext(); j++) { - artifactFileNames[j] = ((Artifact) i.next()).getFile().getAbsolutePath(); + for (Artifact artifact : artifacts) { + artifactFileNames[j++] = artifact.getFile().getAbsolutePath(); } - if(artifact != null) { - File file = artifact.getFile(); + if(projectArtifact != null) { + File file = projectArtifact.getFile(); if(file != null){ artifactFileNames[j] = file.getAbsolutePath(); } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,9 +23,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-mar-maven-plugin</artifactId> <packaging>maven-plugin</packaging> @@ -37,33 +37,22 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven.version}</version> + <artifactId>maven-core</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>${maven.artifact.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-archiver</artifactId> - <version>${maven.archiver.version}</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>${plexus.utils.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - <scope>test</scope> </dependency> </dependencies> <url>http://axis.apache.org/axis2/java/core/</url> @@ -72,6 +61,12 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin</developerConnection> <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin</url> </scm> + <distributionManagement> + <site> + <id>site</id> + <url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/core-staging/tools/maven-plugins/axis2-mar-maven-plugin</url> + </site> + </distributionManagement> <build> <plugins> <plugin> @@ -110,4 +105,16 @@ <email>[email protected]</email> </contributor> </contributors> + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reportSets> + <reportSet> + <reports /> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> </project> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java Sun Dec 17 22:34:08 2017 @@ -30,7 +30,6 @@ import org.codehaus.plexus.util.FileUtil import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -136,13 +135,12 @@ public abstract class AbstractMarMojo copyMetaInfFile( moduleXmlFile, moduleFileTarget, existsBeforeCopyingClasses, "module.xml file" ); if(includeDependencies){ - Set artifacts = project.getArtifacts(); + Set<Artifact> artifacts = project.getArtifacts(); - List duplicates = findDuplicates( artifacts ); + List<String> duplicates = findDuplicates( artifacts ); - for ( Iterator iter = artifacts.iterator(); iter.hasNext(); ) + for (Artifact artifact : artifacts) { - Artifact artifact = (Artifact) iter.next(); String targetFileName = getDefaultFinalName( artifact ); getLog().debug( "Processing: " + targetFileName ); @@ -179,13 +177,12 @@ public abstract class AbstractMarMojo * @param artifacts set of artifacts * @return List of duplicated artifacts */ - private List findDuplicates( Set artifacts ) + private List<String> findDuplicates( Set<Artifact> artifacts ) { - List duplicates = new ArrayList(); - List identifiers = new ArrayList(); - for ( Iterator iter = artifacts.iterator(); iter.hasNext(); ) + List<String> duplicates = new ArrayList<String>(); + List<String> identifiers = new ArrayList<String>(); + for (Artifact artifact : artifacts) { - Artifact artifact = (Artifact) iter.next(); String candidate = getDefaultFinalName( artifact ); if ( identifiers.contains( candidate ) ) { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java Sun Dec 17 22:34:08 2017 @@ -23,6 +23,7 @@ import org.apache.maven.archiver.MavenAr import org.apache.maven.archiver.MavenArchiver; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DependencyResolutionRequiredException; +import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProjectHelper; import org.codehaus.plexus.archiver.ArchiverException; @@ -42,6 +43,15 @@ import java.io.IOException; public class MarMojo extends AbstractMarMojo { /** + * The Maven Session + * + * @required + * @readonly + * @parameter expression="${session}" + */ + private MavenSession session; + + /** * The directory for the generated mar. * * @parameter expression="${project.build.directory}" @@ -138,7 +148,7 @@ public class MarMojo extends AbstractMar jarArchiver.addDirectory( marDirectory ); // create archive - archiver.createArchive( project, archive ); + archiver.createArchive(session, project, archive); if ( classifier != null ) { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/pom.xml Sun Dec 17 22:34:08 2017 @@ -21,15 +21,16 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-repo-maven-plugin</artifactId> <packaging>maven-plugin</packaging> - <name>Apache Axis2 - tool - Repository Maven Plugin</name> + <name>axis2-repo-maven-plugin</name> <description> - A Maven 2 plugin for creating Axis 2 repositories from project dependencies + axis2-repo-maven-plugin is a Maven plugin that creates Axis2 repositories from project dependencies. + It supports both AAR and MAR files. </description> <dependencies> <dependency> @@ -38,20 +39,60 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-archiver</artifactId> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-common-artifact-filters</artifactId> - <version>1.2</version> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-impl</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>addressing</artifactId> + <version>${project.version}</version> + <type>mar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ping</artifactId> + <version>${project.version}</version> + <type>mar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>mex</artifactId> + <version>${project.version}</version> + <type>mar</type> + <scope>test</scope> </dependency> </dependencies> - <url>http://axis.apache.org/axis2/java/core/</url> + <url>http://axis.apache.org/axis2/java/core/tools/maven-plugins/axis2-repo-maven-plugin/</url> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin</developerConnection> <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin</url> </scm> + <distributionManagement> + <site> + <id>site</id> + <url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/core-staging/tools/maven-plugins/axis2-repo-maven-plugin</url> + </site> + </distributionManagement> <build> <plugins> <plugin> @@ -75,14 +116,38 @@ <goalPrefix>axis2</goalPrefix> </configuration> </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>install</goal> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + <configuration> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + </configuration> + </plugin> </plugins> </build> <reporting> <plugins> <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + <report>index</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>2.6</version> </plugin> </plugins> </reporting> Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java Sun Dec 17 22:34:08 2017 @@ -20,7 +20,13 @@ package org.apache.axis2.maven2.repo; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -29,15 +35,26 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +import org.apache.axiom.om.OMDocument; +import org.apache.axiom.om.OMElement; +import org.apache.axiom.om.OMNode; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException; import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts; import org.apache.maven.shared.artifact.filter.collection.ScopeFilter; import org.apache.maven.shared.artifact.filter.collection.TypeFilter; +import org.codehaus.plexus.archiver.ArchiverException; +import org.codehaus.plexus.archiver.jar.JarArchiver; +import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; @@ -73,6 +90,13 @@ public abstract class AbstractCreateRepo private String modulesDirectory; /** + * The directory (relative to the repository root) where JAX-WS service JARs will be deployed. + * + * @parameter default-value="servicejars" + */ + private String jaxwsServicesDirectory; + + /** * The <tt>axis2.xml</tt> file to be copied into the repository. * * @parameter @@ -80,8 +104,15 @@ public abstract class AbstractCreateRepo private File axis2xml; /** + * If present, an <tt>axis2.xml</tt> file will be generated (Experimental). + * + * @parameter + */ + private GeneratedAxis2Xml generatedAxis2xml; + + /** * The directory (relative to the repository root) where the <tt>axis2.xml</tt> file will be - * copied. If this parameter is not set, then the file will be copied into the repository + * written. If this parameter is not set, then the file will be written into the repository * root. * * @parameter @@ -153,11 +184,50 @@ public abstract class AbstractCreateRepo */ private String services; + /** + * A list of JAX-WS service JARs to be generated (by packaging class files from the current + * project). + * + * @parameter + */ + private JAXWSService[] jaxwsServices; + protected abstract String getScope(); + protected abstract File getInputDirectory(); + protected abstract File getOutputDirectory(); + + protected abstract File[] getClassDirectories(); + private void addMessageHandlers(OMElement root, MessageHandler[] handlers, String localName) { + OMElement parent = root.getFirstChildWithName(new QName(localName + "s")); + for (MessageHandler handler : handlers) { + OMElement element = parent.getOMFactory().createOMElement(localName, null, parent); + element.addAttribute("contentType", handler.getContentType(), null); + element.addAttribute("class", handler.getClassName(), null); + } + } + public void execute() throws MojoExecutionException, MojoFailureException { + Log log = getLog(); + File inputDirectory = getInputDirectory(); + File outputDirectory = getOutputDirectory(); + if (inputDirectory.exists()) { + log.info("Copying files from " + inputDirectory); + DirectoryScanner ds = new DirectoryScanner(); + ds.setBasedir(inputDirectory); + ds.scan(); + for (String relativePath : ds.getIncludedFiles()) { + try { + FileUtils.copyFile( + new File(inputDirectory, relativePath), + new File(outputDirectory, relativePath)); + } catch (IOException ex) { + throw new MojoExecutionException("Failed to copy " + relativePath, ex); + } + } + } Set<Artifact> artifacts = new HashSet<Artifact>(); if (useDependencies) { artifacts.addAll(projectArtifacts); @@ -168,7 +238,6 @@ public abstract class AbstractCreateRepo artifacts.addAll(project.getAttachedArtifacts()); } } - File outputDirectory = getOutputDirectory(); if (includeModules || includeServices) { FilterArtifacts filter = new FilterArtifacts(); filter.addFilter(new ScopeFilter(getScope(), null)); @@ -191,35 +260,112 @@ public abstract class AbstractCreateRepo File file = artifact.getFile(); if (file == null || file.isDirectory()) { throw new MojoFailureException("Artifact " + artifact.getId() + " not available. " + - "This typically means that it is part of the reactor but that the " + - "package phase has not been executed."); + "This typically means that it is part of the reactor but that the " + + "package phase has not been executed."); } String type = artifact.getType(); ArchiveDeployer deployer = deployers.get(type); if (deployer == null) { throw new MojoExecutionException("No deployer found for artifact type " + type); } - deployer.deploy(getLog(), artifact); + deployer.deploy(log, artifact); } for (ArchiveDeployer deployer : deployers.values()) { - deployer.finish(getLog()); + deployer.finish(log); + } + } + if (jaxwsServices != null) { + File targetDirectory = new File(outputDirectory, jaxwsServicesDirectory); + for (JAXWSService service : jaxwsServices) { + String jarName = service.getName() + ".jar"; + try { + JarArchiver archiver = new JarArchiver(); + archiver.setDestFile(new File(targetDirectory, jarName)); + String[] packages = service.getPackages(); + String[] includes = new String[packages.length]; + for (int i=0; i<packages.length; i++) { + includes[i] = packages[i].replace('.', '/') + "/**/*.class"; + } + for (File classDirectory : getClassDirectories()) { + archiver.addDirectory(classDirectory, includes, new String[0]); + } + archiver.createArchive(); + } catch (ArchiverException ex) { + throw new MojoExecutionException("Failed to build " + jarName, ex); + } catch (IOException ex) { + throw new MojoExecutionException("Failed to build " + jarName, ex); + } } } - if (axis2xml != null) { - getLog().info("Copying axis2.xml"); + if (generatedAxis2xml != null || axis2xml != null) { File targetDirectory = configurationDirectory == null ? outputDirectory : new File(outputDirectory, configurationDirectory); - try { - FileUtils.copyFile(axis2xml, new File(targetDirectory, "axis2.xml")); - } catch (IOException ex) { - throw new MojoExecutionException("Error copying axis2.xml file: " + ex.getMessage(), ex); + targetDirectory.mkdirs(); + File axis2xmlFile = new File(targetDirectory, "axis2.xml"); + if (axis2xml != null) { + log.info("Copying axis2.xml"); + try { + FileUtils.copyFile(axis2xml, axis2xmlFile); + } catch (IOException ex) { + throw new MojoExecutionException("Error copying axis2.xml file: " + ex.getMessage(), ex); + } + } else { + log.info("Generating axis2.xml"); + try { + FilterArtifacts filter = new FilterArtifacts(); + filter.addFilter(new ScopeFilter(getScope(), null)); + filter.addFilter(new TypeFilter("jar", null)); + List<URL> urls = new ArrayList<URL>(); + for (Artifact artifact : filter.filter(projectArtifacts)) { + urls.add(artifact.getFile().toURI().toURL()); + } + URLClassLoader classLoader = URLClassLoader.newInstance(urls.toArray(new URL[urls.size()])); + InputStream in = classLoader.getResourceAsStream("org/apache/axis2/deployment/axis2_default.xml"); + if (in == null) { + throw new MojoFailureException("The default axis2.xml file could not be found"); + } + try { + OMDocument axis2xmlDoc = OMXMLBuilderFactory.createOMBuilder(in).getDocument(); + OMElement root = axis2xmlDoc.getOMDocumentElement(); + for (Iterator<OMNode> it = root.getDescendants(false); it.hasNext(); ) { + OMNode node = it.next(); + if (node instanceof OMElement) { + OMElement element = (OMElement)node; + String classAttr = element.getAttributeValue(new QName("class")); + if (classAttr != null) { + try { + classLoader.loadClass(classAttr); + } catch (ClassNotFoundException ex) { + it.remove(); + } + } + } + } + addMessageHandlers(root, generatedAxis2xml.getMessageBuilders(), "messageBuilder"); + addMessageHandlers(root, generatedAxis2xml.getMessageFormatters(), "messageFormatter"); + OutputStream out = new FileOutputStream(axis2xmlFile); + try { + axis2xmlDoc.serialize(out); + } finally { + out.close(); + } + } finally { + in.close(); + } + } catch (ArtifactFilterException ex) { + throw new MojoExecutionException(ex.getMessage(), ex); + } catch (IOException ex) { + throw new MojoExecutionException(ex.getMessage(), ex); + } catch (XMLStreamException ex) { + throw new MojoExecutionException(ex.getMessage(), ex); + } } } } private void selectArtifacts(Set<Artifact> artifacts, String list, String type) throws MojoFailureException { if (list != null) { - Set<String> set = new HashSet<String>(Arrays.asList(StringUtils.split(list, ","))); + Set<String> set = new HashSet<String>(Arrays.asList(StringUtils.stripAll(StringUtils.split(list, ",")))); for (Iterator<Artifact> it = artifacts.iterator(); it.hasNext(); ) { Artifact artifact = it.next(); if (artifact.getType().equals(type) && !set.remove(artifact.getArtifactId())) { Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java Sun Dec 17 22:34:08 2017 @@ -54,7 +54,7 @@ public class ArchiveDeployer { StringBuilder buffer = new StringBuilder(artifact.getArtifactId()); if (!stripVersion) { buffer.append("-"); - buffer.append(artifact.getVersion()); + buffer.append(artifact.getBaseVersion()); } buffer.append("."); buffer.append(artifact.getType()); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java Sun Dec 17 22:34:08 2017 @@ -33,19 +33,42 @@ import org.apache.maven.artifact.Artifac */ public class CreateRepositoryMojo extends AbstractCreateRepositoryMojo { /** + * Input directory with additional files to be copied to the repository. + * + * @parameter default-value="src/main/repository" + */ + private File inputDirectory; + + /** * The output directory where the repository will be created. * * @parameter default-value="${project.build.directory}/repository" */ private File outputDirectory; + /** + * @parameter expression="${project.build.outputDirectory}" + * @readonly + */ + private File buildOutputDirectory; + @Override protected String getScope() { return Artifact.SCOPE_RUNTIME; } @Override + protected File getInputDirectory() { + return inputDirectory; + } + + @Override protected File getOutputDirectory() { return outputDirectory; } + + @Override + protected File[] getClassDirectories() { + return new File[] { buildOutputDirectory }; + } } Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java Sun Dec 17 22:34:08 2017 @@ -31,11 +31,18 @@ import org.apache.maven.plugin.MojoFailu * is skipped if the <code>maven.test.skip</code> property is set to <code>true</code>. * * @goal create-test-repository - * @phase generate-test-resources + * @phase process-test-classes * @requiresDependencyResolution test */ public class CreateTestRepositoryMojo extends AbstractCreateRepositoryMojo { /** + * Input directory with additional files to be copied to the repository. + * + * @parameter default-value="src/test/repository" + */ + private File inputDirectory; + + /** * The output directory where the repository will be created. * * @parameter default-value="${project.build.directory}/test-repository" @@ -48,17 +55,39 @@ public class CreateTestRepositoryMojo ex */ private boolean skip; + /** + * @parameter expression="${project.build.outputDirectory}" + * @readonly + */ + private File buildOutputDirectory; + + /** + * @parameter expression="${project.build.testOutputDirectory}" + * @readonly + */ + private File buildTestOutputDirectory; + @Override protected String getScope() { return Artifact.SCOPE_TEST; } @Override + protected File getInputDirectory() { + return inputDirectory; + } + + @Override protected File getOutputDirectory() { return outputDirectory; } @Override + protected File[] getClassDirectories() { + return new File[] { buildOutputDirectory, buildTestOutputDirectory }; + } + + @Override public void execute() throws MojoExecutionException, MojoFailureException { if (skip) { getLog().info("Tests are skipped"); Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/AXIS2-4091/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Sun Dec 17 22:34:08 2017 @@ -23,20 +23,26 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <artifactId>axis2</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>axis2-wsdl2code-maven-plugin</artifactId> <name>Apache Axis2 - tool - WSDL2Code Maven Plugin</name> <packaging>maven-plugin</packaging> <description>The Axis 2 Plugin for Maven allows client side and server side sources from a WSDL.</description> - <url>http://axis.apache.org/axis2/java/core/</url> + <url>http://axis.apache.org/axis2/java/core/tools/maven-plugins/axis2-wsdl2code-maven-plugin</url> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin</developerConnection> <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin</url> </scm> + <distributionManagement> + <site> + <id>site</id> + <url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/core-staging/tools/maven-plugins/axis2-wsdl2code-maven-plugin</url> + </site> + </distributionManagement> <dependencies> <dependency> <groupId>org.apache.maven</groupId> @@ -48,53 +54,116 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-core</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>maven-shared</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-codegen</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-kernel</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-adb</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-adb-codegen</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-java2wsdl</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-xmlbeans</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-jaxbri</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-jibx-codegen</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>jalopy</groupId> - <artifactId>jalopy</artifactId> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <!-- Maven supports SLF4J, so use it. --> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> </dependency> <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> + <!-- JiBX uses log4j --> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> </dependency> </dependencies> <build> @@ -115,24 +184,45 @@ </executions> </plugin> <plugin> - <artifactId>maven-clean-plugin</artifactId> + <artifactId>maven-plugin-plugin</artifactId> <configuration> - <filesets> - <fileset> - <directory>src/test/test1/target</directory> - </fileset> - <fileset> - <directory>src/test/test2/target</directory> - </fileset> - </filesets> + <goalPrefix>axis2</goalPrefix> </configuration> </plugin> <plugin> - <artifactId>maven-plugin-plugin</artifactId> + <artifactId>maven-invoker-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>install</goal> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> <configuration> - <goalPrefix>axis2</goalPrefix> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + <goals> + <goal>generate-sources</goal> + </goals> </configuration> </plugin> </plugins> </build> + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reportSets> + <reportSet> + <reports /> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + </plugins> + </reporting> </project>
