svn commit: r1083379 - in /axis/axis2/java/core/trunk: modules/samples/java_first_jaxws/pom.xml pom.xml

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 09:16:44 2011
New Revision: 1083379

URL: http://svn.apache.org/viewvc?rev=1083379&view=rev
Log:
Include the java_first_jaxws sample in the "everything" profile, so that 
version numbers will be updated by release:branch and release:prepare. Also 
updated the version number of the java_first_jaxws module itself (it will be 
updated by maven-release-plugin anyway).

Modified:
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
axis/axis2/java/core/trunk/pom.xml

Modified: axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml?rev=1083379&r1=1083378&r2=1083379&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml 
(original)
+++ axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml Sun Mar 
20 09:16:44 2011
@@ -24,7 +24,7 @@
 org.apache.axis2.examples
 java_first_jaxws
 JAXWS - Starting from Java Example
-1.1
+1.7.0-SNAPSHOT
 war
 2004
 

Modified: axis/axis2/java/core/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1083379&r1=1083378&r2=1083379&view=diff
==
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sun Mar 20 09:16:44 2011
@@ -94,6 +94,7 @@
 everything
 
 modules/distribution
+modules/samples/java_first_jaxws

svn commit: r1083381 - /axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 09:27:14 2011
New Revision: 1083381

URL: http://svn.apache.org/viewvc?rev=1083381&view=rev
Log:
Fixed the axis2.xml file used by the java_first_jaxws sample as per AXIS2-4465.

Modified:

axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml

Modified: 
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml?rev=1083381&r1=1083380&r2=1083381&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
 (original)
+++ 
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
 Sun Mar 20 09:27:14 2011
@@ -168,31 +168,7 @@
 
 
 
-8080
-
-
-
-
-
-
-
-
-
-
+   
class="org.apache.axis2.transport.http.AxisServletListener"/>

svn commit: r1083382 - in /axis/axis2/java/core/branches/1_6: ./ modules/samples/java_first_jaxws/pom.xml modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml pom.xml

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 09:35:00 2011
New Revision: 1083382

URL: http://svn.apache.org/viewvc?rev=1083382&view=rev
Log:
Merged r1083379 and r1083381 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml

axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
axis/axis2/java/core/branches/1_6/pom.xml

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 09:35:00 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381

Modified: 
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml?rev=1083382&r1=1083381&r2=1083382&view=diff
==
--- axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml 
(original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml 
Sun Mar 20 09:35:00 2011
@@ -24,7 +24,7 @@
 org.apache.axis2.examples
 java_first_jaxws
 JAXWS - Starting from Java Example
-1.1
+1.6.1-SNAPSHOT
 war
 2004
 

Modified: 
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml?rev=1083382&r1=1083381&r2=1083382&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
 Sun Mar 20 09:35:00 2011
@@ -168,31 +168,7 @@
 
 
 
-8080
-
-
-
-
-
-
-
-
-
-
+   
class="org.apache.axis2.transport.http.AxisServletListener"/>

svn commit: r1083387 - /axis/axis2/java/rampart/branches/1_6/

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 10:26:31 2011
New Revision: 1083387

URL: http://svn.apache.org/viewvc?rev=1083387&view=rev
Log:
Added missing svn:mergeinfo.

Modified:
axis/axis2/java/rampart/branches/1_6/   (props changed)

Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 10:26:31 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266,1072313,1072316,1072324,1073746,1074043,1074447,1074534,1075676,1075684
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684

svn commit: r1083389 - /axis/axis2/java/rampart/branches/1_6/pom.xml

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 10:34:58 2011
New Revision: 1083389

URL: http://svn.apache.org/viewvc?rev=1083389&view=rev
Log:
Updated the Axis2 version on the 1.6 branch.

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=1083389&r1=1083388&r2=1083389&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Sun Mar 20 10:34:58 2011
@@ -411,7 +411,7 @@
 ${pom.version}
 ${pom.version}
 
-1.6.0-SNAPSHOT
+1.6.1-SNAPSHOT
 1.2.11
 
 1.5.11

svn commit: r1083425 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 12:45:22 2011
New Revision: 1083425

URL: http://svn.apache.org/viewvc?rev=1083425&view=rev
Log:
Fixed an issue in the service hierarchy stuff in JAXWSDeployer that causes the 
java_first_jaxws sample service to be deployed as "nullHelloWorld" instead of 
"HelloWorld".

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1083425&r1=1083424&r2=1083425&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
 Sun Mar 20 12:45:22 2011
@@ -210,8 +210,11 @@ public class JAXWSDeployer extends Abstr
 className,
 location);
 if(axisService != null) {
+if (serviceHierarchy != null) {
+axisService.setName(serviceHierarchy + 
axisService.getName());
+}
 log.info("Deploying JAXWS annotated class " + className + 
" as a service - "
-+ serviceHierarchy + axisService.getName());
++ axisService.getName());
 axisServiceList.add(axisService);
 }
 }
@@ -222,9 +225,10 @@ public class JAXWSDeployer extends Abstr
 }
 //creating service group by considering the hierarchical path also
 AxisServiceGroup serviceGroup = new AxisServiceGroup();
-serviceGroup.setServiceGroupName(serviceHierarchy + groupName);
+if (serviceHierarchy != null) {
+serviceGroup.setServiceGroupName(serviceHierarchy + groupName);
+}
 for (AxisService axisService : axisServiceList) {
-axisService.setName(serviceHierarchy + axisService.getName());
 serviceGroup.addService(axisService);
 }
 axisConfig.addServiceGroup(serviceGroup);

svn commit: r1083433 - in /axis/axis2/java/core/trunk: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/all/ modules/clustering/ modules/codegen/ modules/corba/ modules/fastinfoset/ mo

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 12:56:08 2011
New Revision: 1083433

URL: http://svn.apache.org/viewvc?rev=1083433&view=rev
Log:
Fixed a couple of Maven 3 warnings.

Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
axis/axis2/java/core/trunk/modules/adb/pom.xml
axis/axis2/java/core/trunk/modules/addressing/pom.xml
axis/axis2/java/core/trunk/modules/all/pom.xml
axis/axis2/java/core/trunk/modules/clustering/pom.xml
axis/axis2/java/core/trunk/modules/codegen/pom.xml
axis/axis2/java/core/trunk/modules/corba/pom.xml
axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-mar/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/jibx/pom.xml
axis/axis2/java/core/trunk/modules/json/pom.xml
axis/axis2/java/core/trunk/modules/kernel/pom.xml
axis/axis2/java/core/trunk/modules/metadata/pom.xml
axis/axis2/java/core/trunk/modules/mex/pom.xml
axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml
axis/axis2/java/core/trunk/modules/mtompolicy/pom.xml
axis/axis2/java/core/trunk/modules/osgi/pom.xml
axis/axis2/java/core/trunk/modules/ping/pom.xml
axis/axis2/java/core/trunk/modules/saaj/pom.xml
axis/axis2/java/core/trunk/modules/samples/version/pom.xml
axis/axis2/java/core/trunk/modules/scripting/pom.xml
axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml
axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml
axis/axis2/java/core/trunk/modules/spring/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/pom.xml
axis/axis2/java/core/trunk/modules/transport/local/pom.xml
axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml
axis/axis2/java/core/trunk/pom.xml

Modified: axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml?rev=1083433&r1=1083432&r2=1083433&view=diff
==
--- axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml Sun Mar 20 12:56:08 
2011
@@ -93,7 +93,7 @@
 
 
 
-
org.apache.axis2:axis2-resource-bundle:${pom.version}
+
org.apache.axis2:axis2-resource-bundle:${project.version}
 
 
 

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=1083433&r1=1083432&r2=1083433&view=diff
==
--- axis/axis2/java/core/trunk/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb/pom.xml Sun Mar 20 12:56:08 2011
@@ -86,7 +86,7 @@
 
 
 
-
org.apache.axis2:axis2-resource-bundle:${pom.version}
+
org.apache.axis2:axis2-resource-bundle:${project.version}
 
 
 

Modified: axis/axis2/java/core/trunk/modules/addressing/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/pom.xml?rev=1083433&r1=1083432&r2=1083433&view=diff
==
--- axis/axis2/java/core/trunk/modules/addressing/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/addressing/pom.xml Sun Mar 20 12:56:08 
2011
@@ -85,7 +85,7 @@
 
 
 
-
org.apache.axis2:axis2-resource-bundle:${pom.version}
+
org.apache.axis2:axis2-resource-bundle:${project.version}
 
 
 

Modified: axis/axis2/java/core/trunk/modules/all/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/all/pom.xml?rev=1083433&r1=1083432&r2=1083433&view=diff
===

svn commit: r1083446 - /axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 14:11:02 2011
New Revision: 1083446

URL: http://svn.apache.org/viewvc?rev=1083446&view=rev
Log:
Eliminated several instances of the catch-and-fail JUnit anti-pattern.

Modified:

axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java

Modified: 
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java?rev=1083446&r1=1083445&r2=1083446&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
 Sun Mar 20 14:11:02 2011
@@ -228,24 +228,20 @@ public class AttachmentTest extends Asse
 
 @Validated @Test
 public void testGetContent() throws Exception {
-try {
-MessageFactory factory = MessageFactory.newInstance();
-SOAPMessage msg = factory.createMessage();
-AttachmentPart ap = msg.createAttachmentPart();
-Image image = ImageIO.read(TestUtils.getTestFileURL("attach.gif"));
-ap = msg.createAttachmentPart(image, "image/gif");
-
-//Getting Content should return an Image object
-Object o = ap.getContent();
-if (o != null) {
-if (o instanceof Image) {
-//Image object was returned (ok)
-} else {
-fail("Unexpected object was returned");
-}
+MessageFactory factory = MessageFactory.newInstance();
+SOAPMessage msg = factory.createMessage();
+AttachmentPart ap = msg.createAttachmentPart();
+Image image = ImageIO.read(TestUtils.getTestFileURL("attach.gif"));
+ap = msg.createAttachmentPart(image, "image/gif");
+
+//Getting Content should return an Image object
+Object o = ap.getContent();
+if (o != null) {
+if (o instanceof Image) {
+//Image object was returned (ok)
+} else {
+fail("Unexpected object was returned");
 }
-} catch (Exception e) {
-fail("Exception: " + e);
 }
 }
 
@@ -269,39 +265,35 @@ public class AttachmentTest extends Asse
 }
 
 @Validated @Test
-public void testSetBase64Content() {
-try {
-MessageFactory factory = MessageFactory.newInstance();
-SOAPMessage msg = factory.createMessage();
-AttachmentPart ap = msg.createAttachmentPart();
-
-String urlString = "http://ws.apache.org/images/project-logo.jpg";;
-if (isNetworkedResourceAvailable(urlString)) {
-URL url = new URL(urlString);
-DataHandler dh = new DataHandler(url);
-//Create InputStream from DataHandler's InputStream
-InputStream is = dh.getInputStream();
-
-byte buf[] = IOUtils.getStreamAsByteArray(is);
-//Setting Content via InputStream for image/jpeg mime type
-ByteArrayOutputStream bos = new ByteArrayOutputStream();
-Base64.encode(buf, 0, buf.length, bos);
-buf = bos.toByteArray();
-InputStream stream = new ByteArrayInputStream(buf);
-ap.setBase64Content(stream, "image/jpeg");
-
-//Getting Content.. should return InputStream object
-InputStream r = ap.getBase64Content();
-if (r != null) {
-if (r instanceof InputStream) {
-//InputStream object was returned (ok)
-} else {
-fail("Unexpected object was returned");
-}
+public void testSetBase64Content() throws Exception {
+MessageFactory factory = MessageFactory.newInstance();
+SOAPMessage msg = factory.createMessage();
+AttachmentPart ap = msg.createAttachmentPart();
+
+String urlString = "http://ws.apache.org/images/project-logo.jpg";;
+if (isNetworkedResourceAvailable(urlString)) {
+URL url = new URL(urlString);
+DataHandler dh = new DataHandler(url);
+//Create InputStream from DataHandler's InputStream
+InputStream is = dh.getInputStream();
+
+byte buf[] = IOUtils.getStreamAsByteArray(is);
+//Setting Content via InputStream for image/jpeg mime type
+ByteArrayOutputStream bos = new ByteArrayOutputStream();
+Base64.encode(buf, 0, buf.length, bos);
+buf = bos.toByteArray();
+InputStream stream = new ByteArrayInputStream(buf);
+ap.setBase64Content(stream, "image/jpeg");
+
+//Getting Content.. should return InputStream

svn commit: r1083472 - in /axis/axis2/java/core/branches/1_6: ./ modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 15:46:12 2011
New Revision: 1083472

URL: http://svn.apache.org/viewvc?rev=1083472&view=rev
Log:
Merged r1083446 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 15:46:12 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
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083446

Modified: 
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java?rev=1083472&r1=1083471&r2=1083472&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
 Sun Mar 20 15:46:12 2011
@@ -228,24 +228,20 @@ public class AttachmentTest extends Asse
 
 @Validated @Test
 public void testGetContent() throws Exception {
-try {
-MessageFactory factory = MessageFactory.newInstance();
-SOAPMessage msg = factory.createMessage();
-AttachmentPart ap = msg.createAttachmentPart();
-Image image = ImageIO.read(TestUtils.getTestFileURL("attach.gif"));
-ap = msg.createAttachmentPart(image, "image/gif");
-
-//Getting Content should return an Image object
-Object o = ap.getContent();
-if (o != null) {
-if (o instanceof Image) {
-//Image object was returned (ok)
-} else {
-fail("Unexpected object was returned");
-}
+MessageFactory factory = MessageFactory.newInstance();
+SOAPMessage msg = factory.createMessage();
+AttachmentPart ap = msg.createAttachmentPart();
+Image image = ImageIO.read(TestUtils.getTestFileURL("attach.gif"));
+ap = msg.createAttachmentPart(image, "image/gif");
+
+//Getting Content should return an Image object
+Object o = ap.getContent();
+if (o != null) {
+if (o instanceof Image) {
+//Image object was returned (ok)
+} else {
+fail("Unexpected object was returned");
 }
-} catch (Exception e) {
-fail("Exception: " + e);
 }
 }
 
@@ -269,39 +265,35 @@ public class AttachmentTest extends Asse
 }
 
 @Validated @Test
-public void testSetBase64Content() {
-try {
-MessageFactory factory = MessageFactory.newInstance();
-SOAPMessage msg = factory.createMessage();
-AttachmentPart ap = msg.createAttachmentPart();
-
-String urlString = "http://ws.apache.org/images/project-logo.jpg";;
-if (isNetworkedResourceAvailable(urlString)) {
-URL url = new URL(urlString);
-DataHandler dh = new DataHandler(url);
-//Create InputStream from DataHandler's InputStream
-InputStream is = dh.getInputStream();
-
-byte buf[] = IOUtils.getStreamAsByteArray(is);
-//Setting Content via InputStream for image/jpeg mime type
-ByteArrayOutputStream bos = new ByteArrayOutputStream();
-Base64.encode(buf, 0, buf.length, bos);
-buf = bos.toByteArray();
-InputStream stream = new ByteArrayInputStream(buf);
-ap.setBase64Content(stream, "image/jpeg");
-
-//Getting Content.. should return InputStream object
-InputStream r = ap.getBase64Content();
-if (r != null) {
-if (r instanceof InputStream) {
-//InputStream object was returned (ok)
-} else {
-fail("Unexpected object was returned");
-}
+public void testSetBase64Content() throws Exception {
+MessageFactory factory = MessageFactory.newInstance();
+SOAPMessage msg = factory.createMessage();
+AttachmentPart ap = msg.createAttachmentPart();
+
+String urlString = "http://ws.apache.org/images/project-logo.jpg";;
+if (isNetworkedResourceAvailable(urlString)) {
+URL url = new URL(urlString);
+DataHandle

svn commit: r1083482 [2/2] - in /axis/axis2/java/core/branches/1_5: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/clustering/ modules/codegen/ modules/corba/ modules/distribution/ m

2011-03-20 Thread veithen 
Propchange: 
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 16:05:01 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin: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,988689,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,1032390,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,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1081563,1082316,1082702,1083180,1083379,1083381,1083446
-/webservices/axis2/trunk/java/modules/tool/axis2-repo-maven-plugin:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,783869,783873,787379,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,896320,902271,904660,904780,905980,908318
+/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin: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,988689,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,1032390,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,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446
+/webservices/axis2/trunk/java/modules/tool/axis2-repo-maven-plugin:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,783869,783873,787379,788202,795431,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/tool/axis2-repo-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/pom.xml?rev=1083482&r1=1083481&r2=1083482&view=d

svn commit: r1083483 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/all/ modules/clustering/ modules/codegen/ modules/corba/ modules/fastinfo

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 16:08:36 2011
New Revision: 1083483

URL: http://svn.apache.org/viewvc?rev=1083483&view=rev
Log:
Merged r1083433 to the 1.6 branch to fix a couple of Maven 3 warnings.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)
axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml
axis/axis2/java/core/branches/1_6/modules/adb/pom.xml
axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml
axis/axis2/java/core/branches/1_6/modules/all/pom.xml
axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml
axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml
axis/axis2/java/core/branches/1_6/modules/corba/pom.xml
axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml
axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml
axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml
axis/axis2/java/core/branches/1_6/modules/jaxws-mar/pom.xml
axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml
axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml
axis/axis2/java/core/branches/1_6/modules/json/pom.xml
axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml
axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml
axis/axis2/java/core/branches/1_6/modules/mex/pom.xml
axis/axis2/java/core/branches/1_6/modules/mtompolicy-mar/pom.xml
axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml
axis/axis2/java/core/branches/1_6/modules/osgi/pom.xml
axis/axis2/java/core/branches/1_6/modules/ping/pom.xml
axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml
axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml
axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/pom.xml
axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/pom.xml
axis/axis2/java/core/branches/1_6/modules/spring/pom.xml
axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml

axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml

axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml
axis/axis2/java/core/branches/1_6/modules/tool/axis2-idea-plugin/pom.xml

axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml

axis/axis2/java/core/branches/1_6/modules/tool/axis2-repo-maven-plugin/pom.xml

axis/axis2/java/core/branches/1_6/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml
axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml
axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml
axis/axis2/java/core/branches/1_6/pom.xml

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 16:08:36 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,1083446
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083433,1083446

Modified: axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml?rev=1083483&r1=1083482&r2=1083483&view=diff
==
--- axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml Sun Mar 20 
16:08:36 2011
@@ -93,7 +93,7 @@
 
 
 
-
org.apache.axis2:axis2-resource-bundle:${pom.version}
+
org.apache.axis2:axis2-resource-bundle:${project.version}
 
 
 

Modified: axis/axis2/java/core/branches/1_6/modules/adb/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/pom.xml?rev=1083483&r1=1083482&r2=1083483&view=diff
==
--- axis/axis2/java/core/branches/1_6/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/pom.xml Sun Mar 20 16:08:36 
2011
@@ -86,7 +86,7 @@
 
 
 
-
org.apache.axis2:axis2-resource-bundle:${pom.version}
+
org.apache.axis2:axis2-resource-bundle:${project.version}

svn commit: r1083510 - in /axis/axis2/java/core/branches/1_6: ./ modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 17:15:44 2011
New Revision: 1083510

URL: http://svn.apache.org/viewvc?rev=1083510&view=rev
Log:
Merged r1083425 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 17:15:44 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,1083433,1083446
+/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

Modified: 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1083510&r1=1083509&r2=1083510&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
 Sun Mar 20 17:15:44 2011
@@ -210,8 +210,11 @@ public class JAXWSDeployer extends Abstr
 className,
 location);
 if(axisService != null) {
+if (serviceHierarchy != null) {
+axisService.setName(serviceHierarchy + 
axisService.getName());
+}
 log.info("Deploying JAXWS annotated class " + className + 
" as a service - "
-+ serviceHierarchy + axisService.getName());
++ axisService.getName());
 axisServiceList.add(axisService);
 }
 }
@@ -222,9 +225,10 @@ public class JAXWSDeployer extends Abstr
 }
 //creating service group by considering the hierarchical path also
 AxisServiceGroup serviceGroup = new AxisServiceGroup();
-serviceGroup.setServiceGroupName(serviceHierarchy + groupName);
+if (serviceHierarchy != null) {
+serviceGroup.setServiceGroupName(serviceHierarchy + groupName);
+}
 for (AxisService axisService : axisServiceList) {
-axisService.setName(serviceHierarchy + axisService.getName());
 serviceGroup.addService(axisService);
 }
 axisConfig.addServiceGroup(serviceGroup);

svn commit: r1083518 - /axis/axis2/java/rampart/branches/1_6/

2011-03-20 Thread veithen 
Author: veithen
Date: Sun Mar 20 17:41:38 2011
New Revision: 1083518

URL: http://svn.apache.org/viewvc?rev=1083518&view=rev
Log:
Added svn:mergeinfo missing in r1072315.

Modified:
axis/axis2/java/rampart/branches/1_6/   (props changed)

Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 17:41:38 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684