svn commit: r966536 - /axis/axis2/java/core/trunk/pom.xml
Author: veithen Date: Thu Jul 22 08:21:11 2010 New Revision: 966536 URL: http://svn.apache.org/viewvc?rev=966536&view=rev Log: Disable the build of the documentation module until the Maven site refactoring has been completed. Modified: axis/axis2/java/core/trunk/pom.xml Modified: axis/axis2/java/core/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=966536&r1=966535&r2=966536&view=diff == --- axis/axis2/java/core/trunk/pom.xml (original) +++ axis/axis2/java/core/trunk/pom.xml Thu Jul 22 08:21:11 2010 @@ -87,7 +87,7 @@ -modules/documentation + modules/distribution
svn commit: r966696 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
Author: barrettj Date: Thu Jul 22 14:53:48 2010 New Revision: 966696 URL: http://svn.apache.org/viewvc?rev=966696&view=rev Log: Add doPriv necessary when creating MIME attachment objects Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java?rev=966696&r1=966695&r2=966696&view=diff == --- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java (original) +++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java Thu Jul 22 14:53:48 2010 @@ -26,6 +26,7 @@ import org.apache.axiom.om.impl.llom.OMT import org.apache.axis2.Constants; import org.apache.axis2.Constants.Configuration; import org.apache.axis2.context.MessageContext; +import org.apache.axis2.java.security.AccessController; import org.apache.axis2.transport.http.HTTPConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,6 +39,8 @@ import javax.mail.internet.MimePartDataS import javax.xml.bind.attachment.AttachmentMarshaller; import javax.xml.stream.XMLStreamWriter; +import java.security.PrivilegedAction; + /** * An implementation of the JAXB AttachmentMarshaller that is used to handle binary data from JAXB * and create populate the appropriate constructs on the MessageContext @@ -113,12 +116,23 @@ public class JAXBAttachmentMarshaller ex try { // Create MIME Body Part -InternetHeaders ih = new InternetHeaders(); +final InternetHeaders ih = new InternetHeaders(); +final byte[] dataArray = data; ih.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, mimeType); -MimeBodyPart mbp = new MimeBodyPart(ih, data); +final MimeBodyPart mbp = (MimeBodyPart) AccessController.doPrivileged(new PrivilegedAction() { +public Object run() { +try { +return new MimeBodyPart(ih, dataArray); +} catch (MessagingException e) { +throw new OMException(e); +} +}}); //Create a data source for the MIME Body Part -MimePartDataSource mpds = new MimePartDataSource(mbp); +MimePartDataSource mpds = (MimePartDataSource) AccessController.doPrivileged(new PrivilegedAction() { +public Object run() { +return new MimePartDataSource(mbp); +}}); long dataLength =data.length; Integer value = null; if (msgContext != null) {
svn commit: r966825 [1/3] - in /axis/axis2/java/core/branches/java/1_5: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/clustering/ modules/codegen/ modules/corba/ modules/fastinfoset
Author: veithen Date: Thu Jul 22 19:46:59 2010 New Revision: 966825 URL: http://svn.apache.org/viewvc?rev=966825&view=rev Log: Some format changes in POM files to avoid spurious changes during the release process. Modified: axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml axis/axis2/java/core/branches/java/1_5/modules/json/pom.xml axis/axis2/java/core/branches/java/1_5/modules/kernel/pom.xml axis/axis2/java/core/branches/java/1_5/modules/metadata/pom.xml axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml axis/axis2/java/core/branches/java/1_5/modules/mtompolicy/pom.xml axis/axis2/java/core/branches/java/1_5/modules/osgi/pom.xml axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml axis/axis2/java/core/branches/java/1_5/modules/resource-bundle/pom.xml axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml axis/axis2/java/core/branches/java/1_5/modules/samples/pom.xml axis/axis2/java/core/branches/java/1_5/modules/samples/version/pom.xml axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/pom.xml axis/axis2/java/core/branches/java/1_5/modules/spring/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml axis/axis2/java/core/branches/java/1_5/modules/transport/local/pom.xml axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml axis/axis2/java/core/branches/java/1_5/modules/xmlbeans/pom.xml axis/axis2/java/core/branches/java/1_5/pom.xml Modified: axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml?rev=966825&r1=966824&r2=966825&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,8 +19,7 @@ ~ under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.axis2 @@ -116,13 +115,13 @@ - + - + - - + + @@ -136,20 +135,18 @@ generate-test-sources
svn commit: r966855 [2/2] - in /axis/axis2/java/core/trunk: ./ modules/adb-codegen/ modules/adb-codegen/test-resources/testsuite/ modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/ mo
Modified: axis/axis2/java/core/trunk/modules/json/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/pom.xml?rev=966855&r1=966854&r2=966855&view=diff == --- axis/axis2/java/core/trunk/modules/json/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/json/pom.xml Thu Jul 22 21:01:28 2010 @@ -19,8 +19,7 @@ ~ under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.axis2 Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=966855&r1=966854&r2=966855&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Thu Jul 22 21:01:28 2010 @@ -19,8 +19,7 @@ ~ under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.axis2 @@ -178,12 +177,11 @@ - + - - - + + + @@ -221,9 +219,8 @@ test-compile - - + + Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181:966825* +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axi