Modified: axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java Fri Jan 5 19:50:25 2018 @@ -30,16 +30,21 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.AddressingConstants; import org.apache.axis2.transport.OutTransportInfo; import org.apache.axis2.transport.MessageFormatter; +import org.apache.axiom.mime.ContentType; import org.apache.axiom.om.OMOutputFormat; -import org.apache.axiom.om.util.CommonUtils; import javax.mail.*; -import javax.mail.internet.*; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeBodyPart; +import javax.mail.internet.MimeMultipart; +import javax.mail.internet.MimePart; import javax.activation.DataHandler; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.io.IOException; +import java.text.ParseException; /** * The mail transport sender sends mail using an SMTP server configuration defined @@ -469,8 +474,8 @@ public class MailTransportSender extends mainPart.setHeader("Content-Transfer-Encoding", (String) msgContext.getOptions().getProperty("Content-Transfer-Encoding")); } else { - String contentType = dataHandler.getContentType().toLowerCase(); - if (!contentType.startsWith("multipart/") && CommonUtils.isTextualPart(contentType)) { + ContentType contentType = new ContentType(dataHandler.getContentType()); + if (!contentType.getMediaType().hasPrimaryType("multipart") && contentType.isTextual()) { mainPart.setHeader("Content-Transfer-Encoding", "quoted-printable"); } } @@ -495,7 +500,7 @@ public class MailTransportSender extends metrics.incrementBytesSent(msgContext, bytesSent); } - } catch (MessagingException e) { + } catch (MessagingException | ParseException e) { metrics.incrementFaultsSending(); handleException("Error creating mail message or sending it to the configured server", e);
Modified: axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java Fri Jan 5 19:50:25 2018 @@ -26,6 +26,7 @@ import javax.mail.Session; import org.apache.axis2.AxisFault; import org.apache.axis2.description.ParameterInclude; import org.apache.axis2.transport.base.ParamUtils; +import org.apache.axis2.util.LogWriter; import org.apache.commons.io.output.WriterOutputStream; import org.apache.commons.logging.Log; Modified: axis/axis2/java/core/branches/schema-validation/modules/webapp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/webapp/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/webapp/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/webapp/pom.xml Fri Jan 5 19:50:25 2018 @@ -61,11 +61,6 @@ </dependency> <dependency> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-jaxbri</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> <artifactId>axis2-xmlbeans</artifactId> <version>${project.version}</version> </dependency> @@ -147,6 +142,16 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>axis2-transport-http</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>axis2-transport-local</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>axis2-transport-jms</artifactId> <version>${project.version}</version> <exclusions> @@ -195,6 +200,12 @@ </exclusions> </dependency> <dependency> + <!-- codegen is required for Rampart because of AXIS2-4265 --> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-codegen</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>mex</artifactId> <version>${project.version}</version> Modified: axis/axis2/java/core/branches/schema-validation/modules/xmlbeans/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/xmlbeans/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/xmlbeans/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/xmlbeans/pom.xml Fri Jan 5 19:50:25 2018 @@ -33,7 +33,7 @@ <dependencies> <dependency> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-codegen</artifactId> + <artifactId>axis2-kernel</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -41,6 +41,12 @@ <artifactId>xmlbeans</artifactId> </dependency> <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-xmlbeans-codegen</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <scope>test</scope> Modified: axis/axis2/java/core/branches/schema-validation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/pom.xml Fri Jan 5 19:50:25 2018 @@ -78,8 +78,9 @@ <module>modules/tool/archetype/quickstart-webapp</module> <module>modules/webapp</module> <module>modules/xmlbeans</module> + <module>modules/xmlbeans-codegen</module> <module>modules/scripting</module> - <module>modules/jaxbri</module> + <module>modules/jaxbri-codegen</module> <module>modules/metadata</module> <module>modules/saaj</module> <module>modules/jaxws</module> @@ -545,7 +546,7 @@ <tomcat.version>6.0.16</tomcat.version> <wsdl4j.version>1.6.2</wsdl4j.version> <xalan.version>2.7.0</xalan.version> - <xmlbeans.version>2.5.0</xmlbeans.version> + <xmlbeans.version>2.6.0</xmlbeans.version> <xml_resolver.version>1.2</xml_resolver.version> <xmlunit.version>1.3</xmlunit.version> <commons.lang.version>2.3</commons.lang.version> @@ -1153,6 +1154,11 @@ <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> <version>1.5</version> + <configuration> + <!-- We don't actually want to allow System.exit, but the security manager + installed by the plugin causes problems in multithreaded builds. --> + <allowSystemExits>true</allowSystemExits> + </configuration> <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -1278,7 +1284,7 @@ </plugin> <plugin> <artifactId>maven-invoker-plugin</artifactId> - <version>2.0.0</version> + <version>3.0.1</version> <configuration> <javaHome>${java.home}</javaHome> </configuration> @@ -1396,6 +1402,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> + <trimStackTrace>false</trimStackTrace> <systemProperties> <property> <name>java.io.tmpdir</name> Modified: axis/axis2/java/core/branches/schema-validation/src/site/markdown/release-notes/1.8.0.md URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/src/site/markdown/release-notes/1.8.0.md?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/src/site/markdown/release-notes/1.8.0.md (original) +++ axis/axis2/java/core/branches/schema-validation/src/site/markdown/release-notes/1.8.0.md Fri Jan 5 19:50:25 2018 @@ -9,3 +9,13 @@ Apache Axis2 1.8.0 Release Note * The HTTPClient 4.x based transport has been upgraded to use the APIs supported by the latest HTTPClient version. + +* To improve dependency management, the data binding JARs have been split to + separate the code required at build time from the code required at runtime: + * `axis2-jibx` has been split into `axis2-jibx` and `axis2-jibx-codegen`. + * `axis2-xmlbeans` has been split into `axis2-xmlbeans` and + `axis2-xmlbeans-codegen`. + * `axis2-jaxbri` has been renamed to `axis2-jaxbri` (The JAXB-RI data + binding doesn't require any additional classes at runtime). + * There are no changes for ADB because the code was already split in + previous Axis2 versions.
