svn commit: r1061180 - in /axis/axis2/java/core/trunk/modules/tool/script: axis2server.bat axis2server.sh

2011-01-20 Thread isurues 
Author: isurues
Date: Thu Jan 20 09:36:25 2011
New Revision: 1061180

URL: http://svn.apache.org/viewvc?rev=1061180&view=rev
Log:
As per https://issues.apache.org/jira/browse/AXIS2-4927, modifying the scripts 
to support an Axis2 specific endorsed directory

Modified:
axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat
axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh

Modified: axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat?rev=1061180&r1=1061179&r2=1061180&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat (original)
+++ axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat Thu Jan 20 
09:36:25 2011
@@ -105,7 +105,7 @@ echo Using JAVA_HOME%JAVA_HOME%
 echo Using AXIS2_HOME   %AXIS2_HOME%
 
 cd %AXIS2_HOME%
-"%_JAVACMD%" %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" 
org.apache.axis2.transport.SimpleAxis2Server %AXIS2_CMD_LINE_ARGS%
+"%_JAVACMD%" %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" 
-Djava.endorsed.dirs="%AXIS2_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
 org.apache.axis2.transport.SimpleAxis2Server %AXIS2_CMD_LINE_ARGS%
 goto end
 
 :end

Modified: axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh?rev=1061180&r1=1061179&r2=1061180&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh (original)
+++ axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh Thu Jan 20 
09:36:25 2011
@@ -60,5 +60,7 @@ while [ $# -ge 1 ]; do
 esac
 done
 
-java $JAVA_OPTS -classpath "$AXIS2_CLASSPATH" 
org.apache.axis2.transport.SimpleAxis2Server \
+java $JAVA_OPTS -classpath "$AXIS2_CLASSPATH" \
+
-Djava.endorsed.dirs="$AXIS2_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
 \
+org.apache.axis2.transport.SimpleAxis2Server \
 -repo "$AXIS2_HOME"/repository -conf "$AXIS2_HOME"/conf/axis2.xml $*

svn commit: r1061354 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java

2011-01-20 Thread isurues 
Author: isurues
Date: Thu Jan 20 15:57:28 2011
New Revision: 1061354

URL: http://svn.apache.org/viewvc?rev=1061354&view=rev
Log:
Fixing the incorrect usage of the outer loop varialbe inside the inner loop

Modified:

axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java

Modified: 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java?rev=1061354&r1=1061353&r2=1061354&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
 Thu Jan 20 15:57:28 2011
@@ -122,7 +122,7 @@ public class JavaClassToDBCConverter {
 // Also try to see if the SEI has any super interfaces  
 Class[] interfaces = seiClass.getInterfaces();
 for (int j = 0; j < interfaces.length; j++) {
-buildDBC(dbcMap, interfaces[i]);   
 
+buildDBC(dbcMap, interfaces[j]);
 }
 }
 catch (ClassNotFoundException e) {

svn commit: r1061558 - in /axis/axis2/java/core/trunk/modules: addressing/test/org/apache/axis2/handlers/addressing/ addressing/test/org/apache/axis2/handlers/util/ kernel/src/org/apache/axis2/builder

2011-01-20 Thread veithen 
Author: veithen
Date: Thu Jan 20 22:53:34 2011
New Revision: 1061558

URL: http://svn.apache.org/viewvc?rev=1061558&view=rev
Log:
* Replaced some references to StAXSOAPModelBuilder by the new API introduced in 
r1060995.
* Some clean up of the addressing tests.

Modified:

axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInFaultHandlerTest.java

axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java

axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java

axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingValidationHandlerTest.java

axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/util/TestUtil.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java

Modified: 
axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInFaultHandlerTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInFaultHandlerTest.java?rev=1061558&r1=1061557&r2=1061558&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInFaultHandlerTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInFaultHandlerTest.java
 Thu Jan 20 22:53:34 2011
@@ -23,7 +23,6 @@ import junit.framework.TestCase;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.AddressingConstants;
@@ -36,8 +35,6 @@ import java.util.List;
 
 public class AddressingInFaultHandlerTest extends TestCase {
 
-TestUtil testUtil = new TestUtil();
-
 /** @param testName  */
 public AddressingInFaultHandlerTest(String testName) {
 super(testName);
@@ -82,8 +79,7 @@ public class AddressingInFaultHandlerTes
 private AxisFault getFaultForTest(String testName, boolean isSOAP11) 
throws Exception {
 String testfile =
 "fault-messages/" + (isSOAP11 ? "soap11" : "soap12") + "/" + 
testName + ".xml";
-StAXSOAPModelBuilder omBuilder = testUtil.getOMBuilder(testfile);
-SOAPEnvelope envelope = ((SOAPEnvelope)omBuilder.getDocumentElement());
+SOAPEnvelope envelope = TestUtil.getSOAPEnvelope(testfile);
 MessageContext msgContext = new MessageContext();
 msgContext.setConfigurationContext(
 ConfigurationContextFactory.createEmptyConfigurationContext());

Modified: 
axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java?rev=1061558&r1=1061557&r2=1061558&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java
 Thu Jan 20 22:53:34 2011
@@ -24,7 +24,6 @@ import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.soap.RolePlayer;
 import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.AddressingConstants;
@@ -47,7 +46,6 @@ public abstract class AddressingInHandle
 private static Log log = 
LogFactory.getLog(AddressingInHandlerTestBase.class);
 AddressingInHandler inHandler;
 String addressingNamespace;
-TestUtil testUtil = new TestUtil();
 String testFileName = "soapmessage.xml";
 
 String versionDirectory;
@@ -68,8 +66,7 @@ public abstract class AddressingInHandle
 protected void basicExtractAddressingInformationFromHeaders(String 
testMessagePath,
 MessageContext 
mc)
 throws Exception {
-StAXSOAPModelBuilder omBuilder = 
testUtil.getOMBuilder(testMessagePath);
-SOAPEnvelope envelope = (SOAPEnvelope)omBuilder.getDocumentElement();
+SOAPEnvelope envelope = TestUtil.getSOAPEnvelope(testMessagePath);
 mc.setEnvelope(envelope);
 inHandler.invoke(mc);
 }

Mod