svn commit: r1081273 - in /axis/axis2/java/core/branches/1_6/modules: adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGene
Author: sagara Date: Mon Mar 14 07:33:22 2011 New Revision: 1081273 URL: http://svn.apache.org/viewvc?rev=1081273&view=rev Log: Merged changes of r1072499 to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=1081273&r1=1081272&r2=1081273&view=diff == --- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original) +++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Mon Mar 14 07:33:22 2011 @@ -174,7 +174,7 @@ public class RPCMessageReceiver extends for (Class exceptionType : exceptionTypes){ if (exceptionType.getName().equals(cause.getClass().getName())){ // this is an bussiness logic exception so handle it properly -String partQName = method.getName() + getSimpleClassName(exceptionType); +String partQName = inMessage.getAxisService().getName() + getSimpleClassName(exceptionType); TypeTable typeTable = inMessage.getAxisService().getTypeTable(); QName elementQName = typeTable.getQNamefortheType(partQName); SOAPFactory fac = getSOAPFactory(inMessage); Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1081273&r1=1081272&r2=1081273&view=diff == --- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java (original) +++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java Mon Mar 14 07:33:22 2011 @@ -443,7 +443,7 @@ public class DefaultSchemaGenerator impl if (AxisFault.class.getName().equals(extype.getName())) { continue; } -String partQname = jMethod.getName() + getSimpleClassName(extype); +String partQname = this.service.getName() + getSimpleClassName(extype); methodSchemaType = createSchemaTypeForFault(partQname); QName elementName = new QName(this.schemaTargetNameSpace, partQname, this.schema_namespace_prefix); @@ -473,7 +473,7 @@ public class DefaultSchemaGenerator impl continue; } AxisMessage faultMessage = new AxisMessage(); -faultMessage.setName(jMethod.getName() + getSimpleClassName(extype)); +faultMessage.setName(this.service.getName() + getSimpleClassName(extype)); faultMessage.setElementQName(typeTable.getQNamefortheType(partQname)); axisOperation.setFaultMessages(faultMessage); }
svn commit: r1081274 - /axis/axis2/java/core/branches/1_6/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java
Author: sagara Date: Mon Mar 14 07:36:06 2011 New Revision: 1081274 URL: http://svn.apache.org/viewvc?rev=1081274&view=rev Log: Updated sample class according to the recent Exception naming changes. Modified: axis/axis2/java/core/branches/1_6/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java Modified: axis/axis2/java/core/branches/1_6/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java?rev=1081274&r1=1081273&r2=1081274&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/faulthandling/service/src/example/BankServiceSkeleton.java Mon Mar 14 07:36:06 2011 @@ -35,12 +35,12 @@ */ public example.WithdrawResponse withdraw(example.Withdraw param0) - throws InsufficientFundFaultMessage,AccountNotExistFaultMessage{ + throws InsufficientFundException,AccountNotExistException{ final String account = param0.getAccount(); if (account.equals("13")) { final AccountNotExistFault fault = new AccountNotExistFault(); fault.setAccount(account); -AccountNotExistFaultMessage messageException = new AccountNotExistFaultMessage("Account does not exist!"); +AccountNotExistException messageException = new AccountNotExistException("Account does not exist!"); messageException.setFaultMessage(fault); throw messageException; } @@ -51,7 +51,7 @@ fault.setAccount(account); fault.setBalance(1000); fault.setRequestedFund(amount); -InsufficientFundFaultMessage messageException = new InsufficientFundFaultMessage("Insufficient funds"); +InsufficientFundException messageException = new InsufficientFundException("Insufficient funds"); messageException.setFaultMessage(fault); throw messageException; }
svn commit: r1099385 - /axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml
Author: sagara Date: Wed May 4 09:56:16 2011 New Revision: 1099385 URL: http://svn.apache.org/viewvc?rev=1099385&view=rev Log: Fixed build error when running profile 'everything' and refracted POM as other samples. Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml?rev=1099385&r1=1099384&r2=1099385&view=diff == --- axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml Wed May 4 09:56:16 2011 @@ -20,14 +20,11 @@ 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 -axis2-parent -1.7.0-SNAPSHOT -../../parent/pom.xml - -version -Apache Axis2 - JAXWS Version Service +org.apache.axis2.examples +jaxws-version +1.7.0-SNAPSHOT +jar +Apache Axis2 -JAXWS Version Service src
svn commit: r1099389 - in /axis/axis2/java/core/trunk/modules/samples: quickstart/build.xml quickstartaxiom/build.xml
Author: sagara Date: Wed May 4 10:00:59 2011 New Revision: 1099389 URL: http://svn.apache.org/viewvc?rev=1099389&view=rev Log: Add minor improvements to Ant scripts files. Modified: axis/axis2/java/core/trunk/modules/samples/quickstart/build.xml axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml Modified: axis/axis2/java/core/trunk/modules/samples/quickstart/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstart/build.xml?rev=1099389&r1=1099388&r2=1099389&view=diff == --- axis/axis2/java/core/trunk/modules/samples/quickstart/build.xml (original) +++ axis/axis2/java/core/trunk/modules/samples/quickstart/build.xml Wed May 4 10:00:59 2011 @@ -68,6 +68,10 @@ + + Modified: axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml?rev=1099389&r1=1099388&r2=1099389&view=diff == --- axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml (original) +++ axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml Wed May 4 10:00:59 2011 @@ -60,6 +60,10 @@ + +
svn commit: r1099397 - in /axis/axis2/java/core/branches/1_6/modules/samples: jaxws-version/pom.xml quickstart/build.xml quickstartaxiom/build.xml
Author: sagara Date: Wed May 4 10:22:28 2011 New Revision: 1099397 URL: http://svn.apache.org/viewvc?rev=1099397&view=rev Log: Apply r1099385 ,r1099389 changes to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml axis/axis2/java/core/branches/1_6/modules/samples/quickstart/build.xml axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml?rev=1099397&r1=1099396&r2=1099397&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml Wed May 4 10:22:28 2011 @@ -19,15 +19,12 @@ 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 -axis2-parent -1.6.1-SNAPSHOT -../../parent/pom.xml - -version -Apache Axis2 - JAXWS Version Service +4.0.0 +org.apache.axis2.examples +jaxws-version +1.6.1-SNAPSHOT +jar +Apache Axis2 -JAXWS Version Service src Modified: axis/axis2/java/core/branches/1_6/modules/samples/quickstart/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/quickstart/build.xml?rev=1099397&r1=1099396&r2=1099397&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/quickstart/build.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/quickstart/build.xml Wed May 4 10:22:28 2011 @@ -68,6 +68,10 @@ + + Modified: axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml?rev=1099397&r1=1099396&r2=1099397&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml Wed May 4 10:22:28 2011 @@ -60,6 +60,10 @@ + +
svn commit: r1100870 - in /axis/axis2/java/transports/trunk/modules: all/pom.xml all/src/main/assembly/src.xml base/pom.xml http/pom.xml jms/pom.xml mail/pom.xml sms/pom.xml tcp/pom.xml testkit/pom.xm
Author: sagara Date: Mon May 9 03:25:39 2011 New Revision: 1100870 URL: http://svn.apache.org/viewvc?rev=1100870&view=rev Log: Replaced pom.* with project.* as pom.* deprecated in Maven 3 Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml axis/axis2/java/transports/trunk/modules/all/src/main/assembly/src.xml axis/axis2/java/transports/trunk/modules/base/pom.xml axis/axis2/java/transports/trunk/modules/http/pom.xml axis/axis2/java/transports/trunk/modules/jms/pom.xml axis/axis2/java/transports/trunk/modules/mail/pom.xml axis/axis2/java/transports/trunk/modules/sms/pom.xml axis/axis2/java/transports/trunk/modules/tcp/pom.xml axis/axis2/java/transports/trunk/modules/testkit/pom.xml axis/axis2/java/transports/trunk/modules/udp/pom.xml axis/axis2/java/transports/trunk/modules/xmpp/pom.xml Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all/pom.xml?rev=1100870&r1=1100869&r2=1100870&view=diff == --- axis/axis2/java/transports/trunk/modules/all/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/all/pom.xml Mon May 9 03:25:39 2011 @@ -116,37 +116,37 @@ org.apache.axis2 axis2-transport-base -${pom.version} +${project.version} org.apache.axis2 axis2-transport-jms -${pom.version} +${project.version} org.apache.axis2 axis2-transport-mail -${pom.version} +${project.version} org.apache.axis2 axis2-transport-tcp -${pom.version} +${project.version} org.apache.axis2 axis2-transport-sms -${pom.version} +${project.version} org.apache.axis2 axis2-transport-xmpp -${pom.version} +${project.version} org.apache.axis2 axis2-transport-udp -${pom.version} +${project.version} @@ -176,7 +176,7 @@ src/main/assembly/src.xml - axis2-transports-${pom.version} + axis2-transports-${project.version} @@ -188,10 +188,10 @@ true -${pom.artifactId} +${project.artifactId} Apache Software Foundation ${pom.description} - ${pom.artifactId} + ${project.artifactId} org.apache.axis2.transport.base.*;-split-package:=merge-last, org.apache.axis2.transport.jms.*;-split-package:=merge-last, Modified: axis/axis2/java/transports/trunk/modules/all/src/main/assembly/src.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all/src/main/assembly/src.xml?rev=1100870&r1=1100869&r2=1100870&view=diff == --- axis/axis2/java/transports/trunk/modules/all/src/main/assembly/src.xml (original) +++ axis/axis2/java/transports/trunk/modules/all/src/main/assembly/src.xml Mon May 9 03:25:39 2011 @@ -28,7 +28,7 @@ ../.. - axis2-transports-${pom.version}-src + axis2-transports-${project.version}-src NOTICE LICENSE Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=1100870&r1=1100869&r2=1100870&view=diff == --- axis/axis2/java/transports/trunk/modules/base/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/base/pom.xml Mon May 9 03:25:39 2011 @@ -60,10 +60,10 @@ true -${pom.artifactId} +${project.artifactId} Apache Software Foundation ${pom.description} - ${pom.artifactId} + ${project.artifactId} org.apache.axis2.transport.base.*;-split-package:=merge-last, org.apache.axis2.format.*;-split-package:=merge-last, Modified: axis/axis2/ja
svn commit: r1101037 - in /axis/axis2/java/core/trunk/legal: jaxws-tools-LICENSE.txt jsr311-api-LICENSE.txt regexp-LICENSE.txt woden-impl-commons-LICENSE.txt
Author: sagara Date: Mon May 9 14:23:12 2011 New Revision: 1101037 URL: http://svn.apache.org/viewvc?rev=1101037&view=rev Log: Added missing license files. Added: axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt axis/axis2/java/core/trunk/legal/jsr311-api-LICENSE.txt axis/axis2/java/core/trunk/legal/regexp-LICENSE.txt axis/axis2/java/core/trunk/legal/woden-impl-commons-LICENSE.txt Added: axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt?rev=1101037&view=auto == --- axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt (added) +++ axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt Mon May 9 14:23:12 2011 @@ -0,0 +1,119 @@ +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications. + +1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. + +1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. + +1.4. Executable means the Covered Software in any form other than Source Code. + +1.5. Initial Developer means the individual or entity that first makes Original Software available under this License. + +1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. + +1.7. License means this document. + +1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. + +1.9. Modifications means the Source Code and Executable form of any of the following: + +A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications; + +B. Any new file that contains any part of the Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made available under the terms of this License. + +1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License. + +1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. + +1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code. + +1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)�the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)�ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: +(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and +(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof). +(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License. +(d) Notwithstanding Section�2.1(b) above, no patent license is granted: (1)�for code that You delete from the Original Software, or (2)�for infringements caused by: (i)�the modification of the Original Software, or (ii)�the combination of the Original Software with other software or devices. + +2.2. Contributor Grant. +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property clai
svn commit: r1101055 - in /axis/axis2/java/core/branches/1_6: ./ legal/jaxws-tools-LICENSE.txt legal/jsr311-api-LICENSE.txt legal/regexp-LICENSE.txt legal/woden-impl-commons-LICENSE.txt
Author: sagara Date: Mon May 9 15:15:47 2011 New Revision: 1101055 URL: http://svn.apache.org/viewvc?rev=1101055&view=rev Log: Merged r1101037 to the 1.6 branch. Added: axis/axis2/java/core/branches/1_6/legal/jaxws-tools-LICENSE.txt - copied unchanged from r1101037, axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt axis/axis2/java/core/branches/1_6/legal/jsr311-api-LICENSE.txt - copied unchanged from r1101037, axis/axis2/java/core/trunk/legal/jsr311-api-LICENSE.txt axis/axis2/java/core/branches/1_6/legal/regexp-LICENSE.txt - copied unchanged from r1101037, axis/axis2/java/core/trunk/legal/regexp-LICENSE.txt axis/axis2/java/core/branches/1_6/legal/woden-impl-commons-LICENSE.txt - copied unchanged from r1101037, axis/axis2/java/core/trunk/legal/woden-impl-commons-LICENSE.txt Modified: axis/axis2/java/core/branches/1_6/ (props changed) Propchange: axis/axis2/java/core/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 9 15:15:47 2011 @@ -1 +1 @@ -/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628 +/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037
svn commit: r1101320 - /axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
Author: sagara Date: Tue May 10 05:55:11 2011 New Revision: 1101320 URL: http://svn.apache.org/viewvc?rev=1101320&view=rev Log: Fixed AXIS2-4991 - patch provided by Heshan Suriyaarachchi. Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1101320&r1=1101319&r2=1101320&view=diff == --- axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java (original) +++ axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java Tue May 10 05:55:11 2011 @@ -216,13 +216,15 @@ public class LocalResponder extends Abst TransportUtils.writeMessage(messageContext, out); ByteArrayInputStream bs = new ByteArrayInputStream(out.toByteArray()); +InputStreamReader streamReader = new InputStreamReader(bs); OMXMLParserWrapper builder; + try { -builder = BuilderUtil.getBuilder(bs); +builder = BuilderUtil.getBuilder(streamReader); } catch (XMLStreamException e) { throw AxisFault.makeFault(e); } -return TransportUtils.createSOAPEnvelope(builder.getDocumentElement()); +return (SOAPEnvelope) builder.getDocumentElement(); } }
svn commit: r1101323 - /axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Author: sagara Date: Tue May 10 06:04:48 2011 New Revision: 1101323 URL: http://svn.apache.org/viewvc?rev=1101323&view=rev Log: Fixed AXIS2-5024 - patch provided by Heshan Suriyaarachchi. Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1101323&r1=1101322&r2=1101323&view=diff == --- axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original) +++ axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Tue May 10 06:04:48 2011 @@ -131,6 +131,11 @@ public class LocalTransportReceiver { msgCtx.setTransportOut(localTransportResOut); msgCtx.setProperty(MessageContext.TRANSPORT_OUT, response); +Object headers = inMessageContext.getProperty(MessageContext.TRANSPORT_HEADERS); +if (headers != null) { +msgCtx.setProperty(MessageContext.TRANSPORT_HEADERS, headers); +} + msgCtx.setTo(to); msgCtx.setWSAAction(action); msgCtx.setServerSide(true);
svn commit: r1101328 - /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Author: sagara Date: Tue May 10 06:26:05 2011 New Revision: 1101328 URL: http://svn.apache.org/viewvc?rev=1101328&view=rev Log: Merged r1101323 to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1101328&r1=1101327&r2=1101328&view=diff == --- axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Tue May 10 06:26:05 2011 @@ -104,6 +104,11 @@ public class LocalTransportReceiver { msgCtx.setTransportOut(localTransportResOut); msgCtx.setProperty(MessageContext.TRANSPORT_OUT, response); +Object headers = inMessageContext.getProperty(MessageContext.TRANSPORT_HEADERS); +if (headers != null) { +msgCtx.setProperty(MessageContext.TRANSPORT_HEADERS, headers); +} + msgCtx.setTo(to); msgCtx.setWSAAction(action); msgCtx.setServerSide(true);
svn commit: r1101329 - in /axis/axis2/java/core/branches/1_5/modules/transport/local: ./ src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Author: sagara Date: Tue May 10 06:26:56 2011 New Revision: 1101329 URL: http://svn.apache.org/viewvc?rev=1101329&view=rev Log: Merged r1101323 to the 1.5 branch. Modified: axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 10 06:26:56 2011 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,103 2390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1088239,1088249,1088251,1088268,1091191,1099385,1099389,1100628,1101037 +/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,103 2390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1088239,1088249,1088251,1088268,1091191,1099385,1099389,1100628,1101037,1101323 /webservices/axis2/trunk/java/modules/transport/local:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318 Modified: axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1101329&r1=1101328&r2=1101329&view=diff == --- axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original) +++ axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Tue May 10 06:26:56 2011
svn commit: r1101488 - /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Author: sagara Date: Tue May 10 14:49:38 2011 New Revision: 1101488 URL: http://svn.apache.org/viewvc?rev=1101488&view=rev Log: Applied fixed for AXIS2-4967 Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1101488&r1=1101487&r2=1101488&view=diff == --- axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Tue May 10 14:49:38 2011 @@ -28,9 +28,11 @@ import org.apache.axis2.addressing.Endpo import org.apache.axis2.builder.BuilderUtil; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; +import org.apache.axis2.context.SessionContext; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.description.TransportOutDescription; import org.apache.axis2.engine.AxisEngine; +import org.apache.axis2.transport.TransportListener; import org.apache.axis2.transport.http.HTTPConstants; import org.apache.axis2.util.MessageContextBuilder; @@ -140,4 +142,28 @@ public class LocalTransportReceiver { } } } + +public void init(ConfigurationContext axisConf, TransportInDescription transprtIn) throws AxisFault { +} + +public void start() throws AxisFault { +} + +public void stop() throws AxisFault { +} + +public EndpointReference getEPRForService(String serviceName, String ip) throws AxisFault { +return null; +} + +public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault { +return new EndpointReference[0]; +} + +public SessionContext getSessionContext(MessageContext messageContext) { +return null; +} + +public void destroy() { +} }
svn commit: r1101490 - /axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Author: sagara Date: Tue May 10 14:54:56 2011 New Revision: 1101490 URL: http://svn.apache.org/viewvc?rev=1101490&view=rev Log: Applied fixed for AXIS2-4967 Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1101490&r1=1101489&r2=1101490&view=diff == --- axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original) +++ axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Tue May 10 14:54:56 2011 @@ -28,9 +28,11 @@ import org.apache.axis2.addressing.Endpo import org.apache.axis2.builder.BuilderUtil; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; +import org.apache.axis2.context.SessionContext; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.description.TransportOutDescription; import org.apache.axis2.engine.AxisEngine; +import org.apache.axis2.transport.TransportListener; import org.apache.axis2.transport.http.HTTPConstants; import org.apache.axis2.util.MessageContextBuilder; import org.apache.commons.logging.Log; @@ -41,8 +43,9 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -public class LocalTransportReceiver { +public class LocalTransportReceiver implements TransportListener { protected static final Log log = LogFactory.getLog(LocalTransportReceiver.class); + public static ConfigurationContext CONFIG_CONTEXT; private ConfigurationContext confContext; private MessageContext inMessageContext; @@ -180,4 +183,28 @@ public class LocalTransportReceiver { } } } + +public void init(ConfigurationContext axisConf, TransportInDescription transprtIn) throws AxisFault { +} + +public void start() throws AxisFault { +} + +public void stop() throws AxisFault { +} + +public EndpointReference getEPRForService(String serviceName, String ip) throws AxisFault { +return null; +} + +public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault { +return new EndpointReference[0]; +} + +public SessionContext getSessionContext(MessageContext messageContext) { +return null; +} + +public void destroy() { +} }
svn commit: r1101493 - in /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local: LocalResponder.java LocalTransportReceiver.java LocalTransportSender.java
Author: sagara Date: Tue May 10 14:59:47 2011 New Revision: 1101493 URL: http://svn.apache.org/viewvc?rev=1101493&view=rev Log: Applied fixed for AXIS2-4991 Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1101493&r1=1101492&r2=1101493&view=diff == --- axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java Tue May 10 14:59:47 2011 @@ -20,32 +20,40 @@ package org.apache.axis2.transport.local; +import org.apache.axiom.om.OMXMLParserWrapper; +import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axis2.AxisFault; +import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; +import org.apache.axis2.addressing.RelatesTo; +import org.apache.axis2.builder.BuilderUtil; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.description.TransportOutDescription; +import org.apache.axis2.description.WSDL2Constants; +import org.apache.axis2.engine.AxisEngine; import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.transport.TransportSender; import org.apache.axis2.transport.TransportUtils; +import org.apache.axis2.wsdl.WSDLConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.ByteArrayOutputStream; -import java.io.OutputStream; +import javax.xml.stream.XMLStreamException; +import java.io.*; +import java.util.Map; /** * LocalResponder */ public class LocalResponder extends AbstractHandler implements TransportSender { protected static final Log log = LogFactory.getLog(LocalResponder.class); - - + // fixed for Executing LocalTransport in MulthThread. private OutputStream out; public LocalResponder(OutputStream response) { -this.out = response; +this.out = response; } public void init(ConfigurationContext confContext, TransportOutDescription transportOut) @@ -87,13 +95,38 @@ public class LocalResponder extends Abst TransportUtils.writeMessage(msgContext, out); } } else { -out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT); +if (/*(msgContext != null) &&*/ (msgContext.getOperationContext() != null) && +(msgContext.getOperationContext().getMessageContexts() != null)) { +MessageContext proxyInMessageContext = msgContext. + getOperationContext().getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN); + +if (proxyInMessageContext != null) { +MessageContext initialMessageContext = (MessageContext) proxyInMessageContext. + getProperty(LocalTransportReceiver.IN_MESSAGE_CONTEXT); + +if (initialMessageContext != null) { +handleResponse(msgContext, initialMessageContext); +} else { +out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT); + +if (out != null) { +TransportUtils.writeMessage(msgContext, out); +} else { +throw new AxisFault( +"Both the TO and Property MessageContext.TRANSPORT_OUT is Null, No where to send"); +} -if (out != null) { -TransportUtils.writeMessage(msgContext, out); +} +} } else { -throw new AxisFault( -"Both the TO and Property MessageContext.TRANSPORT_OUT is Null, No where to send"); +out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT); + +if (out != null) { +TransportUtils.writeMessage(msgContext, out); +}
svn commit: r1101884 - /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
Author: sagara Date: Wed May 11 14:10:25 2011 New Revision: 1101884 URL: http://svn.apache.org/viewvc?rev=1101884&view=rev Log: add NonBlockingLocalTransportSender Added: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java Added: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java?rev=1101884&view=auto == --- axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java (added) +++ axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java Wed May 11 14:10:25 2011 @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.axis2.transport.local; + +public class NonBlockingLocalTransportSender extends LocalTransportSender { + +protected boolean isNonBlocking() { +return true; +} + +}
svn commit: r1103312 - in /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local: LocalResponder.java LocalTransportReceiver.java LocalTransportSender.java
Author: sagara Date: Sun May 15 10:46:20 2011 New Revision: 1103312 URL: http://svn.apache.org/viewvc?rev=1103312&view=rev Log: Temperately revert changes from Heshan for 1.6.0 release. Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1103312&r1=1103311&r2=1103312&view=diff == --- axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java Sun May 15 10:46:20 2011 @@ -20,40 +20,32 @@ package org.apache.axis2.transport.local; -import org.apache.axiom.om.OMXMLParserWrapper; -import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axis2.AxisFault; -import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.addressing.RelatesTo; -import org.apache.axis2.builder.BuilderUtil; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.description.TransportOutDescription; -import org.apache.axis2.description.WSDL2Constants; -import org.apache.axis2.engine.AxisEngine; import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.transport.TransportSender; import org.apache.axis2.transport.TransportUtils; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.xml.stream.XMLStreamException; -import java.io.*; -import java.util.Map; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; /** * LocalResponder */ public class LocalResponder extends AbstractHandler implements TransportSender { protected static final Log log = LogFactory.getLog(LocalResponder.class); - + + // fixed for Executing LocalTransport in MulthThread. private OutputStream out; public LocalResponder(OutputStream response) { -this.out = response; +this.out = response; } public void init(ConfigurationContext confContext, TransportOutDescription transportOut) @@ -95,38 +87,13 @@ public class LocalResponder extends Abst TransportUtils.writeMessage(msgContext, out); } } else { -if (/*(msgContext != null) &&*/ (msgContext.getOperationContext() != null) && -(msgContext.getOperationContext().getMessageContexts() != null)) { -MessageContext proxyInMessageContext = msgContext. - getOperationContext().getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN); - -if (proxyInMessageContext != null) { -MessageContext initialMessageContext = (MessageContext) proxyInMessageContext. - getProperty(LocalTransportReceiver.IN_MESSAGE_CONTEXT); - -if (initialMessageContext != null) { -handleResponse(msgContext, initialMessageContext); -} else { -out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT); - -if (out != null) { -TransportUtils.writeMessage(msgContext, out); -} else { -throw new AxisFault( -"Both the TO and Property MessageContext.TRANSPORT_OUT is Null, No where to send"); -} +out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT); -} -} +if (out != null) { +TransportUtils.writeMessage(msgContext, out); } else { -out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT); - -if (out != null) { -TransportUtils.writeMessage(msgContext, out); -} else { -throw new AxisFault( -"Both the TO and Property Message
svn commit: r1103313 - /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
Author: sagara Date: Sun May 15 10:51:02 2011 New Revision: 1103313 URL: http://svn.apache.org/viewvc?rev=1103313&view=rev Log: Temperately revert changes from Heshan for 1.6.0 release. Removed: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
svn commit: r1103606 - /axis/axis2/java/core/trunk/pom.xml
Author: sagara Date: Mon May 16 04:37:21 2011 New Revision: 1103606 URL: http://svn.apache.org/viewvc?rev=1103606&view=rev Log: Added my details as a developer. 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=1103606&r1=1103605&r2=1103606&view=diff == --- axis/axis2/java/core/trunk/pom.xml (original) +++ axis/axis2/java/core/trunk/pom.xml Mon May 16 04:37:21 2011 @@ -494,6 +494,12 @@ ruwan AT apache.org http://www.linkedin.com/in/ruwanlinton + + Sagara Gunathunga + sagara + sagara AT apache.org +WSO2 +
svn commit: r1103607 - /axis/axis2/java/core/branches/1_6/pom.xml
Author: sagara Date: Mon May 16 04:38:50 2011 New Revision: 1103607 URL: http://svn.apache.org/viewvc?rev=1103607&view=rev Log: Added my details as a developer. Modified: axis/axis2/java/core/branches/1_6/pom.xml Modified: axis/axis2/java/core/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1103607&r1=1103606&r2=1103607&view=diff == --- axis/axis2/java/core/branches/1_6/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/pom.xml Mon May 16 04:38:50 2011 @@ -494,6 +494,12 @@ ruwan AT apache.org http://www.linkedin.com/in/ruwanlinton + + Sagara Gunathunga + sagara + sagara AT apache.org +WSO2 +
svn commit: r1103760 - /axis/axis2/java/core/trunk/src/site/xdoc/siteHowTo.xml
Author: sagara Date: Mon May 16 15:02:26 2011 New Revision: 1103760 URL: http://svn.apache.org/viewvc?rev=1103760&view=rev Log: updated SiteHowTo guide Modified: axis/axis2/java/core/trunk/src/site/xdoc/siteHowTo.xml Modified: axis/axis2/java/core/trunk/src/site/xdoc/siteHowTo.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/xdoc/siteHowTo.xml?rev=1103760&r1=1103759&r2=1103760&view=diff == --- axis/axis2/java/core/trunk/src/site/xdoc/siteHowTo.xml (original) +++ axis/axis2/java/core/trunk/src/site/xdoc/siteHowTo.xml Mon May 16 15:02:26 2011 @@ -43,8 +43,8 @@ get a https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk";>commiter check out. Building the Site -cd to modules/documentation and type mvn install The built -site will be available under target/site. +During maven releases site should have been generated on target/site directory and no special action required. Further release process guide describes necessary steps to update Axis2 site with your new modifications. +In case if you want to generate site only you could run mvn site on root project of your local copy. FAQ How can I update a document in the site ?
svn commit: r1103763 - in /axis/axis2/java/core/branches/1_6: ./ src/site/xdoc/siteHowTo.xml
Author: sagara Date: Mon May 16 15:10:34 2011 New Revision: 1103763 URL: http://svn.apache.org/viewvc?rev=1103763&view=rev Log: Merged r1103760 updated SiteHowTo guide. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/src/site/xdoc/siteHowTo.xml Propchange: axis/axis2/java/core/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 16 15:10:34 2011 @@ -1 +1 @@ -/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013 +/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103760 Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/siteHowTo.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/siteHowTo.xml?rev=1103763&r1=1103762&r2=1103763&view=diff == --- axis/axis2/java/core/branches/1_6/src/site/xdoc/siteHowTo.xml (original) +++ axis/axis2/java/core/branches/1_6/src/site/xdoc/siteHowTo.xml Mon May 16 15:10:34 2011 @@ -43,8 +43,8 @@ get a https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk";>commiter check out. Building the Site -cd to modules/documentation and type mvn install The built -site will be available under target/site. +During maven releases site should have been generated on target/site directory and no special action required. Further release process guide describes necessary steps to update Axis2 site with your new modifications. +In case if you want to generate site only you could run mvn site on root project of your local copy. FAQ How can I update a document in the site ?
svn commit: r1104024 - in /axis/axis2/java/core/branches/1_6: release-notes.html src/site/xdoc/download.xml src/site/xdoc/index.xml
Author: sagara Date: Tue May 17 06:56:01 2011 New Revision: 1104024 URL: http://svn.apache.org/viewvc?rev=1104024&view=rev Log: updated for 1.6.0 release. Modified: axis/axis2/java/core/branches/1_6/release-notes.html axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml Modified: axis/axis2/java/core/branches/1_6/release-notes.html URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/release-notes.html?rev=1104024&r1=1104023&r2=1104024&view=diff == --- axis/axis2/java/core/branches/1_6/release-notes.html (original) +++ axis/axis2/java/core/branches/1_6/release-notes.html Tue May 17 06:56:01 2011 @@ -20,16 +20,20 @@ - Welcome to Apache Axis2 version @axisVersion@ + Welcome to Apache Axis2 version 1.6.0 -Welcome to Apache Axis2 version @axisVersion@ +Welcome to Apache Axis2 version 1.6.0 -@TODAY@ +May 17, 2011 Just over one and half years since the 1.5 release, we are very proud to -announce the release of Apache Axis2 version @axisVersion@. +announce the release of Apache Axis2 version 1.6.0. + +More than fifty issues were fixed for 1.6.0 release. Refer to the following filter +http://bit.ly/issues-fixed-for-1_6";>Issues fixed for the 1.6.0 release +to find all the issues fixed for the 1.6.0 release Downloads are available at: http://ws.apache.org/axis2/download.cgi @@ -45,7 +49,7 @@ WS-Trust (Apache Rahas), WS-Reliable Mes WS-Eventing (Apache Savan) will be available soon after the Apache Axis2 @axisVersion@ release. Please see these projects' own sites for further information. -Known Issues and Limitations in @axisVersion@ Release: +Known Issues and Limitations in 1.6.0 Release: - Please see JIRA We are striving for a simple and happy first time user experience as well as a @@ -85,7 +89,7 @@ Supported Specifications - Message Transmission Optimization Mechanism (MTOM) - XML Optimized Packaging (XOP) - SOAP with Attachments - - WSDL 1.1, including both SOAP and HTTP bindings + - WSDL 1.1, including both SOAP and HTTP bindings , WSDL 2.0 - WS-Addressing submission and 1.0 - WS-Policy - SAAJ 1.1 @@ -95,12 +99,16 @@ Transports - SMTP - JMS - TCP + - udp + - xmpp + +For more details refer http://ws.apache.org/commons/transport/";> Axis2 Transports project. Supported Data Bindings - Axis Data Binding (ADB) - XMLBeans - JibX - - JaxBRI (Experimental) + - JAXB Tools - WSDL2Java: Generate Java stubs and skeletons from a WSDL document. @@ -110,9 +118,6 @@ Tools - Maven2 Plugins - Web application for administering Apache Axis2 -Bugs marked as Resolved/Fixed for 1.6 Release: - - Follow the filter http://bit.ly/issues-fixed-for-1_6";>Issues fixed for the 1.6 release - + Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml?rev=1104024&r1=1104023&r2=1104024&view=diff == --- axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml (original) +++ axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml Tue May 17 06:56:01 2011 @@ -77,7 +77,7 @@ 1.6.0 -19 - Feb - 2011 +17 - May - 2011 1.6.0 Release (Mirrored) Binary Distribution Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml?rev=1104024&r1=1104023&r2=1104024&view=diff == --- axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml (original) +++ axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml Tue May 17 06:56:01 2011 @@ -35,7 +35,7 @@ here, you can visit the http://axis.apache.org/axis2/c/";>Apache Axis2/C Web site for Axis2/C implementation information. Apache Axis2, Axis2, Apache, the Apache feather logo, and the Apache Axis2 project logo are trademarks of The Apache Software Foundation. -February 19, 2011 - Apache Axis2/Java Version 1.6.0 Released! +May 17, 2011 - Apache Axis2/Java Version 1.6.0 Released! 1.6.0 is a major release of axis2 with many fixes and improvements to the core and all it's modules Refer to the following filter http://bit.ly/issues-fixed-for-1_6";>Issues fixed for the 1.6.0 release to find all the issues fixed for the 1.6.0 release December 19, 2010 - Apache Axis2/Java Version 1.5.4 Released!
svn commit: r1104063 [2/2] - in /axis/axis2/java/core/branches/1_6: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/clustering/ modules/codegen/ modules/corba/ modules/distribution/ m
Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml?rev=1104063&r1=1104062&r2=1104063&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml Tue May 17 08:52:40 2011 @@ -1,63 +1,62 @@ - - -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.examples -jaxws-version -1.6.1-SNAPSHOT -jar -Apache Axis2 -JAXWS Version Service - -src - - -resources - - - - -org.apache.maven.plugins -maven-compiler-plugin - -1.5 -1.5 - - - - - - -org.apache.axis2 -axis2-kernel -${project.version} - - - - -apache.snapshots -Apache Snapshot Repository -http://repository.apache.org/snapshots - -false - - - - + + +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.examples +jaxws-version +1.6.0 +jar +Apache Axis2 -JAXWS Version Service + +src + + +resources + + + + +org.apache.maven.plugins +maven-compiler-plugin + +1.5 +1.5 + + + + + + +org.apache.axis2 +axis2-kernel +${project.version} + + + + +apache.snapshots +Apache Snapshot Repository +http://repository.apache.org/snapshots + +false + + + + Modified: axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml?rev=1104063&r1=1104062&r2=1104063&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml Tue May 17 08:52:40 2011 @@ -22,16 +22,16 @@ org.apache.axis2 axis2-parent -1.6.1-SNAPSHOT +1.6.0 ../../parent/pom.xml version aar Apache Axis2 - Version Service - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6/modules/samples/version - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6/modules/samples/version - http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/version + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/tags/v1.6.0/modules/samples/version + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/tags/v1.6.0/modules/samples/version + http://svn.apache.org/viewvc/axis/axis2/java/core/tags/v1.6.0/modules/samples/version src Modified: axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml?rev=1104063&r1=1104062&r2=1104063&view=diff == --- axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml Tue May 17 08:52:40 2011 @@ -24,7 +24,7 @@ org.apache.axis2 axis2-parent -1.6.1-SNAPSHOT +1.6.0 ../parent/pom.xml scripting @@ -51,9 +51,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6/modules/scripting - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6/modules/scripting - http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/scripting + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/tags/v1.6.0/modules/scripting + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/tags/v1.6.0/modules/scripting + http://svn.apache.org/viewvc/axis
svn commit: r1104066 - /axis/axis2/java/core/tags/v1.6.0/
Author: sagara Date: Tue May 17 08:54:10 2011 New Revision: 1104066 URL: http://svn.apache.org/viewvc?rev=1104066&view=rev Log: [maven-scm] copy for tag v1.6.0 Added: axis/axis2/java/core/tags/v1.6.0/ (props changed) - copied from r1104064, axis/axis2/java/core/branches/1_6/ Propchange: axis/axis2/java/core/tags/v1.6.0/ -- --- svn:ignore (added) +++ svn:ignore Tue May 17 08:54:10 2011 @@ -0,0 +1,4 @@ +*.ipr +*.iml +*.iws +target Propchange: axis/axis2/java/core/tags/v1.6.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue May 17 08:54:10 2011 @@ -0,0 +1 @@ +/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103760
svn commit: r1104169 - /axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Author: sagara Date: Tue May 17 11:48:55 2011 New Revision: 1104169 URL: http://svn.apache.org/viewvc?rev=1104169&view=rev Log: Added 'samples/target' directories for exclusion. Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1104169&r1=1104168&r2=1104169&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Tue May 17 11:48:55 2011 @@ -152,6 +152,7 @@ **/*.iml +**/target/
svn commit: r1127571 - in /axis/axis2/java/transports/trunk/src/site: site.xml xdoc/download_index.xml xdoc/index.xml
Author: sagara Date: Wed May 25 15:48:58 2011 New Revision: 1127571 URL: http://svn.apache.org/viewvc?rev=1127571&view=rev Log: Add some missing entries. Modified: axis/axis2/java/transports/trunk/src/site/site.xml axis/axis2/java/transports/trunk/src/site/xdoc/download_index.xml axis/axis2/java/transports/trunk/src/site/xdoc/index.xml Modified: axis/axis2/java/transports/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/site.xml?rev=1127571&r1=1127570&r2=1127571&view=diff == --- axis/axis2/java/transports/trunk/src/site/site.xml (original) +++ axis/axis2/java/transports/trunk/src/site/site.xml Wed May 25 15:48:58 2011 @@ -24,7 +24,7 @@ -images/apache-synapse-banner.jpg +images/asfLogo.jpg http://www.apache.org @@ -42,7 +42,7 @@ http://www.apache.org/"/> http://ws.apache.org/"/> http://ws.apache.org/commons/"/> -http://ws.apache.org/axis2/"/> +http://axis.apache.org/axis2/java/core/"/> http://synapse.apache.org/"/> @@ -53,12 +53,13 @@ - - - - - - + + + + + + + Modified: axis/axis2/java/transports/trunk/src/site/xdoc/download_index.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/xdoc/download_index.xml?rev=1127571&r1=1127570&r2=1127571&view=diff == --- axis/axis2/java/transports/trunk/src/site/xdoc/download_index.xml (original) +++ axis/axis2/java/transports/trunk/src/site/xdoc/download_index.xml Wed May 25 15:48:58 2011 @@ -26,7 +26,7 @@ - + The Axis2 Transports team is proud to announce the availability of the 1.0.0 release on the 07th of December 2009. Modified: axis/axis2/java/transports/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/xdoc/index.xml?rev=1127571&r1=1127570&r2=1127571&view=diff == --- axis/axis2/java/transports/trunk/src/site/xdoc/index.xml (original) +++ axis/axis2/java/transports/trunk/src/site/xdoc/index.xml Wed May 25 15:48:58 2011 @@ -47,7 +47,8 @@ TCP Transport SMS Transport UDP Transport - XMPP Transport + XMPP Transport +
svn commit: r1127578 - in /axis/axis2/java/transports/trunk: ./ modules/all/ modules/base/ modules/http/ modules/jms/ modules/mail/ modules/sms/ modules/tcp/ modules/testkit/ modules/udp/ modules/xmpp
Author: sagara Date: Wed May 25 16:47:09 2011 New Revision: 1127578 URL: http://svn.apache.org/viewvc?rev=1127578&view=rev Log: Bounced version numbers as 1.6.X. Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml axis/axis2/java/transports/trunk/modules/base/pom.xml axis/axis2/java/transports/trunk/modules/http/pom.xml axis/axis2/java/transports/trunk/modules/jms/pom.xml axis/axis2/java/transports/trunk/modules/mail/pom.xml axis/axis2/java/transports/trunk/modules/sms/pom.xml axis/axis2/java/transports/trunk/modules/tcp/pom.xml axis/axis2/java/transports/trunk/modules/testkit/pom.xml axis/axis2/java/transports/trunk/modules/udp/pom.xml axis/axis2/java/transports/trunk/modules/xmpp/pom.xml axis/axis2/java/transports/trunk/pom.xml Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all/pom.xml?rev=1127578&r1=1127577&r2=1127578&view=diff == --- axis/axis2/java/transports/trunk/modules/all/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/all/pom.xml Wed May 25 16:47:09 2011 @@ -23,13 +23,13 @@ org.apache.axis2 axis2-transports -1.1.0-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml org.apache.axis2 axis2-transport-all -1.1.0-SNAPSHOT +1.6.0-SNAPSHOT bundle Axis2 Transport Apache Axis2 - Transport - All @@ -219,4 +219,4 @@ - \ No newline at end of file + Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=1127578&r1=1127577&r2=1127578&view=diff == --- axis/axis2/java/transports/trunk/modules/base/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/base/pom.xml Wed May 25 16:47:09 2011 @@ -26,7 +26,7 @@ org.apache.axis2 axis2-transports -1.1.0-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/transports/trunk/modules/http/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/http/pom.xml?rev=1127578&r1=1127577&r2=1127578&view=diff == --- axis/axis2/java/transports/trunk/modules/http/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/http/pom.xml Wed May 25 16:47:09 2011 @@ -25,7 +25,7 @@ org.apache.axis2 axis2-transports -1.1.0-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml axis2-transport-http-tests Modified: axis/axis2/java/transports/trunk/modules/jms/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/pom.xml?rev=1127578&r1=1127577&r2=1127578&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/jms/pom.xml Wed May 25 16:47:09 2011 @@ -26,7 +26,7 @@ org.apache.axis2 axis2-transports -1.1.0-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/transports/trunk/modules/mail/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/pom.xml?rev=1127578&r1=1127577&r2=1127578&view=diff == --- axis/axis2/java/transports/trunk/modules/mail/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/mail/pom.xml Wed May 25 16:47:09 2011 @@ -26,7 +26,7 @@ org.apache.axis2 axis2-transports -1.1.0-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/transports/trunk/modules/sms/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/sms/pom.xml?rev=1127578&r1=1127577&r2=1127578&view=diff == --- axis/axis2/java/transports/trunk/modules/sms/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/sms/pom.xml Wed May 25 16:47:09 2011 @@ -26,7 +26,7 @@ org.apache.axis2 axis2-transports -1.1.0-SNAPSHOT +1.6.0-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/transports/trunk/modules/tcp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/tcp/pom.xml?rev=1127578&r1=1127577&r2=1127578&view=diff == --- axis/axis2/java/transports/trunk/modules/tcp/pom.xml (original) +++ axis/
svn commit: r1128207 - in /axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test: ./ java/ java/org/ java/org/apache/ java/org/apache/axis2/ java/org/apache/axis2/maven2/ java/org/ap
Author: sagara Date: Fri May 27 09:10:46 2011 New Revision: 1128207 URL: http://svn.apache.org/viewvc?rev=1128207&view=rev Log: Added Testcase to test AarMojo. Added: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AbstractAarTest.java axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/AdditionalDir/ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/AdditionalDir/AdditionalFile.txt axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/aar-plugin-config-1.xml axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/aar-plugin-config-2.xml axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/services.xml axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/resources/simple.wsdl Added: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java?rev=1128207&view=auto == --- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java (added) +++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AarMojoTest.java Fri May 27 09:10:46 2011 @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.axis2.maven2.aar; + +import java.io.File; + +public class AarMojoTest extends AbstractAarTest { + + public void testAarMojoGoal() throws Exception { + + AarMojo mojo = (AarMojo) getAarMojoGoal("aar", + "target/test-classes/aar-plugin-config-1.xml"); + mojo.execute(); + String aarName = "target/axis2-aar-plugin-basic-test1.aar"; + assertTrue(" Can not find " + aarName, new File(aarName).exists()); + } + + public void testAarMojoGoalConfiguration() throws Exception { + + AarMojo mojo = (AarMojo) getAarMojoGoal("aar", + "target/test-classes/aar-plugin-config-2.xml"); + mojo.execute(); + String aarName = "target/axis2-aar-plugin-configuration-test1.aar"; + assertTrue(" Can not find " + aarName, new File(aarName).exists()); + } + +} Added: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AbstractAarTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AbstractAarTest.java?rev=1128207&view=auto == --- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/test/java/org/apache/axis2/maven2/aar/AbstractAarTest.java (added) +++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-mav
svn commit: r1129515 - /axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml
Author: sagara Date: Tue May 31 06:59:22 2011 New Revision: 1129515 URL: http://svn.apache.org/viewvc?rev=1129515&view=rev Log: Applied patch for RAMPART-326. Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml?rev=1129515&r1=1129514&r2=1129515&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml Tue May 31 06:59:22 2011 @@ -28,6 +28,9 @@ + + + @@ -37,6 +40,9 @@ + + + http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
svn commit: r1129552 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/developer-guide.xml
Author: sagara Date: Tue May 31 08:11:07 2011 New Revision: 1129552 URL: http://svn.apache.org/viewvc?rev=1129552&view=rev Log: Applied patch for RAMPART-327. Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/developer-guide.xml Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/developer-guide.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/developer-guide.xml?rev=1129552&r1=1129551&r2=1129552&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/developer-guide.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/developer-guide.xml Tue May 31 08:11:07 2011 @@ -36,9 +36,9 @@ Stack Download the source code. Anon Checkout http://svn.apache.org/repos/asf/webservices/rampart/trunk/java/";>http://svn.apache.org/repos/asf/webservices/rampart/trunk/java/ + href="http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/";>http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/ Committers https://svn.apache.org/repos/asf/webservices/rampart/trunk/java/";>https://svn.apache.org/repos/asf/webservices/rampart/trunk/java/ + href="https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/";>https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/ The Rampart project has 8 modules under it. They are:
svn commit: r1129556 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/documentation/src/site/xdoc/developer-guide.xml modules/rampart-mar/module.xml
Author: sagara Date: Tue May 31 08:17:46 2011 New Revision: 1129556 URL: http://svn.apache.org/viewvc?rev=1129556&view=rev Log: Merged r1129515 and 1129552 to the 1.6 branch. Modified: axis/axis2/java/rampart/branches/1_6/ (props changed) axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml Propchange: axis/axis2/java/rampart/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 31 08:17:46 2011 @@ -1 +1 @@ -/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686 +/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552 Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml?rev=1129556&r1=1129555&r2=1129556&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml Tue May 31 08:17:46 2011 @@ -36,9 +36,9 @@ Stack Download the source code. Anon Checkout http://svn.apache.org/repos/asf/webservices/rampart/trunk/java/";>http://svn.apache.org/repos/asf/webservices/rampart/trunk/java/ + href="http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/";>http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/ Committers https://svn.apache.org/repos/asf/webservices/rampart/trunk/java/";>https://svn.apache.org/repos/asf/webservices/rampart/trunk/java/ + href="https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/";>https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/ The Rampart project has 8 modules under it. They are: Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml?rev=1129556&r1=1129555&r2=1129556&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml Tue May 31 08:17:46 2011 @@ -28,6 +28,9 @@ + + + @@ -37,6 +40,9 @@ + + + http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
svn commit: r1129584 - in /axis/axis2/java/rampart/branches/1_6: modules/rampart-samples/basic/build.xml modules/rampart-samples/policy/build.xml pom.xml
Author: sagara Date: Tue May 31 09:13:08 2011 New Revision: 1129584 URL: http://svn.apache.org/viewvc?rev=1129584&view=rev Log: Fixed some version numbers for 1.6.0 release. Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml axis/axis2/java/rampart/branches/1_6/pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml?rev=1129584&r1=1129583&r2=1129584&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml Tue May 31 09:13:08 2011 @@ -23,8 +23,8 @@ - - + + Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml?rev=1129584&r1=1129583&r2=1129584&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml Tue May 31 09:13:08 2011 @@ -24,9 +24,9 @@ - - - + + + Modified: axis/axis2/java/rampart/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1129584&r1=1129583&r2=1129584&view=diff == --- axis/axis2/java/rampart/branches/1_6/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/pom.xml Tue May 31 09:13:08 2011 @@ -411,7 +411,7 @@ ${project.version} ${project.version} -1.6.1-SNAPSHOT +1.6.0 1.2.11 1.5.11
svn commit: r1129639 - in /axis/axis2/java/transports/trunk: modules/all/pom.xml pom.xml
Author: sagara Date: Tue May 31 12:17:43 2011 New Revision: 1129639 URL: http://svn.apache.org/viewvc?rev=1129639&view=rev Log: Corrected tagBase and site location Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml axis/axis2/java/transports/trunk/pom.xml Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all/pom.xml?rev=1129639&r1=1129638&r2=1129639&view=diff == --- axis/axis2/java/transports/trunk/modules/all/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/all/pom.xml Tue May 31 12:17:43 2011 @@ -55,7 +55,7 @@ org.apache.maven.plugins maven-release-plugin - https://svn.apache.org/repos/asf/webservices/commons/tags/transport + https://svn.apache.org/repos/asf/axis/axis2/java/transports/tags Modified: axis/axis2/java/transports/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=1129639&r1=1129638&r2=1129639&view=diff == --- axis/axis2/java/transports/trunk/pom.xml (original) +++ axis/axis2/java/transports/trunk/pom.xml Tue May 31 12:17:43 2011 @@ -214,7 +214,7 @@ org.apache.maven.plugins maven-release-plugin - https://svn.apache.org/repos/asf/webservices/commons/tags/transport + https://svn.apache.org/repos/asf/axis/axis2/java/transports/tags false deploy -Prelease @@ -379,7 +379,7 @@ website - scpexe://people.apache.org/www/ws.apache.org/commons/transport + scpexe://people.apache.org/www/axis.apache.org/axis2/java/transports
svn commit: r1129647 - in /axis/axis2/java/transports/trunk: ./ modules/all/ modules/base/ modules/http/ modules/jms/ modules/mail/ modules/sms/ modules/tcp/ modules/testkit/ modules/udp/ modules/xmpp
Author: sagara Date: Tue May 31 12:35:24 2011 New Revision: 1129647 URL: http://svn.apache.org/viewvc?rev=1129647&view=rev Log: [maven-release-plugin] prepare branch 1.6 Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml axis/axis2/java/transports/trunk/modules/base/pom.xml axis/axis2/java/transports/trunk/modules/http/pom.xml axis/axis2/java/transports/trunk/modules/jms/pom.xml axis/axis2/java/transports/trunk/modules/mail/pom.xml axis/axis2/java/transports/trunk/modules/sms/pom.xml axis/axis2/java/transports/trunk/modules/tcp/pom.xml axis/axis2/java/transports/trunk/modules/testkit/pom.xml axis/axis2/java/transports/trunk/modules/udp/pom.xml axis/axis2/java/transports/trunk/modules/xmpp/pom.xml axis/axis2/java/transports/trunk/pom.xml Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all/pom.xml?rev=1129647&r1=1129646&r2=1129647&view=diff == --- axis/axis2/java/transports/trunk/modules/all/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/all/pom.xml Tue May 31 12:35:24 2011 @@ -17,8 +17,7 @@ ~ specific language governing permissions and limitations ~ 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 @@ -35,9 +34,9 @@ Apache Axis2 - Transport - All - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/all - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/all - http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all + http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/all @@ -46,7 +45,7 @@ release - + @@ -95,11 +94,11 @@ - - + + - + Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=1129647&r1=1129646&r2=1129647&view=diff == --- axis/axis2/java/transports/trunk/modules/base/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/base/pom.xml Tue May 31 12:35:24 2011 @@ -18,10 +18,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 @@ -37,9 +34,9 @@ bundle - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base - http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base + http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/base Modified: axis/axis2/java/transports/trunk/modules
svn commit: r1129703 - in /axis/axis2/java/transports/trunk: ./ modules/all/ modules/base/ modules/http/ modules/jms/ modules/mail/ modules/sms/ modules/tcp/ modules/testkit/ modules/udp/ modules/xmpp
Author: sagara Date: Tue May 31 14:31:31 2011 New Revision: 1129703 URL: http://svn.apache.org/viewvc?rev=1129703&view=rev Log: Revert the changes introduced by Maven release plug-in that failed during the branch creation goal. Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml axis/axis2/java/transports/trunk/modules/base/pom.xml axis/axis2/java/transports/trunk/modules/http/pom.xml axis/axis2/java/transports/trunk/modules/jms/pom.xml axis/axis2/java/transports/trunk/modules/mail/pom.xml axis/axis2/java/transports/trunk/modules/sms/pom.xml axis/axis2/java/transports/trunk/modules/tcp/pom.xml axis/axis2/java/transports/trunk/modules/testkit/pom.xml axis/axis2/java/transports/trunk/modules/udp/pom.xml axis/axis2/java/transports/trunk/modules/xmpp/pom.xml axis/axis2/java/transports/trunk/pom.xml Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all/pom.xml?rev=1129703&r1=1129702&r2=1129703&view=diff == --- axis/axis2/java/transports/trunk/modules/all/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/all/pom.xml Tue May 31 14:31:31 2011 @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ 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 @@ -34,9 +35,9 @@ Apache Axis2 - Transport - All - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all - http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/all + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/all + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/all + http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all @@ -45,7 +46,7 @@ release - + @@ -94,11 +95,11 @@ - - + + - + Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=1129703&r1=1129702&r2=1129703&view=diff == --- axis/axis2/java/transports/trunk/modules/base/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/base/pom.xml Tue May 31 14:31:31 2011 @@ -18,7 +18,10 @@ ~ 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 @@ -34,9 +37,9 @@ bundle - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base - http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/base + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base + http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base Modified: axis/axis2/java/transp
svn commit: r1129710 - in /axis/axis2/java/transports/trunk: ./ modules/all/ modules/base/ modules/http/ modules/jms/ modules/mail/ modules/sms/ modules/tcp/ modules/testkit/ modules/udp/ modules/xmpp
Author: sagara Date: Tue May 31 14:43:47 2011 New Revision: 1129710 URL: http://svn.apache.org/viewvc?rev=1129710&view=rev Log: [maven-release-plugin] prepare branch 1.6 Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml axis/axis2/java/transports/trunk/modules/base/pom.xml axis/axis2/java/transports/trunk/modules/http/pom.xml axis/axis2/java/transports/trunk/modules/jms/pom.xml axis/axis2/java/transports/trunk/modules/mail/pom.xml axis/axis2/java/transports/trunk/modules/sms/pom.xml axis/axis2/java/transports/trunk/modules/tcp/pom.xml axis/axis2/java/transports/trunk/modules/testkit/pom.xml axis/axis2/java/transports/trunk/modules/udp/pom.xml axis/axis2/java/transports/trunk/modules/xmpp/pom.xml axis/axis2/java/transports/trunk/pom.xml Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all/pom.xml?rev=1129710&r1=1129709&r2=1129710&view=diff == --- axis/axis2/java/transports/trunk/modules/all/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/all/pom.xml Tue May 31 14:43:47 2011 @@ -17,8 +17,7 @@ ~ specific language governing permissions and limitations ~ 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 @@ -35,9 +34,9 @@ Apache Axis2 - Transport - All - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/all - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/all - http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all + http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/all @@ -46,7 +45,7 @@ release - + @@ -95,11 +94,11 @@ - - + + - + Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=1129710&r1=1129709&r2=1129710&view=diff == --- axis/axis2/java/transports/trunk/modules/base/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/base/pom.xml Tue May 31 14:43:47 2011 @@ -18,10 +18,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 @@ -37,9 +34,9 @@ bundle - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base - http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base + http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/base Modified: axis/axis2/java/transports/trunk/modules
svn commit: r1129711 - /axis/axis2/java/transports/branches/1.6/
Author: sagara Date: Tue May 31 14:44:13 2011 New Revision: 1129711 URL: http://svn.apache.org/viewvc?rev=1129711&view=rev Log: [maven-release-plugin] copy for branch 1.6 Added: axis/axis2/java/transports/branches/1.6/ - copied from r1129710, axis/axis2/java/transports/trunk/
svn commit: r1129712 - in /axis/axis2/java/transports/trunk: ./ modules/all/ modules/base/ modules/http/ modules/jms/ modules/mail/ modules/sms/ modules/tcp/ modules/testkit/ modules/udp/ modules/xmpp
Author: sagara Date: Tue May 31 14:44:56 2011 New Revision: 1129712 URL: http://svn.apache.org/viewvc?rev=1129712&view=rev Log: [maven-release-plugin] prepare release 1.6 Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml axis/axis2/java/transports/trunk/modules/base/pom.xml axis/axis2/java/transports/trunk/modules/http/pom.xml axis/axis2/java/transports/trunk/modules/jms/pom.xml axis/axis2/java/transports/trunk/modules/mail/pom.xml axis/axis2/java/transports/trunk/modules/sms/pom.xml axis/axis2/java/transports/trunk/modules/tcp/pom.xml axis/axis2/java/transports/trunk/modules/testkit/pom.xml axis/axis2/java/transports/trunk/modules/udp/pom.xml axis/axis2/java/transports/trunk/modules/xmpp/pom.xml axis/axis2/java/transports/trunk/pom.xml Modified: axis/axis2/java/transports/trunk/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all/pom.xml?rev=1129712&r1=1129711&r2=1129712&view=diff == --- axis/axis2/java/transports/trunk/modules/all/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/all/pom.xml Tue May 31 14:44:56 2011 @@ -22,21 +22,21 @@ org.apache.axis2 axis2-transports -1.6.0-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml org.apache.axis2 axis2-transport-all -1.6.0-SNAPSHOT +1.7.0-SNAPSHOT bundle Axis2 Transport Apache Axis2 - Transport - All - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all - http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/all + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/all + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/all + http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/all Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=1129712&r1=1129711&r2=1129712&view=diff == --- axis/axis2/java/transports/trunk/modules/base/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/base/pom.xml Tue May 31 14:44:56 2011 @@ -23,7 +23,7 @@ org.apache.axis2 axis2-transports -1.6.0-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml @@ -34,9 +34,9 @@ bundle - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base - http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/base + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/base + http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base Modified: axis/axis2/java/transports/trunk/modules/http/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/http/pom.xml?rev=1129712&r1=1129711&r2=1129712&view=diff == --- axis/axis2/java/transports/trunk/modules/http/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/http/pom.xml Tue May 31 14:44:56 2011 @@ -24,7 +24,7 @@ org.apache.axis2 axis2-transports -1.6.0-SNAPSHOT +1.7.0-SNAPSHOT ../../pom.xml axis2-transport-http-tests @@ -33,9 +33,9 @@ jar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/http - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/http - http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/http + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/http + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/http + http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/http Modified: axis/axis2/java/transports/trunk/modules/jms/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/pom.xml?rev=1129712&r1=1129711&r2=1129712&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/pom.xml (original) +++ axis
svn commit: r1130020 - in /axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download: 1.5.1/download.xml 1.6.0/download.xml
Author: sagara Date: Wed Jun 1 06:58:30 2011 New Revision: 1130020 URL: http://svn.apache.org/viewvc?rev=1130020&view=rev Log: Corrected syntax error. Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1130020&r1=1130019&r2=1130020&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml Wed Jun 1 06:58:30 2011 @@ -96,7 +96,7 @@ Other mirrors: [if-any backup] [for backup][backup] (backup)[end] [end] -You may also consult the http://www.apache.org/mirrors/";>complete list of mirrors +You may also consult the http://www.apache.org/mirrors/";>complete list of mirrors . Note: when downloading from a mirror please check the http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.xml?rev=1130020&r1=1130019&r2=1130020&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.xml Wed Jun 1 06:58:30 2011 @@ -96,7 +96,7 @@ Other mirrors: [if-any backup] [for backup][backup] (backup)[end] [end] -You may also consult the http://www.apache.org/mirrors/";>complete list of mirrors +You may also consult the http://www.apache.org/mirrors/";>complete list of mirrors . Note: when downloading from a mirror please check the
svn commit: r1130023 [1/3] - in /axis/axis2/java/rampart/branches/1_6: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/r
Author: sagara Date: Wed Jun 1 07:04:56 2011 New Revision: 1130023 URL: http://svn.apache.org/viewvc?rev=1130023&view=rev Log: [maven-release-plugin] prepare release v1.6.0 Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_6/pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1130023&r1=1130022&r2=1130023&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Wed Jun 1 07:04:56 2011 @@ -1,133 +1,133 @@ - - - - - -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";> - - -org.apache.rampart -rampart-project -1.6.0-SNAPSHOT -../../pom.xml - -4.0.0 -rampart-dist -pom -Rampart - Distribution - - - - -org.apache.maven.plugins -maven-antrun-plugin -1.1 - - -build-javadoc -package - - - - - - - - - - - - - - - - - - - - -run - - - - - -org.apache.maven.plugins -maven-assembly-plugin - - -distribution-package -package - -single - - - -bin.xml -src.xml - - - - - - - - - - -org.apache.rampart -rampart -${project.version} -mar - - -org.apache.rampart -rahas -${project.version} -mar - - -org.apache.rampart -rampart-core -${project.version} - - -org.apache.rampart -rampart-policy -${project.version} - - -org.apache.rampart -rampart-trust -${project.version} - - -bouncycastle -bcprov-jdk14 -${bcprov.jdk14.version} - - -bouncycastle -bcprov-jdk15 -${bcprov.jdk15.version} - - - + + + + + +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";> + + +org.apache.rampart +rampart-project +1.6.0 +../../pom.xml + +4.0.0 +rampart-dist +pom +Rampart - Distribution + + + + +org.apache.maven.plugins +maven-antrun-plugin +1.1 + +
svn commit: r1130024 - /axis/axis2/java/rampart/tags/v1.6.0/
Author: sagara Date: Wed Jun 1 07:05:15 2011 New Revision: 1130024 URL: http://svn.apache.org/viewvc?rev=1130024&view=rev Log: [maven-scm] copy for tag v1.6.0 Added: axis/axis2/java/rampart/tags/v1.6.0/ (props changed) - copied from r1130023, axis/axis2/java/rampart/branches/1_6/ Propchange: axis/axis2/java/rampart/tags/v1.6.0/ -- --- svn:ignore (added) +++ svn:ignore Wed Jun 1 07:05:15 2011 @@ -0,0 +1 @@ +target Propchange: axis/axis2/java/rampart/tags/v1.6.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Jun 1 07:05:15 2011 @@ -0,0 +1 @@ +/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552
svn commit: r1130025 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampart
Author: sagara Date: Wed Jun 1 07:05:27 2011 New Revision: 1130025 URL: http://svn.apache.org/viewvc?rev=1130025&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_6/pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1130025&r1=1130024&r2=1130025&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Wed Jun 1 07:05:27 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml?rev=1130025&r1=1130024&r2=1130025&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml Wed Jun 1 07:05:27 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml?rev=1130025&r1=1130024&r2=1130025&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml Wed Jun 1 07:05:27 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1130025&r1=1130024&r2=1130025&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml Wed Jun 1 07:05:27 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml?rev=1130025&r1=1130024&r2=1130025&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml Wed Jun 1 07:05:27 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.6.0 + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_6 - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.6.0 + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_6 - http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.6.0 + http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6 Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/ra
svn commit: r1130104 - in /axis/axis2/java/transports/branches/1.6: pom.xml src/site/xdoc/download.xml src/site/xdoc/download_index.xml src/site/xdoc/index.xml
Author: sagara Date: Wed Jun 1 11:30:34 2011 New Revision: 1130104 URL: http://svn.apache.org/viewvc?rev=1130104&view=rev Log: Prepared for 1.6.0 release. Modified: axis/axis2/java/transports/branches/1.6/pom.xml axis/axis2/java/transports/branches/1.6/src/site/xdoc/download.xml axis/axis2/java/transports/branches/1.6/src/site/xdoc/download_index.xml axis/axis2/java/transports/branches/1.6/src/site/xdoc/index.xml Modified: axis/axis2/java/transports/branches/1.6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/pom.xml?rev=1130104&r1=1130103&r2=1130104&view=diff == --- axis/axis2/java/transports/branches/1.6/pom.xml (original) +++ axis/axis2/java/transports/branches/1.6/pom.xml Wed Jun 1 11:30:34 2011 @@ -450,7 +450,7 @@ -1.7.0-SNAPSHOT +1.6.0 false Modified: axis/axis2/java/transports/branches/1.6/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/src/site/xdoc/download.xml?rev=1130104&r1=1130103&r2=1130104&view=diff == --- axis/axis2/java/transports/branches/1.6/src/site/xdoc/download.xml (original) +++ axis/axis2/java/transports/branches/1.6/src/site/xdoc/download.xml Wed Jun 1 11:30:34 2011 @@ -3,11 +3,346 @@ - Axis2 Transports 1.0.0 Release + Axis2 Transports Releases + +Axis2 Transports 1.6.0 Release + + + + + + +Distribution Name + + + Description + + + Download + + + Source + + + + + Standard Binary + Distribution + + + This is the complete version of Apache Axis2 Transports + + + axis2-transport-all-1.6.0.jar + (http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-all-1.6.0.jar.md5"; + class="externalLink" + title="http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-all-1.6.0.jar.md5";>MD5 http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-all-1.6.0.jar.sha"; + class="externalLink" + title="http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-all-1.6.0.jar.sha";>SHA1 http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-all-1.6.0.jar.asc"; + class="externalLink" + title="http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-all-1.6.0.jar.asc";>PGP) + + + axis2-transports-1.6.0-src-zip.jar + (http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transports-1.6.0-src.zip.md5"; + class="externalLink" + title="http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transports-1.6.0-src.zip.md5";>MD5 http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transports-1.6.0-src.zip.sha"; + class="externalLink" + title="http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transports-1.6.0-src.zip.sha";>SHA1 http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transports-1.6.0-src.zip.asc"; + class="externalLink" + title="http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transports-1.6.0-src.zip.asc";>PGP) + + + + + + JMS Transport + + + The Axis2 JMS transport implementation + + + axis2-transport-jms-1.6.0.jar + (http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-jms-1.6.0.jar.md5"; + class="externalLink" + title="http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-jms-1.6.0.jar.md5";>MD5 http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-jms-1.6.0.jar.sha"; + class="externalLink" + title="http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-jms-1.6.0.jar.sha";>SHA1 http://www.apache.org/dist/axis/axis2/java/transport/1.6.0/axis2-transport-jms-1.6.0.jar.asc"; + class="externalLink" + title="http://www.a
svn commit: r1130108 - in /axis/axis2/java/transports/branches/1.6: ./ modules/all/ modules/base/ modules/http/ modules/jms/ modules/mail/ modules/sms/ modules/tcp/ modules/testkit/ modules/udp/ modul
Author: sagara Date: Wed Jun 1 11:48:26 2011 New Revision: 1130108 URL: http://svn.apache.org/viewvc?rev=1130108&view=rev Log: [maven-release-plugin] prepare release v1.6.0 Modified: axis/axis2/java/transports/branches/1.6/modules/all/pom.xml axis/axis2/java/transports/branches/1.6/modules/base/pom.xml axis/axis2/java/transports/branches/1.6/modules/http/pom.xml axis/axis2/java/transports/branches/1.6/modules/jms/pom.xml axis/axis2/java/transports/branches/1.6/modules/mail/pom.xml axis/axis2/java/transports/branches/1.6/modules/sms/pom.xml axis/axis2/java/transports/branches/1.6/modules/tcp/pom.xml axis/axis2/java/transports/branches/1.6/modules/testkit/pom.xml axis/axis2/java/transports/branches/1.6/modules/udp/pom.xml axis/axis2/java/transports/branches/1.6/modules/xmpp/pom.xml axis/axis2/java/transports/branches/1.6/pom.xml Modified: axis/axis2/java/transports/branches/1.6/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/all/pom.xml?rev=1130108&r1=1130107&r2=1130108&view=diff == --- axis/axis2/java/transports/branches/1.6/modules/all/pom.xml (original) +++ axis/axis2/java/transports/branches/1.6/modules/all/pom.xml Wed Jun 1 11:48:26 2011 @@ -22,21 +22,21 @@ org.apache.axis2 axis2-transports -1.6.0-SNAPSHOT +1.6.0 ../../pom.xml org.apache.axis2 axis2-transport-all -1.6.0-SNAPSHOT +1.6.0 bundle Axis2 Transport Apache Axis2 - Transport - All - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all - http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/all + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/all + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/all + http://svn.apache.org/viewvc/axis/axis2/java/transports/tags/v1.6.0/modules/all Modified: axis/axis2/java/transports/branches/1.6/modules/base/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/base/pom.xml?rev=1130108&r1=1130107&r2=1130108&view=diff == --- axis/axis2/java/transports/branches/1.6/modules/base/pom.xml (original) +++ axis/axis2/java/transports/branches/1.6/modules/base/pom.xml Wed Jun 1 11:48:26 2011 @@ -23,7 +23,7 @@ org.apache.axis2 axis2-transports -1.6.0-SNAPSHOT +1.6.0 ../../pom.xml @@ -34,9 +34,9 @@ bundle - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base - http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/base + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/base + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/base + http://svn.apache.org/viewvc/axis/axis2/java/transports/tags/v1.6.0/modules/base Modified: axis/axis2/java/transports/branches/1.6/modules/http/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/http/pom.xml?rev=1130108&r1=1130107&r2=1130108&view=diff == --- axis/axis2/java/transports/branches/1.6/modules/http/pom.xml (original) +++ axis/axis2/java/transports/branches/1.6/modules/http/pom.xml Wed Jun 1 11:48:26 2011 @@ -24,7 +24,7 @@ org.apache.axis2 axis2-transports -1.6.0-SNAPSHOT +1.6.0 ../../pom.xml axis2-transport-http-tests @@ -33,9 +33,9 @@ jar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/http - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/http - http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/http + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/http + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/http + http://svn.apache.org/viewvc/axis/axis2/java/transports/tags/v1.6.0/modules/http Modified: axis/axis2/java/transports/branches/1.6/modules/jms/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/jms/pom.xml?rev
svn commit: r1130109 - /axis/axis2/java/transports/tags/v1.6.0/
Author: sagara Date: Wed Jun 1 11:48:40 2011 New Revision: 1130109 URL: http://svn.apache.org/viewvc?rev=1130109&view=rev Log: [maven-release-plugin] copy for tag v1.6.0 Added: axis/axis2/java/transports/tags/v1.6.0/ - copied from r1130108, axis/axis2/java/transports/branches/1.6/
svn commit: r1130110 - in /axis/axis2/java/transports/branches/1.6: ./ modules/all/ modules/base/ modules/http/ modules/jms/ modules/mail/ modules/sms/ modules/tcp/ modules/testkit/ modules/udp/ modul
Author: sagara Date: Wed Jun 1 11:48:51 2011 New Revision: 1130110 URL: http://svn.apache.org/viewvc?rev=1130110&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: axis/axis2/java/transports/branches/1.6/modules/all/pom.xml axis/axis2/java/transports/branches/1.6/modules/base/pom.xml axis/axis2/java/transports/branches/1.6/modules/http/pom.xml axis/axis2/java/transports/branches/1.6/modules/jms/pom.xml axis/axis2/java/transports/branches/1.6/modules/mail/pom.xml axis/axis2/java/transports/branches/1.6/modules/sms/pom.xml axis/axis2/java/transports/branches/1.6/modules/tcp/pom.xml axis/axis2/java/transports/branches/1.6/modules/testkit/pom.xml axis/axis2/java/transports/branches/1.6/modules/udp/pom.xml axis/axis2/java/transports/branches/1.6/modules/xmpp/pom.xml axis/axis2/java/transports/branches/1.6/pom.xml Modified: axis/axis2/java/transports/branches/1.6/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/all/pom.xml?rev=1130110&r1=1130109&r2=1130110&view=diff == --- axis/axis2/java/transports/branches/1.6/modules/all/pom.xml (original) +++ axis/axis2/java/transports/branches/1.6/modules/all/pom.xml Wed Jun 1 11:48:51 2011 @@ -22,21 +22,21 @@ org.apache.axis2 axis2-transports -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml org.apache.axis2 axis2-transport-all -1.6.0 +1.6.1-SNAPSHOT bundle Axis2 Transport Apache Axis2 - Transport - All - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/all - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/all - http://svn.apache.org/viewvc/axis/axis2/java/transports/tags/v1.6.0/modules/all + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/all + http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/all Modified: axis/axis2/java/transports/branches/1.6/modules/base/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/base/pom.xml?rev=1130110&r1=1130109&r2=1130110&view=diff == --- axis/axis2/java/transports/branches/1.6/modules/base/pom.xml (original) +++ axis/axis2/java/transports/branches/1.6/modules/base/pom.xml Wed Jun 1 11:48:51 2011 @@ -23,7 +23,7 @@ org.apache.axis2 axis2-transports -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml @@ -34,9 +34,9 @@ bundle - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/base - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/base - http://svn.apache.org/viewvc/axis/axis2/java/transports/tags/v1.6.0/modules/base + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/base + http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/base Modified: axis/axis2/java/transports/branches/1.6/modules/http/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/http/pom.xml?rev=1130110&r1=1130109&r2=1130110&view=diff == --- axis/axis2/java/transports/branches/1.6/modules/http/pom.xml (original) +++ axis/axis2/java/transports/branches/1.6/modules/http/pom.xml Wed Jun 1 11:48:51 2011 @@ -24,7 +24,7 @@ org.apache.axis2 axis2-transports -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml axis2-transport-http-tests @@ -33,9 +33,9 @@ jar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/http - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/tags/v1.6.0/modules/http - http://svn.apache.org/viewvc/axis/axis2/java/transports/tags/v1.6.0/modules/http + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/http + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/branches/1.6/modules/http + http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/http Modified: axis/axis2/java/transports/branches/1.6/modules/jms/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/modules/jms/pom.xm
svn commit: r1130454 - /axis/axis2/java/rampart/branches/1_6/pom.xml
Author: sagara Date: Thu Jun 2 09:45:47 2011 New Revision: 1130454 URL: http://svn.apache.org/viewvc?rev=1130454&view=rev Log: Updated to next Axis2 snapshot version. Modified: axis/axis2/java/rampart/branches/1_6/pom.xml Modified: axis/axis2/java/rampart/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1130454&r1=1130453&r2=1130454&view=diff == --- axis/axis2/java/rampart/branches/1_6/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/pom.xml Thu Jun 2 09:45:47 2011 @@ -411,7 +411,7 @@ ${project.version} ${project.version} -1.6.0 +1.6.1-SNAPSHOT 1.2.11 1.5.11
svn commit: r1130455 - /axis/axis2/java/transports/branches/1.6/pom.xml
Author: sagara Date: Thu Jun 2 09:47:30 2011 New Revision: 1130455 URL: http://svn.apache.org/viewvc?rev=1130455&view=rev Log: Updated to next Axis2 snapshot version. Modified: axis/axis2/java/transports/branches/1.6/pom.xml Modified: axis/axis2/java/transports/branches/1.6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/branches/1.6/pom.xml?rev=1130455&r1=1130454&r2=1130455&view=diff == --- axis/axis2/java/transports/branches/1.6/pom.xml (original) +++ axis/axis2/java/transports/branches/1.6/pom.xml Thu Jun 2 09:47:30 2011 @@ -450,7 +450,7 @@ -1.6.0 +1.6.1-SNAPSHOT false
svn commit: r1130464 - in /axis/axis2/java/sandesha/branches/1_6: pom.xml src/site/xdoc/download.xml.vm
Author: sagara Date: Thu Jun 2 10:15:08 2011 New Revision: 1130464 URL: http://svn.apache.org/viewvc?rev=1130464&view=rev Log: Prepared for 1.6.0 release. Modified: axis/axis2/java/sandesha/branches/1_6/pom.xml axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm Modified: axis/axis2/java/sandesha/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/pom.xml?rev=1130464&r1=1130463&r2=1130464&view=diff == --- axis/axis2/java/sandesha/branches/1_6/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/pom.xml Thu Jun 2 10:15:08 2011 @@ -436,8 +436,8 @@ -1.6.1-SNAPSHOT -1.6.0-SNAPSHOT +1.6.0 +1.6.0 1.2.11 2.0.5 1.1.1 Modified: axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm?rev=1130464&r1=1130463&r2=1130464&view=diff == --- axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm (original) +++ axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm Thu Jun 2 10:15:08 2011 @@ -40,6 +40,21 @@ the binay distribution and the source di Description Compatible Axis2 version + 1.6.0Release + Source Distribution + zip + http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-src.zip.md5"; class="externalLink" title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-src.zip.md5";>MD5 + http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-src.zip.asc"; class="externalLink" title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-src.zip.asc";>PGP + + Binary Distribution + zip + http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-bin.zip.md5"; class="externalLink" title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-bin.zip.md5";>MD5 + http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-bin.zip.asc"; class="externalLink" title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-bin.zip.asc";>PGP + +02 - Jun - 2011 +1.6.0 Release (Mirrored) +1.6.0 + 1.4Release Source Distribution zip
svn commit: r1130487 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/client/ modules/core/ modules/distribution/ modules/interop/ modules/mar/ modules/persistence/ modules/policy/ modules/ramp
Author: sagara Date: Thu Jun 2 10:46:21 2011 New Revision: 1130487 URL: http://svn.apache.org/viewvc?rev=1130487&view=rev Log: [maven-release-plugin] prepare release v1.6.0 Modified: axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/rampart-integration/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/resource-bundle/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/samples/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/tests/pom.xml axis/axis2/java/sandesha/branches/1_6/pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml?rev=1130487&r1=1130486&r2=1130487&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml Thu Jun 2 10:46:21 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.0-SNAPSHOT +1.6.0 ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/client - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/client - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/client + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/client + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/client + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/tags/v1.6.0/modules/client http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml?rev=1130487&r1=1130486&r2=1130487&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml Thu Jun 2 10:46:21 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.0-SNAPSHOT +1.6.0 ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/core - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/core - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/core + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/core + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/tags/v1.6.0/modules/core http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml?rev=1130487&r1=1130486&r2=1130487&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml Thu Jun 2 10:46:21 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.0-SNAPSHOT +1.6.0 ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/distribution - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/distribution - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/distribution + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/distribution + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/tags/v1.6.0/modules/distribution http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/
svn commit: r1130488 - /axis/axis2/java/sandesha/tags/v1.6.0/
Author: sagara Date: Thu Jun 2 10:46:37 2011 New Revision: 1130488 URL: http://svn.apache.org/viewvc?rev=1130488&view=rev Log: [maven-scm] copy for tag v1.6.0 Added: axis/axis2/java/sandesha/tags/v1.6.0/ (props changed) - copied from r1130487, axis/axis2/java/sandesha/branches/1_6/ Propchange: axis/axis2/java/sandesha/tags/v1.6.0/ -- --- svn:ignore (added) +++ svn:ignore Thu Jun 2 10:46:37 2011 @@ -0,0 +1 @@ +target Propchange: axis/axis2/java/sandesha/tags/v1.6.0/ -- svn:mergeinfo = /axis/axis2/java/sandesha/trunk:1081570,1098145
svn commit: r1130489 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/client/ modules/core/ modules/distribution/ modules/interop/ modules/mar/ modules/persistence/ modules/policy/ modules/ramp
Author: sagara Date: Thu Jun 2 10:46:50 2011 New Revision: 1130489 URL: http://svn.apache.org/viewvc?rev=1130489&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/rampart-integration/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/resource-bundle/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/samples/pom.xml axis/axis2/java/sandesha/branches/1_6/modules/tests/pom.xml axis/axis2/java/sandesha/branches/1_6/pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml?rev=1130489&r1=1130488&r2=1130489&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml Thu Jun 2 10:46:50 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/client - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/client - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/tags/v1.6.0/modules/client + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/client + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/client + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/client http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml?rev=1130489&r1=1130488&r2=1130489&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml Thu Jun 2 10:46:50 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/core - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/core - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/tags/v1.6.0/modules/core + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/core + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/core + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml?rev=1130489&r1=1130488&r2=1130489&view=diff == --- axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml Thu Jun 2 10:46:50 2011 @@ -21,7 +21,7 @@ org.apache.sandesha2 sandesha2-parent -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml @@ -33,9 +33,9 @@ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/distribution - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/tags/v1.6.0/modules/distribution - http://svn.apache.org/viewvc/axis/axis2/java/sandesha/tags/v1.6.0/modules/distribution + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/distribution + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_6/modules/distribution + http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution http://axis.apache.org/axis2/java/sandesha/ Modified: axis/axis2/ja
svn commit: r1130978 - /axis/axis2/java/sandesha/branches/1_6/pom.xml
Author: sagara Date: Fri Jun 3 10:42:53 2011 New Revision: 1130978 URL: http://svn.apache.org/viewvc?rev=1130978&view=rev Log: Updated Axis2 and Rampart SNAPSHOT versions. Modified: axis/axis2/java/sandesha/branches/1_6/pom.xml Modified: axis/axis2/java/sandesha/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/pom.xml?rev=1130978&r1=1130977&r2=1130978&view=diff == --- axis/axis2/java/sandesha/branches/1_6/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_6/pom.xml Fri Jun 3 10:42:53 2011 @@ -436,8 +436,8 @@ -1.6.0 -1.6.0 +1.6.1-SNAPSHOT +1.6.1-SNAPSHOT 1.2.11 2.0.5 1.1.1
svn commit: r1132534 - /axis/axis2/java/rampart/tags/v1.6.0/
Author: sagara Date: Mon Jun 6 06:56:59 2011 New Revision: 1132534 URL: http://svn.apache.org/viewvc?rev=1132534&view=rev Log: Tag deleted due to release vote fail. Removed: axis/axis2/java/rampart/tags/v1.6.0/
svn commit: r1132548 - in /axis/axis2/java/rampart/trunk: legal/bcprov-LICENSE.txt legal/commons-lang-LICENSE.txt release-docs/ChangeLog.txt release-docs/README.txt release-docs/release-notes.html
Author: sagara Date: Mon Jun 6 08:38:03 2011 New Revision: 1132548 URL: http://svn.apache.org/viewvc?rev=1132548&view=rev Log: Added missing license files and updated release docs. Added: axis/axis2/java/rampart/trunk/legal/bcprov-LICENSE.txt axis/axis2/java/rampart/trunk/legal/commons-lang-LICENSE.txt Modified: axis/axis2/java/rampart/trunk/release-docs/ChangeLog.txt axis/axis2/java/rampart/trunk/release-docs/README.txt axis/axis2/java/rampart/trunk/release-docs/release-notes.html Added: axis/axis2/java/rampart/trunk/legal/bcprov-LICENSE.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/legal/bcprov-LICENSE.txt?rev=1132548&view=auto == --- axis/axis2/java/rampart/trunk/legal/bcprov-LICENSE.txt (added) +++ axis/axis2/java/rampart/trunk/legal/bcprov-LICENSE.txt Mon Jun 6 08:38:03 2011 @@ -0,0 +1,19 @@ +Copyright (c) 2000-2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software +and associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + Added: axis/axis2/java/rampart/trunk/legal/commons-lang-LICENSE.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/legal/commons-lang-LICENSE.txt?rev=1132548&view=auto == --- axis/axis2/java/rampart/trunk/legal/commons-lang-LICENSE.txt (added) +++ axis/axis2/java/rampart/trunk/legal/commons-lang-LICENSE.txt Mon Jun 6 08:38:03 2011 @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfac
svn commit: r1132557 - in /axis/axis2/java/rampart/branches/1_6: ./ legal/bcprov-LICENSE.txt legal/commons-lang-LICENSE.txt release-docs/ChangeLog.txt release-docs/README.txt release-docs/release-note
Author: sagara Date: Mon Jun 6 09:15:38 2011 New Revision: 1132557 URL: http://svn.apache.org/viewvc?rev=1132557&view=rev Log: Merged r1132548 to the 1.6 branch. Added: axis/axis2/java/rampart/branches/1_6/legal/bcprov-LICENSE.txt - copied unchanged from r1132548, axis/axis2/java/rampart/trunk/legal/bcprov-LICENSE.txt axis/axis2/java/rampart/branches/1_6/legal/commons-lang-LICENSE.txt - copied unchanged from r1132548, axis/axis2/java/rampart/trunk/legal/commons-lang-LICENSE.txt Modified: axis/axis2/java/rampart/branches/1_6/ (props changed) axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt axis/axis2/java/rampart/branches/1_6/release-docs/README.txt axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html Propchange: axis/axis2/java/rampart/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 6 09:15:38 2011 @@ -1 +1 @@ -/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278 +/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548 Modified: axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt?rev=1132557&r1=1132556&r2=1132557&view=diff == --- axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt (original) +++ axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt Mon Jun 6 09:15:38 2011 @@ -1,7 +1,7 @@ This file contains a listing of all Jira issues that have been closed for a given release. -Release 1.6.0 - 01 Jun 2011 +Release 1.6.0 - 06 Jun 2011 === ** Bug * [RAMPART-327] - SVN locations mentioned in the developer guide are obsoleted Modified: axis/axis2/java/rampart/branches/1_6/release-docs/README.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/release-docs/README.txt?rev=1132557&r1=1132556&r2=1132557&view=diff == --- axis/axis2/java/rampart/branches/1_6/release-docs/README.txt (original) +++ axis/axis2/java/rampart/branches/1_6/release-docs/README.txt Mon Jun 6 09:15:38 2011 @@ -1,5 +1,5 @@ == -Apache Rampart-1.6.0 build (Jun 01, 2011) +Apache Rampart-1.6.0 build (Jun 06, 2011) http://axis.apache.org/axis2/java/rampart -- @@ -13,8 +13,8 @@ lib - This directory contains all t release. -rampart-1.5.1.mar - WS-Security and WS-SecureConversation support for Axis2 -rahas-1.5.1.mar - STS module - to be used to add STS operations to a service +rampart-1.6.0.mar - WS-Security and WS-SecureConversation support for Axis2 +rahas-1.6.0.mar - STS module - to be used to add STS operations to a service samples - This contains samples on using Apache Rampart and configuring different components to carryout different WS-Sec* operations. Modified: axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html?rev=1132557&r1=1132556&r2=1132557&view=diff == --- axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html (original) +++ axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html Mon Jun 6 09:15:38 2011 @@ -15,7 +15,7 @@ This is the 1.6.0 release of Apache Rampart. Apache Rampart 1.6.0 is a toolkit that provides implementations of the WS-Sec* -specifications for Apache Axis2 1.6.0, based on Apache WSS4J 1.5.10 and +specifications for Apache Axis2 1.6.0, based on Apache WSS4J 1.5.11 and the Apache AXIOM-DOOM 1.2.11 implementation. What is in this release
svn commit: r1132559 - /axis/axis2/java/rampart/branches/1_6/pom.xml
Author: sagara Date: Mon Jun 6 09:33:17 2011 New Revision: 1132559 URL: http://svn.apache.org/viewvc?rev=1132559&view=rev Log: Prepared for 1.6.0 release. Modified: axis/axis2/java/rampart/branches/1_6/pom.xml Modified: axis/axis2/java/rampart/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1132559&r1=1132558&r2=1132559&view=diff == --- axis/axis2/java/rampart/branches/1_6/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/pom.xml Mon Jun 6 09:33:17 2011 @@ -411,7 +411,7 @@ ${project.version} ${project.version} -1.6.1-SNAPSHOT +1.6.0 1.2.11 1.5.11
svn commit: r1132564 - in /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc: download.xml index.xml
Author: sagara Date: Mon Jun 6 09:53:52 2011 New Revision: 1132564 URL: http://svn.apache.org/viewvc?rev=1132564&view=rev Log: Updated site for 1.6.0 release Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml?rev=1132564&r1=1132563&r2=1132564&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml Mon Jun 6 09:53:52 2011 @@ -36,7 +36,7 @@ 1.6.0 -01 Jun 2011 +06 Jun 2011 1.6.0 Release (Mirrored) Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml?rev=1132564&r1=1132563&r2=1132564&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml Mon Jun 6 09:53:52 2011 @@ -45,7 +45,7 @@ following specifications: Apache Rampart News - Jun 01, 2011 : Apache Rampart 1.6.0 released + Jun 06, 2011 : Apache Rampart 1.6.0 released Apache Rampart 1.6.0 was released with lots of bug fixes. Jan 10, 2011 : Apache Rampart 1.5.1 released
svn commit: r1132565 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/documentation/src/site/xdoc/download.xml modules/documentation/src/site/xdoc/index.xml
Author: sagara Date: Mon Jun 6 09:57:57 2011 New Revision: 1132565 URL: http://svn.apache.org/viewvc?rev=1132565&view=rev Log: Merged r1132564 to the 1.6 branch. Modified: axis/axis2/java/rampart/branches/1_6/ (props changed) axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml Propchange: axis/axis2/java/rampart/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 6 09:57:57 2011 @@ -1 +1 @@ -/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548 +/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564 Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml?rev=1132565&r1=1132564&r2=1132565&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml Mon Jun 6 09:57:57 2011 @@ -36,7 +36,7 @@ 1.6.0 -01 Jun 2011 +06 Jun 2011 1.6.0 Release (Mirrored) Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml?rev=1132565&r1=1132564&r2=1132565&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml Mon Jun 6 09:57:57 2011 @@ -45,7 +45,7 @@ following specifications: Apache Rampart News - Jun 01, 2011 : Apache Rampart 1.6.0 released + Jun 06, 2011 : Apache Rampart 1.6.0 released Apache Rampart 1.6.0 was released with lots of bug fixes. Jan 10, 2011 : Apache Rampart 1.5.1 released
svn commit: r1132570 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampart
Author: sagara Date: Mon Jun 6 10:05:17 2011 New Revision: 1132570 URL: http://svn.apache.org/viewvc?rev=1132570&view=rev Log: [maven-release-plugin] prepare release v1.6.0 Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_6/pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1132570&r1=1132569&r2=1132570&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Mon Jun 6 10:05:17 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.1-SNAPSHOT +1.6.0 ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml?rev=1132570&r1=1132569&r2=1132570&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml Mon Jun 6 10:05:17 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6.1-SNAPSHOT +1.6.0 ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml?rev=1132570&r1=1132569&r2=1132570&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml Mon Jun 6 10:05:17 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.1-SNAPSHOT +1.6.0 ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1132570&r1=1132569&r2=1132570&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml Mon Jun 6 10:05:17 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.1-SNAPSHOT +1.6.0 ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml?rev=1132570&r1=1132569&r2=1132570&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml Mon Jun 6 10:05:17 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6.1-SNAPSHOT +1.6.0 ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_6 + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.6.0 - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_6 + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.6.0 - http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6 + http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.6.0 Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml?rev=1132570&r1=1132569&r2=1132570&view=diff ==
svn commit: r1132571 - /axis/axis2/java/rampart/tags/v1.6.0/
Author: sagara Date: Mon Jun 6 10:05:33 2011 New Revision: 1132571 URL: http://svn.apache.org/viewvc?rev=1132571&view=rev Log: [maven-scm] copy for tag v1.6.0 Added: axis/axis2/java/rampart/tags/v1.6.0/ (props changed) - copied from r1132570, axis/axis2/java/rampart/branches/1_6/ Propchange: axis/axis2/java/rampart/tags/v1.6.0/ -- --- svn:ignore (added) +++ svn:ignore Mon Jun 6 10:05:33 2011 @@ -0,0 +1 @@ +target Propchange: axis/axis2/java/rampart/tags/v1.6.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jun 6 10:05:33 2011 @@ -0,0 +1 @@ +/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564
svn commit: r1132573 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampart
Author: sagara Date: Mon Jun 6 10:06:11 2011 New Revision: 1132573 URL: http://svn.apache.org/viewvc?rev=1132573&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_6/pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1132573&r1=1132572&r2=1132573&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Mon Jun 6 10:06:11 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml?rev=1132573&r1=1132572&r2=1132573&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml Mon Jun 6 10:06:11 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml?rev=1132573&r1=1132572&r2=1132573&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml Mon Jun 6 10:06:11 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1132573&r1=1132572&r2=1132573&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml Mon Jun 6 10:06:11 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml?rev=1132573&r1=1132572&r2=1132573&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml Mon Jun 6 10:06:11 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.6.0 +1.6.1-SNAPSHOT ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.6.0 + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_6 - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.6.0 + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_6 - http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.6.0 + http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6 Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/ra
svn commit: r1133788 [2/18] - in /axis/axis2/java/sandesha/site: ./ apidocs/ apidocs/org/apache/sandesha2/ apidocs/org/apache/sandesha2/addressing/ apidocs/org/apache/sandesha2/addressing/class-use/ a
Modified: axis/axis2/java/sandesha/site/apidocs/allclasses-noframe.html URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/site/apidocs/allclasses-noframe.html?rev=1133788&r1=1133787&r2=1133788&view=diff == --- axis/axis2/java/sandesha/site/apidocs/allclasses-noframe.html (original) +++ axis/axis2/java/sandesha/site/apidocs/allclasses-noframe.html Thu Jun 9 11:02:38 2011 @@ -2,13 +2,13 @@ - + -All Classes (Apache Sandesha 1.4 API) +All Classes (Apache Sandesha 1.6.0 API) - + @@ -32,12 +32,8 @@ All Classes (Apache Sandesha 1.4 API) AckRequestedProcessor -AckRequestedTest - AcksTo -AddressingVersionTest - AnonEchoClient ApplicationMsgProcessor @@ -56,10 +52,6 @@ All Classes (Apache Sandesha 1.4 API) CloseSequenceResponse -CloseSequenceResponseTest - -CloseSequenceTest - ContextManager CreateSeqMsgProcessor @@ -68,16 +60,8 @@ All Classes (Apache Sandesha 1.4 API) CreateSequence -CreateSequenceRefusedFaultTest - -CreateSequenceRefusedInboundFaultTest - CreateSequenceResponse -CreateSequenceResponseTest - -CreateSequenceTest - DummyContextManager DummySecurityManager @@ -114,10 +98,6 @@ All Classes (Apache Sandesha 1.4 API) FaultManager -FaultTestUtils - -ForceInboundDispatchTest - Identifier InMemoryInvokerBeanMgr @@ -132,16 +112,12 @@ All Classes (Apache Sandesha 1.4 API) InMemoryTransaction -InvalidAcknowledgementTest - Invoker InvokerBean InvokerBeanMgr -InvokerBeanMgrTest - InvokerWorker IOMRMElement @@ -162,28 +138,14 @@ All Classes (Apache Sandesha 1.4 API) MakeConnectionProcessor -MakeConnectionTest - MessageContextCorrectionHandler -MessageContextPropertyTest - -MessageContextSerializationTest - -MessageNumberRolloverFaultTest - MessagePending MessagePendingProcessor -MessagePendingTest - MessageRetransmissionAdjuster -MessageRetransmissionTest - -MissingSelectionFaultTest - MsgInitializer MsgProcessor @@ -192,12 +154,6 @@ All Classes (Apache Sandesha 1.4 API) MTOMPingClient -MTOMRMTest - -MultiThreadedTest - -OptionalReliabilityTest - PersistentBeanMgr PersistentInvokerBeanMgr @@ -228,8 +184,6 @@ All Classes (Apache Sandesha 1.4 API) RangeString -RangeStringTest - RMAssertionBuilder RMBean @@ -240,8 +194,6 @@ All Classes (Apache Sandesha 1.4 API) RMDBeanMgr -RMDBeanMgrTest - RMHeaderPart RMInteropServiceCallbackHandler @@ -272,14 +224,8 @@ All Classes (Apache Sandesha 1.4 API) RMSBeanMgr -RMSBeanMgrTest - -RMScenariosTest - RMSequenceBean -RMVersionTest - Sandesha2Constants Sandesha2Constants.Assertions @@ -338,18 +284,8 @@ All Classes (Apache Sandesha 1.4 API) SandeshaClient -SandeshaClientAckRequestWaitTest - -SandeshaClientCloseWaitTest - SandeshaClientConstants -SandeshaClientLastErrorTest - -SandeshaClientTerminateWaitTest - -SandeshaClientTest - SandeshaException SandeshaGlobalInHandler @@ -370,20 +306,14 @@ All Classes (Apache Sandesha 1.4 API) SandeshaReport -SandeshaReportsTest - SandeshaStorageException SandeshaStorageTransientException -SandeshaTestCase - SandeshaThread SandeshaUtil -SandeshaUtilTest - SandeshaWorker Scenario_1_1 @@ -410,10 +340,6 @@ All Classes (Apache Sandesha 1.4 API) SecurityManager -SecurityScenariosTest - -SecurityTest - SecurityToken Sender @@ -422,18 +348,12 @@ All Classes (Apache Sandesha 1.4 API) SenderBeanMgr -SenderBeanMgrTest - SenderWorker Sequence SequenceAcknowledgement -SequenceAcknowledgementTest - -SequenceClosedFaultTest - SequenceEntry SequenceFault @@ -444,28 +364,16 @@ All Classes (Apache Sandesha 1.4 API) SequenceOffer -SequenceOfferTest - SequenceProcessor SequenceReport -SequenceTerminatedFaultTest - -SequenceTest - -SequenceTimedOutTest - -SerializableScenariosTest - SimpleSandesha2Server SOAPAbstractFactory SOAPFaultEnvelopeCreator -SOAPVersionTest - SpecSpecificConstants StorageManager @@ -484,26 +392,12 @@ All Classes (Apache Sandesha 1.4 API) TerminateSequenceResponse -TerminateSequenceResponseTest - -TerminateSequenceTest - TestCallback Transaction TransactionLock -UnitTestContextManager - -UnitTestSecurityManager - -UnknownSequenceFaultTest - -UnsupportedScenariosTest - -UnsupportedSelectionFaultTest - UserguideEchoClient UserguidePingClient Modified: axis/axis2/java/sandesha/site/apidocs/constant-values.html URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/site/apidocs/constant-values.html?rev=1133788&r1=1133787&r2=1133788&view=diff == --- axis/axis2/java/sandesha/site/apidocs/constant-values.html (original) +++ axis/axis2/java/sandesha/site/apidocs/constant-values.html Thu Jun 9 11:02:38 2011 @@ -2,13 +2,13 @@ - + -Constant Field Values (Apache Sandesha 1.4 API) +Constant Field Values (Apache Sandesha 1.6.0 API) -
svn commit: r1133788 [18/18] - in /axis/axis2/java/sandesha/site: ./ apidocs/ apidocs/org/apache/sandesha2/ apidocs/org/apache/sandesha2/addressing/ apidocs/org/apache/sandesha2/addressing/class-use/
Modified: axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/MTOMPingClient.html URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/MTOMPingClient.html?rev=1133788&r1=1133787&r2=1133788&view=diff == --- axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/MTOMPingClient.html (original) +++ axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/MTOMPingClient.html Thu Jun 9 11:02:38 2011 @@ -2,13 +2,13 @@ - + -Uses of Class sandesha2.samples.userguide.MTOMPingClient (Apache Sandesha 1.4 API) +Uses of Class sandesha2.samples.userguide.MTOMPingClient (Apache Sandesha 1.6.0 API) - + @@ -16,7 +16,7 @@ Uses of Class sandesha2.samples.userguid function windowTitle() { if (location.href.indexOf('is-external=true') == -1) { -parent.document.title="Uses of Class sandesha2.samples.userguide.MTOMPingClient (Apache Sandesha 1.4 API)"; +parent.document.title="Uses of Class sandesha2.samples.userguide.MTOMPingClient (Apache Sandesha 1.6.0 API)"; } } @@ -140,6 +140,6 @@ No usage of sandesha2.samples.userguide. -Copyright © 2005-2010 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. +Copyright © 2005-2011 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. Modified: axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/RMSampleService.html URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/RMSampleService.html?rev=1133788&r1=1133787&r2=1133788&view=diff == --- axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/RMSampleService.html (original) +++ axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/RMSampleService.html Thu Jun 9 11:02:38 2011 @@ -2,13 +2,13 @@ - + -Uses of Class sandesha2.samples.userguide.RMSampleService (Apache Sandesha 1.4 API) +Uses of Class sandesha2.samples.userguide.RMSampleService (Apache Sandesha 1.6.0 API) - + @@ -16,7 +16,7 @@ Uses of Class sandesha2.samples.userguid function windowTitle() { if (location.href.indexOf('is-external=true') == -1) { -parent.document.title="Uses of Class sandesha2.samples.userguide.RMSampleService (Apache Sandesha 1.4 API)"; +parent.document.title="Uses of Class sandesha2.samples.userguide.RMSampleService (Apache Sandesha 1.6.0 API)"; } } @@ -140,6 +140,6 @@ No usage of sandesha2.samples.userguide. -Copyright © 2005-2010 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. +Copyright © 2005-2011 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. Modified: axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/SyncEchoClient.html URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/SyncEchoClient.html?rev=1133788&r1=1133787&r2=1133788&view=diff == --- axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/SyncEchoClient.html (original) +++ axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/SyncEchoClient.html Thu Jun 9 11:02:38 2011 @@ -2,13 +2,13 @@ - + -Uses of Class sandesha2.samples.userguide.SyncEchoClient (Apache Sandesha 1.4 API) +Uses of Class sandesha2.samples.userguide.SyncEchoClient (Apache Sandesha 1.6.0 API) - + @@ -16,7 +16,7 @@ Uses of Class sandesha2.samples.userguid function windowTitle() { if (location.href.indexOf('is-external=true') == -1) { -parent.document.title="Uses of Class sandesha2.samples.userguide.SyncEchoClient (Apache Sandesha 1.4 API)"; +parent.document.title="Uses of Class sandesha2.samples.userguide.SyncEchoClient (Apache Sandesha 1.6.0 API)"; } } @@ -140,6 +140,6 @@ No usage of sandesha2.samples.userguide. -Copyright © 2005-2010 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. +Copyright © 2005-2011 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. Modified: axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/SyncPingClient.html URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/SyncPingClient.html?rev=1133788&r1=1133787&r2=1133788&view=diff == --- axis/axis2/java/sandesha/site/apidocs/sandesha2/samples/userguide/class-use/SyncPingClient.html (original) +++ axis/axis2/java/sandesha/site/apidocs/s
svn commit: r1134016 - in /axis/axis2/java/core/site: ./ api/ api/org/apache/axis2/ api/org/apache/axis2/addressing/ api/org/apache/axis2/addressing/class-use/ api/org/apache/axis2/addressing/i18n/ ap
Author: sagara Date: Thu Jun 9 17:48:41 2011 New Revision: 1134016 URL: http://svn.apache.org/viewvc?rev=1134016&view=rev Log: Updated for 1.6.0 release [This commit notification would consist of 160 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1134020 - in /axis/axis2/java/rampart/site: ./ apidocs/ apidocs/org/apache/rahas/ apidocs/org/apache/rahas/class-use/ apidocs/org/apache/rahas/client/ apidocs/org/apache/rahas/client/clas
Author: sagara Date: Thu Jun 9 18:00:01 2011 New Revision: 1134020 URL: http://svn.apache.org/viewvc?rev=1134020&view=rev Log: updated for 1.6.0 release [This commit notification would consist of 78 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1134272 - /axis/axis2/java/rampart/site/download/1.6.0/download.cgi
Author: sagara Date: Fri Jun 10 10:37:01 2011 New Revision: 1134272 URL: http://svn.apache.org/viewvc?rev=1134272&view=rev Log: Added missing file. Added: axis/axis2/java/rampart/site/download/1.6.0/download.cgi (with props) Added: axis/axis2/java/rampart/site/download/1.6.0/download.cgi URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/site/download/1.6.0/download.cgi?rev=1134272&view=auto == --- axis/axis2/java/rampart/site/download/1.6.0/download.cgi (added) +++ axis/axis2/java/rampart/site/download/1.6.0/download.cgi Fri Jun 10 10:37:01 2011 @@ -0,0 +1,6 @@ +#!/bin/sh +# Wrapper script around mirrors.cgi script +# (we must change to that directory in order for python to pick up the +# python includes correctly) +cd /www/www.apache.org/dyn/mirrors +/www/www.apache.org/dyn/mirrors/mirrors.cgi $* \ No newline at end of file Propchange: axis/axis2/java/rampart/site/download/1.6.0/download.cgi -- svn:eol-style = native
svn commit: r1134513 - /axis/axis2/java/core/branches/1_6/etc/doap_Axis2.rdf
Author: sagara Date: Sat Jun 11 04:25:08 2011 New Revision: 1134513 URL: http://svn.apache.org/viewvc?rev=1134513&view=rev Log: Updated for 1.6.0 release Modified: axis/axis2/java/core/branches/1_6/etc/doap_Axis2.rdf Modified: axis/axis2/java/core/branches/1_6/etc/doap_Axis2.rdf URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/etc/doap_Axis2.rdf?rev=1134513&r1=1134512&r2=1134513&view=diff == --- axis/axis2/java/core/branches/1_6/etc/doap_Axis2.rdf (original) +++ axis/axis2/java/core/branches/1_6/etc/doap_Axis2.rdf Sat Jun 11 04:25:08 2011 @@ -57,6 +57,7 @@ Apache Axis22010-09-061.5.2 Apache Axis22010-11-121.5.3 Apache Axis22010-12-191.5.4 +Apache Axis22011-05-171.6.0
svn commit: r1134514 - /axis/axis2/java/core/trunk/etc/doap_Axis2.rdf
Author: sagara Date: Sat Jun 11 04:25:32 2011 New Revision: 1134514 URL: http://svn.apache.org/viewvc?rev=1134514&view=rev Log: Updated for 1.6.0 release Modified: axis/axis2/java/core/trunk/etc/doap_Axis2.rdf Modified: axis/axis2/java/core/trunk/etc/doap_Axis2.rdf URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/etc/doap_Axis2.rdf?rev=1134514&r1=1134513&r2=1134514&view=diff == --- axis/axis2/java/core/trunk/etc/doap_Axis2.rdf (original) +++ axis/axis2/java/core/trunk/etc/doap_Axis2.rdf Sat Jun 11 04:25:32 2011 @@ -57,6 +57,7 @@ Apache Axis22010-09-061.5.2 Apache Axis22010-11-121.5.3 Apache Axis22010-12-191.5.4 +Apache Axis22010-05-171.6.0
svn commit: r1134518 - /axis/axis2/java/sandesha/branches/1_6/etc/sandesha2.rdf
Author: sagara Date: Sat Jun 11 04:49:43 2011 New Revision: 1134518 URL: http://svn.apache.org/viewvc?rev=1134518&view=rev Log: Updated for 1.6.0 release. Modified: axis/axis2/java/sandesha/branches/1_6/etc/sandesha2.rdf Modified: axis/axis2/java/sandesha/branches/1_6/etc/sandesha2.rdf URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/etc/sandesha2.rdf?rev=1134518&r1=1134517&r2=1134518&view=diff == --- axis/axis2/java/sandesha/branches/1_6/etc/sandesha2.rdf (original) +++ axis/axis2/java/sandesha/branches/1_6/etc/sandesha2.rdf Sat Jun 11 04:49:43 2011 @@ -37,6 +37,7 @@ http://projects.apache.org/category/xml"/> Apache Sandesha208-10-20071.3 Apache Sandesha219-12-20101.4 +Apache Sandesha202-06-20111.6.0 http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk"/>
svn commit: r1134519 - /axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf
Author: sagara Date: Sat Jun 11 04:49:56 2011 New Revision: 1134519 URL: http://svn.apache.org/viewvc?rev=1134519&view=rev Log: Updated for 1.6.0 release. Modified: axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf Modified: axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf?rev=1134519&r1=1134518&r2=1134519&view=diff == --- axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf (original) +++ axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf Sat Jun 11 04:49:56 2011 @@ -37,6 +37,7 @@ http://projects.apache.org/category/xml"/> Apache Sandesha208-10-20071.3 Apache Sandesha219-12-20101.4 +Apache Sandesha202-06-20111.6.0 http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk"/>
svn commit: r1134521 - /axis/axis2/java/rampart/branches/1_6/pom.xml
Author: sagara Date: Sat Jun 11 05:16:47 2011 New Revision: 1134521 URL: http://svn.apache.org/viewvc?rev=1134521&view=rev Log: Updated Axis2 version to 1.6.1-SNAPSHOT. Modified: axis/axis2/java/rampart/branches/1_6/pom.xml Modified: axis/axis2/java/rampart/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1134521&r1=1134520&r2=1134521&view=diff == --- axis/axis2/java/rampart/branches/1_6/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_6/pom.xml Sat Jun 11 05:16:47 2011 @@ -411,7 +411,7 @@ ${project.version} ${project.version} -1.6.0 +1.6.1-SNAPSHOT 1.2.11 1.5.11
svn commit: r1136443 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/typemapping/ adb/src/org/apache/axis2/databinding/utils/ adb/src/org/apache/axis2/rpc/receivers/ adb
Author: sagara Date: Thu Jun 16 14:06:30 2011 New Revision: 1136443 URL: http://svn.apache.org/viewvc?rev=1136443&view=rev Log: Fixed AXIS2-5063 Provide support for complex object types. 1.) Added mapping between XSD types to Java types in TypeTable . 2.) Modified BeanUtil and RPCUtil to include xsd:type details in response messages when returning a Object or Object Array. 3.) Created new test case - TypeTableTest and enhanced BeanUtilTest. 4.) Modified RPCMessageReceivers to support 2.) 5.) Updated osgi module pom file to import javax.xml.datatype package . Added: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/TypeTableTest.java (with props) Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java axis/axis2/java/core/trunk/modules/osgi/pom.xml Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?rev=1136443&r1=1136442&r2=1136443&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java Thu Jun 16 14:06:30 2011 @@ -19,10 +19,12 @@ package org.apache.axis2.databinding.typemapping; +import org.apache.axiom.attachments.ByteArrayDataSource; import org.apache.axiom.attachments.utils.DataHandlerUtils; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMNode; import org.apache.axiom.om.OMText; +import org.apache.axis2.databinding.types.HexBinary; import org.apache.axis2.databinding.utils.ConverterUtil; import org.apache.axis2.context.MessageContext; import org.apache.axis2.description.AxisService; @@ -188,6 +190,22 @@ public class SimpleTypeMapper { } } return null; +} + +/** + * Gets the DataHandler according to hexBin value. + * + * @param element the element + * @param hexBin the hex bin + * @return the DataHandler object + */ +public static DataHandler getDataHandler(OMElement element, boolean hexBin) { + if(hexBin){ + ByteArrayDataSource byteArrayDataSource = new ByteArrayDataSource( + HexBinary.decode(element.getText())); + return new DataHandler(byteArrayDataSource); + } + return getDataHandler(element); } @@ -327,5 +345,32 @@ public class SimpleTypeMapper { public static Object makeDate(String source) { return ConverterUtil.convertToDate(source); } + + + /** +* Checks weather passed parameter class is java.lang.Object[] or not. +* +* @param obj the Class type of particular object. +* @return true, if is object array +*/ + public static boolean isObjectArray(Class obj) { + if (obj.getComponentType().getName().equals(Object.class.getName())) { + return true; + } + return false; + } + + /** +* Checks weather passed parameter class is java.lang.Object or not. +* +* @param obj the Class type of particular object. +* @return true, if is object type +*/ + public static boolean isObjectType(Class obj) { + if (obj.getName().equals(Object.class.getName())) { + return true; + } + return false; + } } Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1136443&r1=1136442&r2=1136443&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (origina
svn commit: r1136520 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/utils/BeanUtil.java kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
Author: sagara Date: Thu Jun 16 16:13:39 2011 New Revision: 1136520 URL: http://svn.apache.org/viewvc?rev=1136520&view=rev Log: Fixed few Java 5 warnings and some clean-up. Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1136520&r1=1136519&r2=1136520&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Thu Jun 16 16:13:39 2011 @@ -670,7 +670,7 @@ public class BeanUtil { if (genericParameterTypes != null) { genericType = genericParameterTypes[count]; } -omElement = ProcessElement(classType, omElement, helper, parts, +omElement = processElement(classType, omElement, helper, parts, currentLocalName, retObjs, count, objectSupplier, genericType); while (omElement != null) { count++; @@ -696,7 +696,7 @@ public class BeanUtil { if (genericParameterTypes != null) { genericType = genericParameterTypes[count]; } -omElement = ProcessElement((Class) javaTypes[count], omElement, +omElement = processElement((Class) javaTypes[count], omElement, helper, parts, omElement.getLocalName(), retObjs, count, objectSupplier, genericType); } @@ -715,7 +715,7 @@ public class BeanUtil { return retObjs; } -private static OMElement ProcessElement(Class classType, OMElement omElement, +private static OMElement processElement(Class classType, OMElement omElement, MultirefHelper helper, Iterator parts, String currentLocalName, Object[] retObjs, @@ -766,7 +766,7 @@ public class BeanUtil { return null; } -private static List ProcessGenericsElement(Class classType, OMElement omElement, +private static List processGenericsElement(Class classType, OMElement omElement, MultirefHelper helper, Iterator parts, ObjectSupplier objectSupplier, Type genericType) throws AxisFault { @@ -836,7 +836,7 @@ public class BeanUtil { Type[] parameterArgTypes = aType.getActualTypeArguments(); Type parameter = parameterArgTypes[0]; Iterator parts = omElement.getChildElements(); -return ProcessGenericsElement((Class) parameter, omElement, helper, parts, objectSupplier, generictype); +return processGenericsElement((Class) parameter, omElement, helper, parts, objectSupplier, generictype); } return SimpleTypeMapper.getArrayList(omElement); } else if (SimpleTypeMapper.isDataHandler(classType)) { Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java?rev=1136520&r1=1136519&r2=1136520&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java Thu Jun 16 16:13:39 2011 @@ -39,10 +39,10 @@ import java.net.URI; public class TypeTable { -private static HashMap simpleTypetoxsd; +private static HashMap simpleTypetoxsd; public static final QName ANY_TYPE = new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "anyType", "xs"); -private HashMap complexTypeMap; +private HashMap complexTypeMap; /** * this map is used to keep the class names with the Qnames. @@ -57,8 +57,8 @@ public class TypeTable { public TypeTable() { //complex type table is resetted every time this is //instantiated -complexTypeMap = new HashMap(); -this.qNameToClassMap = new
svn commit: r1137959 - in /axis/axis2/java/core/trunk/modules: adb/ adb/src/org/apache/axis2/databinding/typemapping/ adb/src/org/apache/axis2/databinding/utils/ adb/src/org/apache/axis2/rpc/receivers
Author: sagara Date: Tue Jun 21 11:20:39 2011 New Revision: 1137959 URL: http://svn.apache.org/viewvc?rev=1137959&view=rev Log: Fixed AXIS2-5065 - Provide support for org.w3c.dom.Document in web service. Modified: axis/axis2/java/core/trunk/modules/adb/pom.xml axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java axis/axis2/java/core/trunk/modules/osgi/pom.xml Modified: axis/axis2/java/core/trunk/modules/adb/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/pom.xml?rev=1137959&r1=1137958&r2=1137959&view=diff == --- axis/axis2/java/core/trunk/modules/adb/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/adb/pom.xml Tue Jun 21 11:20:39 2011 @@ -44,6 +44,10 @@ ${project.version} +org.apache.ws.commons.axiom +axiom-dom + + org.apache.geronimo.specs geronimo-activation_1.1_spec @@ -51,12 +55,7 @@ xmlunit xmlunit test - - -org.apache.ws.commons.axiom -axiom-dom -test - + Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?rev=1137959&r1=1137958&r2=1137959&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java Tue Jun 21 11:20:39 2011 @@ -28,6 +28,7 @@ import org.apache.axis2.databinding.type import org.apache.axis2.databinding.utils.ConverterUtil; import org.apache.axis2.context.MessageContext; import org.apache.axis2.description.AxisService; +import org.w3c.dom.Document; import javax.activation.DataHandler; import javax.xml.namespace.QName; @@ -372,5 +373,16 @@ public class SimpleTypeMapper { } return false; } + + /** +* Checks that given classType is a W3C Document. +* +* @param classType +*the class type +* @return true, if is dom document +*/ + public static boolean isDomDocument(Class classType) { + return Document.class.isAssignableFrom(classType); + } } Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1137959&r1=1137958&r2=1137959&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Tue Jun 21 11:20:39 2011 @@ -43,6 +43,8 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamReader; import org.apache.axiom.om.*; +import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.impl.dom.DOOMAbstractFactory; import org.apache.axiom.om.util.Base64; import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; @@ -54,6 +56,15 @@ import org.apache.axis2.description.java import org.apache.axis2.engine.ObjectSupplier; import org.apache.axis2.util.Loader; import org.apache.axis2.util.StreamWrapper; +import org.w3c.dom.Attr; +import org.w3c.dom.Comment; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.ProcessingInstruction; +import org.w3c.dom.traversal.DocumentTraversal; +import org.w3c.dom.traversal.NodeFilter; +import org.w3c.dom.traversal.TreeWalker; public class BeanUtil { @@ -196,6 +207,12 @@ public class BeanUtil { beanName, processingDocLitBare); propertyQnameValueList.add( value == null ? null : SimpleTypeMapper.getStringValue(value)); +} else if(SimpleTypeMapper.isDomDocument(ptype)){ + addTypeQname(elemntNameSpace, propertyQnameValueList, property, +
svn commit: r1142991 - in /axis/axis2/java/core/trunk/modules: adb/src/ adb/src/org/apache/axis2/databinding/typemapping/ adb/src/org/apache/axis2/databinding/utils/ adb/src/org/apache/axis2/rpc/recei
Author: sagara Date: Tue Jul 5 11:25:06 2011 New Revision: 1142991 URL: http://svn.apache.org/viewvc?rev=1142991&view=rev Log: AXIS2-5064 - Implemented basic Java Map Support. Modified: axis/axis2/java/core/trunk/modules/adb/src/ (props changed) axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java Propchange: axis/axis2/java/core/trunk/modules/adb/src/ -- --- svn:ignore (added) +++ svn:ignore Tue Jul 5 11:25:06 2011 @@ -0,0 +1 @@ +META-INF Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?rev=1142991&r1=1142990&r2=1142991&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java Tue Jul 5 11:25:06 2011 @@ -384,5 +384,15 @@ public class SimpleTypeMapper { public static boolean isDomDocument(Class classType) { return Document.class.isAssignableFrom(classType); } + + /** +* Checks weather passed parameter class is a java.util.Map +* +* @param classType the class type +* @return true, if it is a map +*/ + public static boolean isMap(Class classType){ + return java.util.Map.class.isAssignableFrom(classType); + } } Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1142991&r1=1142990&r2=1142991&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Tue Jul 5 11:25:06 2011 @@ -271,7 +271,25 @@ public class BeanUtil { beanName, processingDocLitBare); propertyQnameValueList.add(value); } -} else { + } else if (SimpleTypeMapper.isMap(ptype)) { + OMFactory fac = OMAbstractFactory.getOMFactory(); + QName qNamefortheType = (QName) typeTable + .getComplexSchemaMap().get(getClassName(beanClass)); + OMNamespace ns = fac.createOMNamespace( + qNamefortheType.getNamespaceURI(), + qNamefortheType.getPrefix()); + List mapEntries = getMapElement(fac, + ptype, (Map) value, typeTable, qualified); + OMElement map = fac.createOMElement(propertyName, + qNamefortheType.getNamespaceURI(), + qNamefortheType.getPrefix()); + for (OMElement ele : mapEntries) { + map.addChild(ele); + } + addTypeQname(elemntNameSpace, propertyQnameValueList, + property, beanName, processingDocLitBare); + propertyQnameValueList.add(map); + } else {
svn commit: r1143029 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
Author: sagara Date: Tue Jul 5 12:43:02 2011 New Revision: 1143029 URL: http://svn.apache.org/viewvc?rev=1143029&view=rev Log: Merged r1139484 to the 1.6 branch (AXIS2-5086). Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Propchange: axis/axis2/java/core/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jul 5 12:43:02 2011 @@ -1 +1 @@ -/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1085927,1087073,1088239,1088248-1088249,1088251,1088268,1088904,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448 +/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1085927,1087073,1088239,1088248-1088249,1088251,1088268,1088904,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484 Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=1143029&r1=1143028&r2=1143029&view=diff == --- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original) +++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Tue Jul 5 12:43:02 2011 @@ -120,6 +120,10 @@ public abstract class AbstractMessageRec throw fault; } } finally { +//We can call the serviceContext destroy method for request scope services +if (Constants.SCOPE_REQUEST.equals(messageCtx.getAxisService().getScope())) { + DependencyManager.destroyServiceObject(messageCtx.getServiceContext()); +} restoreThreadContext(tc); } }
svn commit: r1149774 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara Date: Sat Jul 23 01:28:19 2011 New Revision: 1149774 URL: http://svn.apache.org/viewvc?rev=1149774&view=rev Log: Disable some Java 1.6 specific logic when getting new Collection instance. Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1149774&r1=1149773&r2=1149774&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sat Jul 23 01:28:19 2011 @@ -38,15 +38,15 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.NavigableSet; +//import java.util.NavigableSet; import java.util.Queue; import java.util.Set; import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import java.util.concurrent.BlockingDeque; +//import java.util.concurrent.BlockingDeque; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingDeque; +//import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingQueue; import javax.activation.DataHandler; @@ -1851,17 +1851,20 @@ public class BeanUtil { } else if (Queue.class.getName().equals(rowType.getName())) { return new LinkedList(); - } else if (BlockingDeque.class.getName().equals(rowType.getName())) { - return new LinkedBlockingDeque(); - - } else if (BlockingQueue.class.getName().equals(rowType.getName())) { + } else if (BlockingQueue.class.getName().equals(rowType.getName())) { return new LinkedBlockingQueue(); - } else if (NavigableSet.class.getName().equals(rowType.getName()) - || SortedSet.class.getName().equals(rowType.getName())) { - return new TreeSet(); - - } else { + } +// TODO - Enable this logic once the Axis2 move to Java 1.6. +// else if (BlockingDeque.class.getName().equals(rowType.getName())) { +// return new LinkedBlockingDeque(); +// +// }else if (NavigableSet.class.getName().equals(rowType.getName()) +// || SortedSet.class.getName().equals(rowType.getName())) { +// return new TreeSet(); +// +// } + else { try { return (Collection) rowType.newInstance(); } catch (Exception e) {
svn commit: r1149776 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara Date: Sat Jul 23 01:43:15 2011 New Revision: 1149776 URL: http://svn.apache.org/viewvc?rev=1149776&view=rev Log: Disable some Java 1.6 specific logic when getting new Collection instance. Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1149776&r1=1149775&r2=1149776&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sat Jul 23 01:43:15 2011 @@ -46,6 +46,8 @@ import java.util.TreeMap; import java.util.TreeSet; //import java.util.concurrent.BlockingDeque; import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; //import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingQueue; @@ -1575,7 +1577,12 @@ public class BeanUtil { if (Map.class.getName().equals(rowType.getName())) { return new HashMap(); - } else { + + } else if (ConcurrentMap.class.getName().equals(rowType.getName())) { + return new ConcurrentHashMap(); + } + + else { try { return (Map) rowType.newInstance(); } catch (Exception e) {
svn commit: r1149780 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara Date: Sat Jul 23 01:57:38 2011 New Revision: 1149780 URL: http://svn.apache.org/viewvc?rev=1149780&view=rev Log: Added some improvement in BenUtil. getMapInstance method. Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1149780&r1=1149779&r2=1149780&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sat Jul 23 01:57:38 2011 @@ -38,6 +38,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.NavigableMap; +import java.util.SortedMap; //import java.util.NavigableSet; import java.util.Queue; import java.util.Set; @@ -48,6 +50,8 @@ import java.util.TreeSet; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ConcurrentNavigableMap; +import java.util.concurrent.ConcurrentSkipListMap; //import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingQueue; @@ -1580,8 +1584,19 @@ public class BeanUtil { } else if (ConcurrentMap.class.getName().equals(rowType.getName())) { return new ConcurrentHashMap(); - } - + + } else if (SortedMap.class.getName().equals(rowType.getName())) { + return new TreeMap(); + + } +// TODO - Enable this logic once the Axis2 move to Java 1.6. +// else if (NavigableMap.class.getName().equals(rowType.getName())) { +// return new TreeMap(); +// +// } else if (ConcurrentNavigableMap.class.getName().equals(rowType.getName())) { +// return new ConcurrentSkipListMap(); +// } +// else { try { return (Map) rowType.newInstance();
svn commit: r1149781 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara Date: Sat Jul 23 02:07:55 2011 New Revision: 1149781 URL: http://svn.apache.org/viewvc?rev=1149781&view=rev Log: Remove unwanted imports , add them later with java 1.6 Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1149781&r1=1149780&r2=1149781&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sat Jul 23 02:07:55 2011 @@ -38,21 +38,14 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.NavigableMap; import java.util.SortedMap; -//import java.util.NavigableSet; import java.util.Queue; import java.util.Set; -import java.util.SortedSet; import java.util.TreeMap; -import java.util.TreeSet; -//import java.util.concurrent.BlockingDeque; + import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentNavigableMap; -import java.util.concurrent.ConcurrentSkipListMap; -//import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingQueue; import javax.activation.DataHandler;
svn commit: r1149784 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara Date: Sat Jul 23 02:27:49 2011 New Revision: 1149784 URL: http://svn.apache.org/viewvc?rev=1149784&view=rev Log: Added improvements to convertDOMtoOM method Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1149784&r1=1149783&r2=1149784&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sat Jul 23 02:27:49 2011 @@ -55,6 +55,7 @@ import javax.xml.stream.XMLStreamReader; import org.apache.axiom.om.*; import org.apache.axiom.om.impl.builder.StAXOMBuilder; import org.apache.axiom.om.impl.dom.DOOMAbstractFactory; +import org.apache.axiom.om.impl.dom.DocumentImpl; import org.apache.axiom.om.util.Base64; import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; @@ -1293,10 +1294,16 @@ public class BeanUtil { * @return the OMElement */ public static OMElement convertDOMtoOM(OMFactory fac, Object document) { + + if(DocumentImpl.class.getName().equals(document.getClass().getName())) { + return ((OMDocument)document).getOMDocumentElement(); + + } else { DocumentTraversal traversal = (DocumentTraversal) document; TreeWalker walker = traversal.createTreeWalker( ((Document)document).getDocumentElement(), NodeFilter.SHOW_ALL, null, true); - return (OMElement) traverseDOMDocument(fac, walker, null); + return (OMElement) traverseDOMDocument(fac, walker, null); + } } /**
svn commit: r1150452 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/utils/ integration/test/org/apache/axis2/rpc/complex/
Author: sagara Date: Sun Jul 24 18:17:20 2011 New Revision: 1150452 URL: http://svn.apache.org/viewvc?rev=1150452&view=rev Log: Fixed ComplexDataTypesDocLitBareTest failure. Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1150452&r1=1150451&r2=1150452&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sun Jul 24 18:17:20 2011 @@ -251,9 +251,16 @@ public class BeanUtil { for (Object o : (Object[]) value) { addTypeQname(elemntNameSpace, propertyQnameValueList, property, beanName, processingDocLitBare); -QName propertyQName = new QName(elemntNameSpace.getNamespaceURI(), - propertyName, - elemntNameSpace.getPrefix()); +QName propertyQName = null; +if (elemntNameSpace != null) { +propertyQName = new QName( +elemntNameSpace.getNamespaceURI(), +propertyName, +elemntNameSpace.getPrefix()); +} else { +propertyQName = new QName(propertyName); + +} if (SimpleTypeMapper .isObjectArray(o.getClass()) @@ -267,7 +274,7 @@ public class BeanUtil { * For inner Arrary Complex types we use the special local name array - "array" */ QName itemName = new QName(elemntNameSpace.getNamespaceURI(), - Constants.INNTER_ARRARY_COMPLEX_TYPE_NAME, + Constants.INNER_ARRAY_COMPLEX_TYPE_NAME, elemntNameSpace.getPrefix()); propertyQnameValueList.add(getOMElement(propertyQName , (Object[]) o, itemName, qualified, typeTable)); @@ -1121,7 +1128,7 @@ public class BeanUtil { * For inner Arrary Complex types we use the special local name array - "array" */ QName itemName = new QName(partName.getNamespaceURI(), - Constants.INNTER_ARRARY_COMPLEX_TYPE_NAME, + Constants.INNER_ARRAY_COMPLEX_TYPE_NAME, partName.getPrefix()); objects.add(getOMElement(partName, (Object[]) arg, itemName, qualifed, typeTable)); @@ -1823,7 +1830,7 @@ public class BeanUtil { valueType, (Collection) value, elementName, - Constants.INNTER_ARRARY_COMPLEX_TYPE_NAME, + Constants.INNER_ARRAY_COMPLEX_TYPE_NAME, new QName(ns.getNamespaceURI(), elementName, ns.getPrefix()), typeTable, elementFormDefault); } else if (SimpleTypeMapper.isObjectType((Class) valueType)) { Modified: axis/axis2/java/core/tr
svn commit: r1150643 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Author: sagara Date: Mon Jul 25 11:53:08 2011 New Revision: 1150643 URL: http://svn.apache.org/viewvc?rev=1150643&view=rev Log: Applied patch for AXIS2-4170. Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?rev=1150643&r1=1150642&r2=1150643&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java Mon Jul 25 11:53:08 2011 @@ -42,6 +42,7 @@ import org.apache.woden.internal.wsdl20. import org.apache.woden.resolver.URIResolver; import org.apache.woden.schema.Schema; import org.apache.woden.types.NamespaceDeclaration; +import org.apache.woden.types.QNameTokenUnion; import org.apache.woden.wsdl20.Binding; import org.apache.woden.wsdl20.BindingFault; import org.apache.woden.wsdl20.BindingFaultReference; @@ -76,6 +77,8 @@ import org.apache.woden.wsdl20.extension import org.apache.woden.wsdl20.xml.DescriptionElement; import org.apache.woden.wsdl20.xml.DocumentableElement; import org.apache.woden.wsdl20.xml.DocumentationElement; +import org.apache.woden.wsdl20.xml.ImportElement; +import org.apache.woden.wsdl20.xml.InterfaceFaultElement; import org.apache.woden.wsdl20.xml.InterfaceMessageReferenceElement; import org.apache.woden.wsdl20.xml.TypesElement; import org.apache.woden.xml.XMLAttr; @@ -253,21 +256,7 @@ public class WSDL20ToAxisServiceBuilder // } DescriptionElement descriptionElement = description.toElement(); -TypesElement typesElement = descriptionElement -.getTypesElement(); -if (typesElement != null) { -Schema[] schemas = typesElement.getSchemas(); -for (int i = 0; i < schemas.length; i++) { -XmlSchema schemaDefinition = schemas[i].getSchemaDefinition(); - -// WSDL 2.0 spec requires that even the built-in schema should be returned -// once asked for schema definitions. But for data binding purposes we can ignore that -if (schemaDefinition != null && !Constants.URI_2001_SCHEMA_XSD -.equals(schemaDefinition.getTargetNamespace())) { -axisService.addSchema(schemaDefinition); -} -} -} +processTypes(descriptionElement); processService(); return axisService; @@ -275,6 +264,37 @@ public class WSDL20ToAxisServiceBuilder throw AxisFault.makeFault(e); } } + +/** + * recursively drills down to find all type definitions + * (XSD schemas) in all imported WSDLs and XSDs + * + * @param descriptionElement - a description element from where import elements + * and types can be found + */ +private void processTypes(DescriptionElement descriptionElement) { +TypesElement typesElement = descriptionElement +.getTypesElement(); +if (typesElement != null) { +Schema[] schemas = typesElement.getSchemas(); +for (int i = 0; i < schemas.length; i++) { +XmlSchema schemaDefinition = schemas[i].getSchemaDefinition(); + +// WSDL 2.0 spec requires that even the built-in schema should be returned +// once asked for schema definitions. But for data binding purposes we can ignore that +if (schemaDefinition != null && !Constants.URI_2001_SCHEMA_XSD +.equals(schemaDefinition.getTargetNamespace())) { +axisService.addSchema(schemaDefinition); +} +} +} + +ImportElement[] importElements = descriptionElement.getImportElements(); +for (int i = 0; i < importElements.length; i++) { +DescriptionElement descElem = importElements[i].getDescriptionElement(); +processTypes(descElem); // recursively drill down +} +} private void processEndpoints(Interface serviceInterface) throws AxisFault { Endpoint[] endpoints = wsdlService.getEndpoints(); @@ -493,7 +513,10 @@ public class WSDL20ToAxisServiceBuilder stringBasedNamespaceMap.put(namespaceDeclaration.getPrefix(), namespaceDeclaration.getNamespaceURI().toString()); } - +
svn commit: r1151058 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Author: sagara Date: Tue Jul 26 10:37:59 2011 New Revision: 1151058 URL: http://svn.apache.org/viewvc?rev=1151058&view=rev Log: Changed Schema generation for DOM Document so that stub can send and receive OMElement in place of DOM Documents. Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1151058&r1=1151057&r2=1151058&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java Tue Jul 26 10:37:59 2011 @@ -399,6 +399,9 @@ public class DefaultSchemaGenerator impl generateSchemaForType(sequence, null, jMethod.getName()); break; +} else if(methodParameter != null && Document.class.isAssignableFrom(methodParameter)) { +generateSchemaTypeForDocument(sequence, parameterName); + } else if(methodParameter != null && Map.class.isAssignableFrom(methodParameter)) { generateWrappedSchemaTypeForMap(sequence, genericParameterTypes[j], parameterName); @@ -437,6 +440,10 @@ public class DefaultSchemaGenerator impl Type genericParameterType = jMethod.getGenericReturnType(); if (nonRpcMethods.contains(jMethod.getName())) { generateSchemaForType(sequence, null, returnName); + +} else if(returnType != null && Document.class.isAssignableFrom(returnType)) { +generateSchemaTypeForDocument(sequence, returnName); + } else if (Map.class.isAssignableFrom(returnType)){ if (genericParameterType instanceof ParameterizedType) { generateWrappedSchemaTypeForMap(sequence, genericParameterType, returnName); @@ -672,32 +679,37 @@ public class DefaultSchemaGenerator impl if(genericFieldType instanceof ParameterizedType){ ParameterizedType aType = (ParameterizedType) genericFieldType; Type[] fieldArgTypes = aType.getActualTypeArguments(); - if(Map.class.isAssignableFrom((Class)((ParameterizedType)aType).getRawType())){ - generateWrappedSchemaTypeForMap(sequence, aType, propertyName); - - } - if (Collection.class - .isAssignableFrom((Class) ((ParameterizedType) aType) - .getRawType())) { - - generateWrappedSchemaTypeForCollection( - sequence, aType, propertyName); + if(Map.class.isAssignableFrom((Class)((ParameterizedType)aType).getRawType())){ +generateWrappedSchemaTypeForMap(sequence, aType, propertyName); + +} else if (Collection.class +.isAssignableFrom((Class) ((ParameterizedType) aType) +.getRawType())) { + +generateWrappedSchemaTypeForCollection( +sequence, aType, propertyName); } else { - try { +try { generateSchemaforGenericFields(xmlSchema, -sequence, -fieldArgTypes[0], -propertyName); +sequence, +fieldArgTypes[0], +propertyName); } catch (Exception e) { generateSchemaforFieldsandProperties(xmlSchema, -sequence, -property.getPropertyType(), -propertyName, -
svn commit: r1155425 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara Date: Tue Aug 9 16:34:32 2011 New Revision: 1155425 URL: http://svn.apache.org/viewvc?rev=1155425&view=rev Log: Improved List, Map and DOM Document support for POJODeployer. Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1155425&r1=1155424&r2=1155425&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Tue Aug 9 16:34:32 2011 @@ -273,9 +273,14 @@ public class BeanUtil { * Copied from ADBXMLStreamReaderImpl. * For inner Arrary Complex types we use the special local name array - "array" */ - QName itemName = new QName(elemntNameSpace.getNamespaceURI(), - Constants.INNER_ARRAY_COMPLEX_TYPE_NAME, - elemntNameSpace.getPrefix()); + QName itemName; + if (qualified) { + itemName = new QName(elemntNameSpace.getNamespaceURI(), + Constants.INNER_ARRAY_COMPLEX_TYPE_NAME, + elemntNameSpace.getPrefix()); + } else { + itemName = new QName(Constants.INNER_ARRAY_COMPLEX_TYPE_NAME); + } propertyQnameValueList.add(getOMElement(propertyQName , (Object[]) o, itemName, qualified, typeTable)); } else { @@ -1457,11 +1462,15 @@ public class BeanUtil { Map results, TypeTable typeTable, boolean elementFormDefault) { Iterator keyItr = results.keySet().iterator(); List list = new ArrayList(); - OMNamespace ns = fac.createOMNamespace( - org.apache.axis2.Constants.AXIS2_MAP_NAMESPACE_URI, - org.apache.axis2.Constants.AXIS2_MAP_NAMESPACE_PREFIX); +OMNamespace ns = null; Type keyType = Object.class; - Type valueType = Object.class; +Type valueType = Object.class; +if (elementFormDefault) { +ns = fac.createOMNamespace( +org.apache.axis2.Constants.AXIS2_MAP_NAMESPACE_URI, +org.apache.axis2.Constants.AXIS2_MAP_NAMESPACE_PREFIX); +} + if (type instanceof ParameterizedType) { ParameterizedType aType = (ParameterizedType) type; Type[] parameterArgTypes = aType.getActualTypeArguments(); @@ -1476,12 +1485,21 @@ public class BeanUtil { if (key != null) { value = results.get(key); List properties = new ArrayList(); - QName keyName = new QName(ns.getNamespaceURI(), - org.apache.axis2.Constants.MAP_KEY_ELEMENT_NAME, ns - .getPrefix()); - QName valueName = new QName(ns.getNamespaceURI(), - org.apache.axis2.Constants.MAP_VALUE_ELEMENT_NAME, ns - .getPrefix()); +QName keyName; +QName valueName; +if (elementFormDefault) { +
svn commit: r1160240 - in /axis/axis2/java/core/trunk: ./ modules/codegen/ modules/codegen/src/org/apache/axis2/wsdl/ modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/ modules/codegen/src/org/a
Author: sagara Date: Mon Aug 22 12:41:35 2011 New Revision: 1160240 URL: http://svn.apache.org/viewvc?rev=1160240&view=rev Log: Implemented JAX-WS processing for WSDL2JAVA and JAVA2WSDL tools. In both tools once the "-jws' option available execution is redirect to Sun JAX-WS tools. Command line options can assign as follows. 1.) Possible to use options listed for Axis2 tools. ( e.g -o for out put directory etc.) 2.) Possible to use Sun JAX-WS tools options (e.g -verbose etc ) If a particular option label is used in both Axis2 tools and Sun tools , Axis2 tools get the priority. Added: axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/ axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/wsdls/SimpleService.wsdl (with props) axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/jaxws/ axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngineTest.java (with props) axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/ axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java (with props) axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/ axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/ axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/ axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java (with props) axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/ServerInfo.java (with props) Modified: axis/axis2/java/core/trunk/ (props changed) axis/axis2/java/core/trunk/modules/codegen/pom.xml axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java axis/axis2/java/core/trunk/modules/distribution/pom.xml axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java axis/axis2/java/core/trunk/modules/parent/pom.xml Propchange: axis/axis2/java/core/trunk/ -- --- svn:ignore (original) +++ svn:ignore Mon Aug 22 12:41:35 2011 @@ -2,3 +2,6 @@ *.iml *.iws target +.metadata +.settings +debug Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1160240&r1=1160239&r2=1160240&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Mon Aug 22 12:41:35 2011 @@ -53,6 +53,30 @@ ${project.version} test + +com.sun.xml.ws +jaxws-tools + + +com.sun.xml.ws +jaxws-rt + + +com.sun.xml.bind +jaxb-xjc + + + + + com.sun.xml.bind +jaxb-xjc +test + + + com.sun.xml.ws + jaxws-rt + test + http://axis.apache.org/axis2/java/core/ Modified: axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java?rev=1160240&r1=1160239&r2=1160240&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java (original) +++ axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java Mon Aug 22 12:41:35 2011 @@ -19,9 +19,13 @@ package org.apache.axis2.wsdl; +import java.util.Map; + +import org.apache.axis2.util.CommandLineOption; import org.apache.axis2.util.CommandLineOptionConstants; import org.apache.axis2.util.CommandLineOptionParser; import org.apache.axis2.wsdl.codegen.CodeGene
svn commit: r1160646 - in /axis/axis2/java/core/trunk/modules: codegen/pom.xml java2wsdl/pom.xml
Author: sagara Date: Tue Aug 23 12:12:48 2011 New Revision: 1160646 URL: http://svn.apache.org/viewvc?rev=1160646&view=rev Log: Temporally disable new test cases until fix the issue with proper solution for Java 5 and 6. Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1160646&r1=1160645&r2=1160646&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Tue Aug 23 12:12:48 2011 @@ -134,9 +134,12 @@ maven-surefire-plugin true + + **/JAXWSCodeGenerationEngineTest.java + -**/*Test.java - +**/*Test.java + Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=1160646&r1=1160645&r2=1160646&view=diff == --- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Tue Aug 23 12:12:48 2011 @@ -148,6 +148,7 @@ **/*Abstract*.java +**/JAXWS2WSDLCodegenEngineTest.java **/*Test.java
svn commit: r1161430 - in /axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse: CodeGenWizard.java ui/OutputPage.java
Author: sagara Date: Thu Aug 25 08:04:55 2011 New Revision: 1161430 URL: http://svn.apache.org/viewvc?rev=1161430&view=rev Log: Applied patch for AXIS2-4063. Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java Modified: axis/axis2/java/core/trunk/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/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?rev=1161430&r1=1161429&r2=1161430&view=diff == --- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Thu Aug 25 08:04:55 2011 @@ -43,6 +43,8 @@ import org.apache.commons.logging.LogFac import org.apache.commons.logging.impl.Log4JLogger; import org.apache.ws.java2wsdl.Java2WSDLCodegenEngine; import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -173,6 +175,10 @@ public class CodeGenWizard extends Wizar switch (selectedWizardType) { case SettingsConstants.WSDL_2_JAVA_TYPE: doFinishWSDL2Java(); +IProject selectedWorkspaceProject = outputPage.getSelectedWorkspaceProject(); +if(selectedWorkspaceProject != null){ + selectedWorkspaceProject.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); +} break; case SettingsConstants.JAVA_2_WSDL_TYPE: doFinishJava2WSDL(); Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java?rev=1161430&r1=1161429&r2=1161430&view=diff == --- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java Thu Aug 25 08:04:55 2011 @@ -88,6 +88,8 @@ public class OutputPage extends Abstract private boolean hintVisible = false; + private IProject selectedWorkspaceProject; + /** * @@ -110,6 +112,7 @@ public class OutputPage extends Abstract settings.put(PREF_CHECK_AXIS_PLUGIN_LIB_COPY, false); workspaceSaveOption = false; jarFileCopyOption = false; + selectedWorkspaceProject=null; } /* @@ -643,6 +646,8 @@ public class OutputPage extends Abstract if (project != null) { outputLocation.setText(project.getLocation() .toOSString() + builder.toString()); + //Fixing AXIS2-4063 + selectedWorkspaceProject=project; } else { // append to the workspace path if the project is // null @@ -664,4 +669,11 @@ public class OutputPage extends Abstract public int getPageType() { return WSDL_2_JAVA_TYPE; } + + public IProject getSelectedWorkspaceProject(){ + if(workspaceSaveOption){ + return selectedWorkspaceProject; + } + return null; + } }
svn commit: r1161536 - /axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
Author: sagara Date: Thu Aug 25 12:26:40 2011 New Revision: 1161536 URL: http://svn.apache.org/viewvc?rev=1161536&view=rev Log: Applied patch for AXIS2-5127. Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Modified: axis/axis2/java/core/trunk/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/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?rev=1161536&r1=1161535&r2=1161536&view=diff == --- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Thu Aug 25 12:26:40 2011 @@ -93,6 +93,8 @@ public class CodeGenWizard extends Wizar private int selectedCodegenOptionType = SettingsConstants.CODEGEN_DEFAULT_TYPE;//TODO change this +private static final String REFERNCE_FILE_PREFIX = "refernce:file:"; + private static Log logger=LogFactory.getLog(CodeGenWizard.class); @@ -546,6 +548,17 @@ public class CodeGenWizard extends Wizar // Copies all files under srcDir to dstDir. // If dstDir does not exist, it will be created. public void copyDirectory(File srcDir, File dstDir) throws IOException { + + // This only works if the given source directory is unavailable + if (!srcDir.exists()) { + String path = CodegenWizardPlugin.getDefault().getBundle() + .getLocation().substring(REFERNCE_FILE_PREFIX.length() + 1) + + File.separator + + srcDir.getPath().substring( + srcDir.getPath().lastIndexOf(File.separator) + 1); + srcDir = new File(path); + } + if (srcDir.isDirectory()) { if (!dstDir.exists()) { dstDir.mkdir();
svn commit: r1161553 - /axis/axis2/java/core/trunk/modules/samples/pojoguidespring/src/client/WeatherSpringRPCClient.java
Author: sagara Date: Thu Aug 25 13:16:29 2011 New Revision: 1161553 URL: http://svn.apache.org/viewvc?rev=1161553&view=rev Log: Applied patch for AXIS2-5128. Modified: axis/axis2/java/core/trunk/modules/samples/pojoguidespring/src/client/WeatherSpringRPCClient.java Modified: axis/axis2/java/core/trunk/modules/samples/pojoguidespring/src/client/WeatherSpringRPCClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/pojoguidespring/src/client/WeatherSpringRPCClient.java?rev=1161553&r1=1161552&r2=1161553&view=diff == --- axis/axis2/java/core/trunk/modules/samples/pojoguidespring/src/client/WeatherSpringRPCClient.java (original) +++ axis/axis2/java/core/trunk/modules/samples/pojoguidespring/src/client/WeatherSpringRPCClient.java Thu Aug 25 13:16:29 2011 @@ -42,7 +42,7 @@ public class WeatherSpringRPCClient { options.setTo(targetEPR); // Get the weather (no setting, the Spring Framework has already initialized it for us) -QName opGetWeather = new QName("http://service.spring.sample/xsd";, "getWeather"); +QName opGetWeather = new QName("http://service.spring.sample";, "getWeather"); Object[] opGetWeatherArgs = new Object[] { }; Class[] returnTypes = new Class[] { Weather.class };
svn commit: r1162691 - in /axis/axis2/java/core/trunk/modules: codegen/pom.xml distribution/pom.xml java2wsdl/pom.xml java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java pare
Author: sagara Date: Mon Aug 29 09:21:01 2011 New Revision: 1162691 URL: http://svn.apache.org/viewvc?rev=1162691&view=rev Log: * Updated to use latest JAX-WS 2.2 and JAXB 2.2 versions, but in JDK 1.6 build still use JAX-WS 2.1 because integrating Java endorsed mechanism with Maven is bit of complex. * Enabled JAX-WS code generation tests. * Updated version of maven-surefire-plugin - Use of older version of this plug in cause lot of issues running test cases. Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml axis/axis2/java/core/trunk/modules/distribution/pom.xml axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java axis/axis2/java/core/trunk/modules/parent/pom.xml Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1162691&r1=1162690&r2=1162691&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Mon Aug 29 09:21:01 2011 @@ -133,10 +133,7 @@ org.apache.maven.plugins maven-surefire-plugin true - - - **/JAXWSCodeGenerationEngineTest.java - + **/*Test.java Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1162691&r1=1162690&r2=1162691&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Mon Aug 29 09:21:01 2011 @@ -247,12 +247,12 @@ org.jvnet.staxex stax-ex -1.2 +1.4 com.sun.xml.stream.buffer streambuffer -0.7 +1.2 http://axis.apache.org/axis2/java/core/ Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=1162691&r1=1162690&r2=1162691&view=diff == --- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Mon Aug 29 09:21:01 2011 @@ -147,8 +147,7 @@ true -**/*Abstract*.java -**/JAXWS2WSDLCodegenEngineTest.java +**/*Abstract*.java **/*Test.java Modified: axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java?rev=1162691&r1=1162690&r2=1162691&view=diff == --- axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java (original) +++ axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java Mon Aug 29 09:21:01 2011 @@ -23,19 +23,26 @@ import java.io.File; import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser; public class JAXWS2WSDLCodegenEngineTest extends TestCase { + +private static final Log log = LogFactory +.getLog(JAXWS2WSDLCodegenEngineTest.class); -final String filePath = "./target/"; +final String filePath = "target/out"; -public void gsetUp() throws Exception { +public void setUp() throws Exception { super.setUp(); File dir = new File( filePath.concat("org/apache/ws/java2wsdl/jaxws/jaxws")); File wsdl = new File(filePath.concat("ServerInfoService.wsdl")); assertEquals("Generated directory still exists ", false, dir.exists()); assertEquals("Generated WSDL file still exists ", false, wsdl.exists()); +dir = new File(filePath)
svn commit: r1162703 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Author: sagara Date: Mon Aug 29 09:57:09 2011 New Revision: 1162703 URL: http://svn.apache.org/viewvc?rev=1162703&view=rev Log: Applied patch for Axis2-5074. Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=1162703&r1=1162702&r2=1162703&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java Mon Aug 29 09:57:09 2011 @@ -678,7 +678,9 @@ public class Utils { } public static String sanitizeWebOutput(String text) { -text = text.replaceAll("<", "<"); +if(text != null){ +text = text.replaceAll("<", "<"); +} return text; }
svn commit: r1162706 - /axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/Utils.java
Author: sagara Date: Mon Aug 29 10:01:12 2011 New Revision: 1162706 URL: http://svn.apache.org/viewvc?rev=1162706&view=rev Log: Applied patch for Axis2-5074. Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/Utils.java Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/Utils.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=1162706&r1=1162705&r2=1162706&view=diff == --- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/Utils.java (original) +++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/Utils.java Mon Aug 29 10:01:12 2011 @@ -678,7 +678,9 @@ public class Utils { } public static String sanitizeWebOutput(String text) { -text = text.replaceAll("<", "<"); +if(text != null){ +text = text.replaceAll("<", "<"); +} return text; }
svn commit: r1162711 - /axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java
Author: sagara Date: Mon Aug 29 10:04:35 2011 New Revision: 1162711 URL: http://svn.apache.org/viewvc?rev=1162711&view=rev Log: Applied patch for Axis2-5074. Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=1162711&r1=1162710&r2=1162711&view=diff == --- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java (original) +++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java Mon Aug 29 10:04:35 2011 @@ -566,7 +566,9 @@ public class Utils { } public static String sanitizeWebOutput(String text) { -text = text.replaceAll("<", "<"); +if(text != null){ +text = text.replaceAll("<", "<"); +} return text; } }
svn commit: r1163129 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Author: sagara Date: Tue Aug 30 08:05:02 2011 New Revision: 1163129 URL: http://svn.apache.org/viewvc?rev=1163129&view=rev Log: Modified Map schema generation so that null values can be passed. Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1163129&r1=1163128&r2=1163129&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java Tue Aug 30 08:05:02 2011 @@ -1815,7 +1815,9 @@ public class DefaultSchemaGenerator impl parameterElement.setMaxOccurs(Long.MAX_VALUE); parameterElement.setMinOccurs(0); parameterElement.setNillable(true); - } +} else { +parameterElement.setMinOccurs(0); +} sequence.getItems().add(parameterElement); parameterElement.setSchemaTypeName(parameterTypeName); return parameterTypeName;
svn commit: r1163991 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/typemapping/ adb/src/org/apache/axis2/databinding/utils/ adb/src/org/apache/axis2/rpc/receivers/ int
Author: sagara Date: Thu Sep 1 10:34:45 2011 New Revision: 1163991 URL: http://svn.apache.org/viewvc?rev=1163991&view=rev Log: Applied patch for AXIS2-3967. Added: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EnumService.java (with props) axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EnumTest.java (with props) axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/Event.java (with props) Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?rev=1163991&r1=1163990&r2=1163991&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java Thu Sep 1 10:34:45 2011 @@ -418,4 +418,13 @@ public class SimpleTypeMapper { } } +/*check weather passed parameter class is a java.lang.Enum +* +* @param classType the class type +* @return true , if it is an Enum +* */ + +public static boolean isEnum(Class classType) { +return java.lang.Enum.class.isAssignableFrom(classType); +} } Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1163991&r1=1163990&r2=1163991&view=diff == --- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original) +++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Thu Sep 1 10:34:45 2011 @@ -79,6 +79,7 @@ import org.w3c.dom.traversal.TreeWalker; public class BeanUtil { + private static int nsCount = 1; /** @@ -367,7 +368,12 @@ public class BeanUtil { addTypeQname(elemntNameSpace, propertyQnameValueList, property, beanName, processingDocLitBare); propertyQnameValueList.add(map); - } else { + } else if (SimpleTypeMapper.isEnum(ptype)){ +addTypeQname(elemntNameSpace, propertyQnameValueList, property, + beanName, processingDocLitBare); +propertyQnameValueList.add( +value == null ? null : SimpleTypeMapper.getStringValue(value.toString())); +}else { addTypeQname(elemntNameSpace, propertyQnameValueList, property, beanName, processingDocLitBare); if (Object.class.equals(ptype)) { @@ -376,16 +382,16 @@ public class BeanUtil { QName qNamefortheType = (QName) typeTable .getComplexSchemaMap().get( getClassName(beanClass)); - OMFactory fac = OMAbstractFactory.getOMFactory(); + OMFactory fac = OMAbstractFactory.getOMFactory(); QName elementName = new QName(elemntNameSpace .getNamespaceURI(), property.getName(), qNamefortheType.getPrefix()); OMElement element; if(SimpleTypeMapper.isSimpleType(value)){ - element = fac
svn commit: r1166038 - /axis/axis2/java/core/trunk/src/site/xdoc/docs/userguide-codelisting7.xml
Author: sagara Date: Wed Sep 7 08:06:41 2011 New Revision: 1166038 URL: http://svn.apache.org/viewvc?rev=1166038&view=rev Log: Fixed AXIS2-4655. Modified: axis/axis2/java/core/trunk/src/site/xdoc/docs/userguide-codelisting7.xml Modified: axis/axis2/java/core/trunk/src/site/xdoc/docs/userguide-codelisting7.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/xdoc/docs/userguide-codelisting7.xml?rev=1166038&r1=1166037&r2=1166038&view=diff == --- axis/axis2/java/core/trunk/src/site/xdoc/docs/userguide-codelisting7.xml (original) +++ axis/axis2/java/core/trunk/src/site/xdoc/docs/userguide-codelisting7.xml Wed Sep 7 08:06:41 2011 @@ -67,7 +67,7 @@ public class Client{ req.setMessageString("An in only request"); -stub.DoInOnly(req); +stub.doInOnly(req); System.out.println("done"); } catch(Exception e){ e.printStackTrace(); @@ -83,7 +83,7 @@ public class Client{ req.setEchoString("echo! ... echo!"); TwoWayOneParameterEchoResponse res = -stub.TwoWayOneParameterEcho(req); +stub.twoWayOneParameterEcho(req); System.out.println(res.getEchoString()); } catch(Exception e){ @@ -97,7 +97,7 @@ public class Client{ try{ NoParametersRequest req = new NoParametersRequest(); -System.out.println(stub.NoParameters(req)); +System.out.println(stub.noParameters(req)); } catch(Exception e){ e.printStackTrace(); System.out.println("\n\n\n"); @@ -116,7 +116,7 @@ public class Client{ req.setItemName("flour"); MultipleParametersAddItemResponse res = -stub.MultipleParametersAddItem(req); +stub.multipleParametersAddItem(req); System.out.println(res.getSuccessfulAdd()); System.out.println(res.getItemId());
svn commit: r1166040 - /axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml
Author: sagara Date: Wed Sep 7 08:10:06 2011 New Revision: 1166040 URL: http://svn.apache.org/viewvc?rev=1166040&view=rev Log: Fixed AXIS2-5069. Modified: axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml Modified: axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml?rev=1166040&r1=1166039&r2=1166040&view=diff == --- axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml (original) +++ axis/axis2/java/core/trunk/src/site/xdoc/docs/axis2config.xml Wed Sep 7 08:10:06 2011 @@ -52,9 +52,10 @@ configuration). This document explains t All the configurations that require starting Axis2 are obtained from axis2.xml. The way to specify them is extremely simple and easy. The document -is all about the proper way of specifying the configurations in axis2.xml. -There are six top level elements that can be seen in the configuration file -and can be listed as follows: +is all about the proper way of specifying the configurations in axis2.xml, which +is located at AXIS2_HOME/conf. There are six top level elements that +can be seen in the configuration file inside the root element, +<axisconfig name="AxisJava2.0"> and can be listed as follows: Parameter Transport Receiver @@ -298,7 +299,9 @@ AxisObserver interface, and the class ha The description of services are specified using services.xml. Each service archive file needs to have a services.xml in order to be a valid service and it should be available in the META-INF directory of the archive -file. A very simple services.xml is shown below: +file(aar) which should be located in AXIS2_HOME/repository/services in +standalone use. In war distribution this will be axis2/WEB-INF/services +inside the servlet container. A very simple services.xml is shown below: <service name="name of the service" scope="name of the scope" class="full qualifide name the service lifecycle class" targetNamespace="target namespase for the service"> <Description> The description of the service </Description> @@ -383,7 +386,9 @@ default message receiver will perform th The description of the module is specified using the module.xml. Each module archive file needs to have a module.xml in order to be a valid module, -and it should be available in the META-INF directory of the archive file. +and it should be available in the META-INF directory of the archive file(mar) +which should be located in AXIS2_HOME/repository/modules in standalone use. +In war distribution this will be axis2/WEB-INF/modules inside the servlet container. A very simple module.xml is shown below: