svn commit: r1355946 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java

2012-07-01 Thread veithen 
Author: veithen
Date: Sun Jul  1 16:37:47 2012
New Revision: 1355946

URL: http://svn.apache.org/viewvc?rev=1355946&view=rev
Log:
AXIS2-5158: SOAPEnvelope#hasFault should normally not throw any exception.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java?rev=1355946&r1=1355945&r2=1355946&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
 Sun Jul  1 16:37:47 2012
@@ -4300,12 +4300,7 @@ public class MessageContext extends Abst
 }
 
 public boolean isFault() {
-try {
-return getEnvelope().hasFault();
-} catch (Exception e) {
-// TODO: What should we be doing here?  No envelope certainly 
seems bad
-return false;
-}
+return getEnvelope().hasFault();
 }

svn commit: r1356080 - in /axis/axis2/java/core/trunk/modules: kernel/src/org/apache/axis2/description/AxisService.java transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java

2012-07-01 Thread sagara 
Author: sagara
Date: Mon Jul  2 06:44:41 2012
New Revision: 1356080

URL: http://svn.apache.org/viewvc?rev=1356080&view=rev
Log:
Fixed AXIS2-5355.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java

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=1356080&r1=1356079&r2=1356080&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
 Mon Jul  2 06:44:41 2012
@@ -1359,9 +1359,10 @@ public class AxisService extends AxisDes
 if ((xsd != null) && (!"".equals(xsd))) {
 XmlSchema schema = (XmlSchema) schemaMappingtable.get(xsd);
 if (schema == null) {
-int dotIndex = xsd.indexOf('.');
+int dotIndex = xsd.lastIndexOf('.');
 if (dotIndex > 0) {
 String schemaKey = xsd.substring(0, dotIndex);
+schemaKey = schemaKey.replace("./" , "");
 schema = (XmlSchema) schemaMappingtable.get(schemaKey);
 }
 }

Modified: 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=1356080&r1=1356079&r2=1356080&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
 Mon Jul  2 06:44:41 2012
@@ -191,9 +191,10 @@ public class HTTPWorker implements Worke
 Map schemaTable = service.getSchemaMappingTable();
 XmlSchema schema = (XmlSchema) schemaTable.get(schemaName);
 if (schema == null) {
-int dotIndex = schemaName.indexOf('.');
+int dotIndex = schemaName.lastIndexOf('.');
 if (dotIndex > 0) {
 String schemaKey = 
schemaName.substring(0,dotIndex);
+schemaKey = schemaKey.replace("./", "");
 schema = (XmlSchema) schemaTable.get(schemaKey);
 }
 }

svn commit: r1356082 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/description/AxisService.java modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.

2012-07-01 Thread sagara 
Author: sagara
Date: Mon Jul  2 06:48:55 2012
New Revision: 1356082

URL: http://svn.apache.org/viewvc?rev=1356082&view=rev
Log:
AXIS2-5355 - Merged r1356080 to 1.6 branch.

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

axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java

axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java

Propchange: axis/axis2/java/core/branches/1_6/
--
  Merged /axis/axis2/java/core/trunk:r1356080

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1356082&r1=1356081&r2=1356082&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService.java
 Mon Jul  2 06:48:55 2012
@@ -1314,9 +1314,10 @@ public class AxisService extends AxisDes
 if ((xsd != null) && (!"".equals(xsd))) {
 XmlSchema schema = (XmlSchema) schemaMappingtable.get(xsd);
 if (schema == null) {
-int dotIndex = xsd.indexOf('.');
+int dotIndex = xsd.lastIndexOf('.');
 if (dotIndex > 0) {
 String schemaKey = xsd.substring(0, dotIndex);
+schemaKey = schemaKey.replace("./" , "");
 schema = (XmlSchema) schemaMappingtable.get(schemaKey);
 }
 }

Modified: 
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=1356082&r1=1356081&r2=1356082&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
 Mon Jul  2 06:48:55 2012
@@ -202,9 +202,10 @@ public class HTTPWorker implements Worke
 Map schemaTable = service.getSchemaMappingTable();
 XmlSchema schema = (XmlSchema) schemaTable.get(schemaName);
 if (schema == null) {
-int dotIndex = schemaName.indexOf('.');
+int dotIndex = schemaName.lastIndexOf('.');
 if (dotIndex > 0) {
 String schemaKey = 
schemaName.substring(0,dotIndex);
+schemaKey = schemaKey.replace("./", "");
 schema = (XmlSchema) schemaTable.get(schemaKey);
 }
 }

svn commit: r1356085 - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/description/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules

2012-07-01 Thread sagara 
Author: sagara
Date: Mon Jul  2 06:52:19 2012
New Revision: 1356085

URL: http://svn.apache.org/viewvc?rev=1356085&view=rev
Log:
AXIS2-5355 - Merged r1356080 to 1.5 branch.

Modified:
axis/axis2/java/core/branches/1_5/   (props changed)
axis/axis2/java/core/branches/1_5/modules/distribution/   (props changed)

axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisService.java

axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)

axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
axis/axis2/java/core/branches/1_5/modules/parent/   (props changed)

axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
   (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml   
(props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
   (props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
   (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/   (props 
changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
   (props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
   (props changed)
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/   
(props changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/src/   (props 
changed)

axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
axis/axis2/java/core/branches/1_5/modules/transport/local/   (props changed)

axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)

axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/1_5/
--
  Merged /axis/axis2/java/core/trunk:r1356080

Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
--
  Merged /axis/axis2/java/core/trunk/modules/distribution:r1356080

Modified: 
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1356085&r1=1356084&r2=1356085&view=diff
==
--- 
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisService.java
 (original)
+++ 
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisService.java
 Mon Jul  2 06:52:19 2012
@@ -1260,9 +1260,10 @@ public class AxisService extends AxisDes
 if ((xsd != null) && (!"".equals(xsd))) {
 XmlSchema schema = (XmlSchema) schemaMappingtable.get(xsd);
 if (schema == null) {
-int dotIndex = xsd.indexOf('.');
+int dotIndex = xsd.lastIndexOf('.');
 if (dotIndex > 0) {
 String schemaKey = xsd.substring(0, dotIndex);
+schemaKey = schemaKey.replace("./" , "");
 schema = (XmlSchema) schemaMappingtable.get(schemaKey);
 }
 }

Propchange: 
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
--
  Merged 
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:r1356080

Propchange: 
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
--
  Merged 
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:r1356080

Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
--
  Merged /axis/axis2/java/core/trunk/modules/parent:r1356080

Propchange: 
axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
-