svn commit: r1034388 - 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: veithen Date: Fri Nov 12 13:07:16 2010 New Revision: 1034388 URL: http://svn.apache.org/viewvc?rev=1034388&view=rev Log: Updated POM metadata. 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=1034388&r1=1034387&r2=1034388&view=diff == --- axis/axis2/java/transports/trunk/modules/all/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/all/pom.xml Fri Nov 12 13:07:16 2010 @@ -33,6 +33,13 @@ bundle Axis2 Transport 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 + + release 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=1034388&r1=1034387&r2=1034388&view=diff == --- axis/axis2/java/transports/trunk/modules/base/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/base/pom.xml Fri Nov 12 13:07:16 2010 @@ -36,6 +36,12 @@ Apache Axis2 - Base Transport 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 + + 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=1034388&r1=1034387&r2=1034388&view=diff == --- axis/axis2/java/transports/trunk/modules/http/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/http/pom.xml Fri Nov 12 13:07:16 2010 @@ -33,6 +33,12 @@ This inclues all the available transports in Axis2 bundle + + 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 + + src test 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=1034388&r1=1034387&r2=1034388&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/jms/pom.xml Fri Nov 12 13:07:16 2010 @@ -36,6 +36,12 @@ Apache Axis2 - JMS Transport bundle + + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/jms + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/jms + http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms + + 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=1034388&r1=1034387&r2=1034388&view=diff == --- axis/axis2/java/transports/trunk/modules/mail/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/mail/pom.xml Fri Nov 12 13:07:16 2010 @@ -36,6 +36,12 @@ Apache Axis2 - Mail Transport bundle + + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/mail + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/mail + http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail + + Modified: axis/axis2/java/transports/trunk/modules/sms/pom.xml URL: http://svn.apache.org/viewvc/axis/ax
svn commit: r1034391 - in /axis/axis2/java/transports/trunk/modules: all/pom.xml base/pom.xml http/pom.xml jms/pom.xml mail/pom.xml sms/pom.xml tcp/pom.xml udp/pom.xml xmpp/pom.xml
Author: veithen
Date: Fri Nov 12 13:16:37 2010
New Revision: 1034391
URL: http://svn.apache.org/viewvc?rev=1034391&view=rev
Log:
Removed the explicit Bundle-Version from the maven-bundle-plugin configuration,
so that we don't need to increment the version number manually during a
release. The plugin is able to calculate a suitable version number itself.
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/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=1034391&r1=1034390&r2=1034391&view=diff
==
--- axis/axis2/java/transports/trunk/modules/all/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/all/pom.xml Fri Nov 12 13:16:37
2010
@@ -188,7 +188,6 @@
true
-1.0
${pom.artifactId}
Apache Software
Foundation
${pom.description}
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=1034391&r1=1034390&r2=1034391&view=diff
==
--- axis/axis2/java/transports/trunk/modules/base/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/base/pom.xml Fri Nov 12 13:16:37
2010
@@ -60,7 +60,6 @@
true
-1.1.0
${pom.artifactId}
Apache Software
Foundation
${pom.description}
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=1034391&r1=1034390&r2=1034391&view=diff
==
--- axis/axis2/java/transports/trunk/modules/http/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/http/pom.xml Fri Nov 12 13:16:37
2010
@@ -64,7 +64,6 @@
true
-1.1.0
${pom.artifactId}
Apache Software
Foundation
${pom.description}
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=1034391&r1=1034390&r2=1034391&view=diff
==
--- axis/axis2/java/transports/trunk/modules/jms/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/jms/pom.xml Fri Nov 12 13:16:37
2010
@@ -89,7 +89,6 @@
true
-1.1.0
${pom.artifactId}
Apache Software
Foundation
${pom.description}
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=1034391&r1=1034390&r2=1034391&view=diff
==
--- axis/axis2/java/transports/trunk/modules/mail/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/mail/pom.xml Fri Nov 12 13:16:37
2010
@@ -51,7 +51,6 @@
true
-1.1.0
${pom.artifactId}
Apache Software Foundation
${pom.description}
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=1034391&r1=1034390&r2=1034391&view=diff
==
--- axis/axis2/java/transports/trunk/modules/sms/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/sms/pom.xml Fri Nov 12 13:16:37
2010
@@ -51,7 +51,6 @@
true
-1.1.0
${pom.artifactId}
Apache Software
Foundation
${pom.description}
Modified: axis/axis2/java/transports/trunk/modules/tcp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis
svn commit: r1034392 - /axis/axis2/java/transports/trunk/modules/http/pom.xml
Author: veithen
Date: Fri Nov 12 13:19:18 2010
New Revision: 1034392
URL: http://svn.apache.org/viewvc?rev=1034392&view=rev
Log:
The http module only contains unit tests; no need to build it as a bundle.
Modified:
axis/axis2/java/transports/trunk/modules/http/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=1034392&r1=1034391&r2=1034392&view=diff
==
--- axis/axis2/java/transports/trunk/modules/http/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/http/pom.xml Fri Nov 12 13:19:18
2010
@@ -31,7 +31,7 @@
axis2-transport-http-tests
Apache Axis2 - Transport - HTTP Tests
This inclues all the available transports in
Axis2
-bundle
+jar
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/transports/trunk/modules/http
@@ -56,24 +56,6 @@
-
-
-org.apache.felix
-maven-bundle-plugin
-1.4.0
-true
-
-
-${pom.artifactId}
-Apache Software
Foundation
-
${pom.description}
-
${pom.artifactId}
-
-
org.apache.axis2.transport.http.*;-split-package:=merge-last,
-
-
-
-
svn commit: r1034398 - /axis/axis2/java/transports/trunk/src/site/xdoc/sms.xml
Author: veithen Date: Fri Nov 12 13:34:43 2010 New Revision: 1034398 URL: http://svn.apache.org/viewvc?rev=1034398&view=rev Log: Fixed corrupted document so that the site can be built again. Modified: axis/axis2/java/transports/trunk/src/site/xdoc/sms.xml Modified: axis/axis2/java/transports/trunk/src/site/xdoc/sms.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/xdoc/sms.xml?rev=1034398&r1=1034397&r2=1034398&view=diff == --- axis/axis2/java/transports/trunk/src/site/xdoc/sms.xml (original) +++ axis/axis2/java/transports/trunk/src/site/xdoc/sms.xml Fri Nov 12 13:34:43 2010 @@ -274,279 +274,3 @@ - -http://www.apache.org/dtds/xdoc_1_0.dtd";> - - - -new document - - - -The SMS Transport will allow send and receive -messages in the form of SMSs used in mobile phones.Using this transport -the users will be able to invoke webservices using a SMS and get the -responce.SMS Transport is mainly focus on enableing SMPP protocal support -for the Axis2 so that It can connect with a SMSC to send/receive SMS.It -will also have a GSM implimentation that will enable users to connect a -GSM modem and send/receive sms s using that.The configuration parameters -will be different depend on the implimentaion that the user will be using -(SMPP/ GSM) Follwoing up section will be discuss more details about the -configuration ,usage and Extenting of the SMS Transport - - - -In -order to use the sms Transport Listener It must be Configured in the -Axis2.xml.It will be having set of parameters to be configured depending -on the implementation that a user needed.(SMPP/GSM) - - - -Parameters Needed for the SMPP and GSM implementation are Explined -bellow. - - -SMPP Configuration - -When using the SMPP -implimentaiton It will connect with a SMSC (Short Message Service center) -and Listening to the incomming messsages on a TCP connection.This -implimentaion can be used when the data traffic is so high. - - -Parameter - -Required - -Description - - - -systemType - -No - -To inform the binding SMSC about the system Type That connecting -to it.The Default value is "cp". .Some SMSC s does not require this -to connect. - - - - -systemId - -Yes - -The system_id parameter is used to identify an ESME (In this -case Axis2 )or an SMSC at bind time. An ESME system_id identifies -the ESME or ESME agent to the SMSC. The SMSC system_id provides an -identification of the SMSC to the ESME. - - - - - -Password - - -Yes - -The password parameter is used by the SMSC to authenticate the -identity of the binding ESME (In this Case Axis2). The Service -Provider may require ESMEâs to provide a password when binding to -the SMSC. This password is normally issued by the SMSC system -administrator. - - - - -host - -No - -The IP address of the host that SMSC is located.The default is -Local host - 127.0.0.1 - - - - -port - -No - -The port Number that Axis2 must connect with the SMSC.The -Default port is 2775 - - - - -phoneNumber - -No - -The phone Number that Axis2 Application given from the Service -pr
svn commit: r1034399 - /axis/axis2/java/transports/trunk/src/site/xdoc/index.xml
Author: veithen Date: Fri Nov 12 13:38:02 2010 New Revision: 1034399 URL: http://svn.apache.org/viewvc?rev=1034399&view=rev Log: Added missing links on the index page. Modified: axis/axis2/java/transports/trunk/src/site/xdoc/index.xml 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=1034399&r1=1034398&r2=1034399&view=diff == --- axis/axis2/java/transports/trunk/src/site/xdoc/index.xml (original) +++ axis/axis2/java/transports/trunk/src/site/xdoc/index.xml Fri Nov 12 13:38:02 2010 @@ -46,8 +46,8 @@ E-Mail Transport TCP Transport SMS Transport - UDP Transport - XMPP Transport + UDP Transport + XMPP Transport
svn commit: r1034400 - /axis/axis2/java/transports/trunk/src/site/apt/udp.apt
Author: veithen
Date: Fri Nov 12 13:39:05 2010
New Revision: 1034400
URL: http://svn.apache.org/viewvc?rev=1034400&view=rev
Log:
Fixed incorrect title.
Modified:
axis/axis2/java/transports/trunk/src/site/apt/udp.apt
Modified: axis/axis2/java/transports/trunk/src/site/apt/udp.apt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/apt/udp.apt?rev=1034400&r1=1034399&r2=1034400&view=diff
==
--- axis/axis2/java/transports/trunk/src/site/apt/udp.apt (original)
+++ axis/axis2/java/transports/trunk/src/site/apt/udp.apt Fri Nov 12 13:39:05
2010
@@ -15,7 +15,7 @@
~~ specific language governing permissions and limitations
~~ under the License.
-JMS Transport
+UDP Transport
* {Content}
svn commit: r1034504 - in /axis/axis2/java/core/trunk/modules/kernel: src/org/apache/axis2/description/ src/org/apache/axis2/engine/ src/org/apache/axis2/util/ test/org/apache/axis2/engine/
Author: veithen
Date: Fri Nov 12 18:38:50 2010
New Revision: 1034504
URL: http://svn.apache.org/viewvc?rev=1034504&view=rev
Log:
Eliminated some compiler warnings.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/engine/DispatchPhaseTest.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java?rev=1034504&r1=1034503&r2=1034504&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java
Fri Nov 12 18:38:50 2010
@@ -77,6 +77,7 @@ public class AxisOperationFactory implem
}
//FIXME add in the latest MEP URIs AND needs to double check on about the
mep we had in 2004
+@SuppressWarnings("deprecation")
public static AxisOperation getOperationDescription(String mepURI) throws
AxisFault {
AxisOperation abOpdesc;
if (WSDL2Constants.MEP_URI_IN_ONLY.equals(mepURI) ||
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1034504&r1=1034503&r2=1034504&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
Fri Nov 12 18:38:50 2010
@@ -395,7 +395,8 @@ public class AxisService extends AxisDes
this.name = name;
}
- public void addMessageReceiver(String mepURI,
+ @SuppressWarnings("deprecation")
+public void addMessageReceiver(String mepURI,
MessageReceiver messageReceiver) {
if (WSDL2Constants.MEP_URI_IN_ONLY.equals(mepURI)
||
WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY
@@ -510,7 +511,7 @@ public class AxisService extends AxisDes
}
public MessageReceiver getMessageReceiver(String mepURL) {
- return (MessageReceiver) messageReceivers.get(mepURL);
+ return messageReceivers.get(mepURL);
}
/**
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java?rev=1034504&r1=1034503&r2=1034504&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
Fri Nov 12 18:38:50 2010
@@ -376,6 +376,7 @@ public class DispatchPhase extends Phase
* This method will determine if the MEP indicated by 'mepString' specifies
* a oneway MEP.
*/
+@SuppressWarnings("deprecation")
boolean isOneway(String mepString) {
return (mepString.equals(WSDL20_2006Constants.MEP_URI_IN_ONLY)
|| mepString.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY)
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=1034504&r1=1034503&r2=1034504&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
Fri Nov 12 18:38:50 2010
@@ -443,6 +443,7 @@ public class Utils {
* Further, in the first lookup, it will cache the looked
* up value so that the subsequent method calls are extremely efficient.
*/
+@SuppressWarnings("deprecation")
public static int getAxisSpecifMEPConstant(String messageExchangePattern) {
Modified:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/engine/DispatchPhaseTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk
svn commit: r1034563 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: context/ description/ transport/http/ util/
Author: veithen
Date: Fri Nov 12 21:00:02 2010
New Revision: 1034563
URL: http://svn.apache.org/viewvc?rev=1034563&view=rev
Log:
Replaced some invocations of the deprecated UUIDGenerator by calls to the new
UIDGenerator.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
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/context/ConfigurationContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?rev=1034563&r1=1034562&r2=1034563&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Fri Nov 12 21:00:02 2010
@@ -20,7 +20,7 @@
package org.apache.axis2.context;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.clustering.ClusteringAgent;
@@ -268,7 +268,7 @@ public class ConfigurationContext extend
serviceGroupContext =
createServiceGroupContext(axisServiceGroup);
serviceContext =
serviceGroupContext.getServiceContext(axisService);
// set the serviceGroupContextID
-serviceGroupContextId = UUIDGenerator.getUUID();
+serviceGroupContextId = UIDGenerator.generateURNString();
serviceGroupContext.setId(serviceGroupContextId);
messageContext.setServiceGroupContextId(serviceGroupContextId);
addServiceGroupContextIntoSoapSessionTable(serviceGroupContext);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java?rev=1034563&r1=1034562&r2=1034563&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
Fri Nov 12 21:00:02 2010
@@ -19,7 +19,7 @@
package org.apache.axis2.description;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.util.AxisPolicyLocator;
import org.apache.axis2.util.PolicyUtil;
import org.apache.neethi.Policy;
@@ -118,7 +118,7 @@ public class PolicyInclude {
wrapperElements.clear();
if (policy.getName() == null && policy.getId() == null) {
-policy.setId(UUIDGenerator.getUUID());
+policy.setId(UIDGenerator.generateUID());
}
Wrapper wrapper = new Wrapper(PolicyInclude.ANON_POLICY, policy);
@@ -353,7 +353,7 @@ public class PolicyInclude {
String key;
if ((key = policy.getName()) == null && (key = policy.getId()) ==
null) {
-policy.setId(UUIDGenerator.getUUID());
+policy.setId(UIDGenerator.generateUID());
}
key = (policy.getName() != null) ? policy.getName() : policy.getId();
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java?rev=1034563&r1=1034562&r2=1034563&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
Fri Nov 12 21:00:02 2010
@@ -19,7 +19,7 @@
package org.apache.axis2.description;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyReference;
@@ -42,7 +42,7 @@ public class PolicySubject {
if (key == null) {
key = policy.getId();
if (key == null) {
-
svn commit: r1034575 - /axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java
Author: veithen
Date: Fri Nov 12 21:30:21 2010
New Revision: 1034575
URL: http://svn.apache.org/viewvc?rev=1034575&view=rev
Log:
Added a test case for the MM7 stuff in SOAPMessageFormatter, so that we can
safely refactor that code.
Added:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java
(with props)
Added:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java?rev=1034575&view=auto
==
---
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java
(added)
+++
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java
Fri Nov 12 21:30:21 2010
@@ -0,0 +1,69 @@
+/*
+ * 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.http;
+
+import java.io.ByteArrayOutputStream;
+
+import javax.activation.DataHandler;
+import javax.mail.BodyPart;
+import javax.mail.internet.MimeMultipart;
+import javax.mail.util.ByteArrayDataSource;
+
+import junit.framework.TestCase;
+
+import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axis2.Constants;
+import org.apache.axis2.context.MessageContext;
+
+public class SOAPMessageFormatterTest extends TestCase {
+public void testMM7() throws Exception {
+SOAPMessageFormatter formatter = new SOAPMessageFormatter();
+MessageContext mc = new MessageContext();
+SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
+mc.setEnvelope(factory.getDefaultEnvelope());
+mc.setDoingSwA(true);
+Attachments attachments = mc.getAttachmentMap();
+attachments.addDataHandler("c...@test.org", new DataHandler("test1",
"text/plain"));
+attachments.addDataHandler("c...@test.org", new DataHandler("test2",
"text/plain"));
+mc.setProperty(Constants.Configuration.MM7_COMPATIBLE, true);
+OMOutputFormat format = new OMOutputFormat();
+format.setDoingSWA(true);
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+formatter.writeTo(mc, format, baos, true);
+
+MimeMultipart mp = new MimeMultipart(new
ByteArrayDataSource(baos.toByteArray(), format.getContentType()));
+assertEquals(2, mp.getCount());
+BodyPart bp = mp.getBodyPart(0);
+assertEquals("<" + format.getRootContentId() + ">",
bp.getHeader("Content-ID")[0]);
+bp = mp.getBodyPart(1);
+Object content = bp.getContent();
+assertTrue(content instanceof MimeMultipart);
+MimeMultipart inner = (MimeMultipart)content;
+assertEquals(2, inner.getCount());
+bp = inner.getBodyPart(0);
+assertEquals("", bp.getHeader("Content-ID")[0]);
+assertEquals("test1", bp.getContent());
+bp = inner.getBodyPart(1);
+assertEquals("", bp.getHeader("Content-ID")[0]);
+assertEquals("test2", bp.getContent());
+}
+}
Propchange:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java
--
svn:eol-style = native
svn commit: r1034587 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
Author: veithen
Date: Fri Nov 12 22:31:21 2010
New Revision: 1034587
URL: http://svn.apache.org/viewvc?rev=1034587&view=rev
Log:
Eliminated another deprecation warning caused by the usage of
OMNode#serialize(Writer) [the serialize(Writer) method is only meaningful for
OMContainers].
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?rev=1034587&r1=1034586&r2=1034587&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
Fri Nov 12 22:31:21 2010
@@ -183,13 +183,13 @@ public abstract class AxisDescription im
public String getDocumentation() {
if (documentation != null) {
-if (documentation.getType() == OMNode.TEXT_NODE) {
+if (documentation instanceof OMText) {
return ((OMText)documentation).getText();
-} else {
+} else if (documentation instanceof OMElement) {
StringWriter writer = new StringWriter();
documentation.build();
try {
-documentation.serialize(writer);
+((OMElement)documentation).serialize(writer);
} catch (XMLStreamException e) {
log.error(e);
}
svn commit: r1034598 - /axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java
Author: veithen
Date: Fri Nov 12 23:11:30 2010
New Revision: 1034598
URL: http://svn.apache.org/viewvc?rev=1034598&view=rev
Log:
Eliminated an instance of the catch-and-fail JUnit antipattern.
Modified:
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java
Modified:
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java?rev=1034598&r1=1034597&r2=1034598&view=diff
==
---
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java
Fri Nov 12 23:11:30 2010
@@ -53,14 +53,9 @@ public class AttachmentSerializationTest
@Validated @Test
public void testAttachments() throws Exception {
-try {
-ByteArrayOutputStream bais = new ByteArrayOutputStream();
-int count = saveMsgWithAttachments(bais);
-assertEquals(count, 2);
-} catch (Exception e) {
-e.printStackTrace();
-fail("Unexpected Exception : " + e);
-}
+ByteArrayOutputStream bais = new ByteArrayOutputStream();
+int count = saveMsgWithAttachments(bais);
+assertEquals(count, 2);
}
public int saveMsgWithAttachments(OutputStream os) throws Exception {
