date:20121210

svn commit: r1419363 [3/3] - in /axis/axis1/java/branches/AXIS-2882: ./ axis-model/model/ axis-model/src/main/java/org/apache/axis/model/wsdd/ axis-model/src/main/java/org/apache/axis/model/wsdd/impl/

2012-12-10 Thread veithen

Modified: axis/axis1/java/branches/AXIS-2882/samples/faults-sample/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/faults-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff
==
--- axis/axis1/java/branches/AXIS-2882/samples/faults-sample/pom.xml (original)
+++ axis/axis1/java/branches/AXIS-2882/samples/faults-sample/pom.xml Mon Dec 10 
12:01:10 2012
@@ -38,11 +38,6 @@
 junit
 test
 
-
-${project.groupId}
-axis-standalone-server
-${project.version}
-
 
 
 
@@ -91,7 +86,7 @@
 
 src/main/wsdd
 
-**/*.wsdd
+deploy.wsdd
 
 
 

Modified: axis/axis1/java/branches/AXIS-2882/samples/handler-sample/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/handler-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff
==
--- axis/axis1/java/branches/AXIS-2882/samples/handler-sample/pom.xml (original)
+++ axis/axis1/java/branches/AXIS-2882/samples/handler-sample/pom.xml Mon Dec 
10 12:01:10 2012
@@ -38,11 +38,6 @@
 junit
 test
 
-
-${project.groupId}
-axis-standalone-server
-${project.version}
-
 
 
 

Modified: axis/axis1/java/branches/AXIS-2882/samples/jaxrpc-sample/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/jaxrpc-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff
==
--- axis/axis1/java/branches/AXIS-2882/samples/jaxrpc-sample/pom.xml (original)
+++ axis/axis1/java/branches/AXIS-2882/samples/jaxrpc-sample/pom.xml Mon Dec 10 
12:01:10 2012
@@ -40,11 +40,6 @@
 
 
 ${project.groupId}
-axis-standalone-server
-${project.version}
-
-
-${project.groupId}
 stock-sample
 ${project.version}
 test
@@ -125,13 +120,13 @@
 
 src/main/wsdd
 
-**/*.wsdd
+**/deploy.wsdd
 
 
 
 
../stock-sample/src/main/wsdd
 
-**/*.wsdd
+deploy.wsdd
 
 
 

Propchange: axis/axis1/java/branches/AXIS-2882/samples/jms-sample/
--
--- svn:ignore (added)
+++ svn:ignore Mon Dec 10 12:01:10 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Modified: axis/axis1/java/branches/AXIS-2882/samples/message-sample/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/message-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff
==
--- axis/axis1/java/branches/AXIS-2882/samples/message-sample/pom.xml (original)
+++ axis/axis1/java/branches/AXIS-2882/samples/message-sample/pom.xml Mon Dec 
10 12:01:10 2012
@@ -38,11 +38,6 @@
 junit
 test
 
-
-${project.groupId}
-axis-standalone-server
-${project.version}
-
 
 
 
@@ -91,7 +86,7 @@
 
 src/main/wsdd
 
-**/*.wsdd
+deploy.wsdd
 
 
 

Modified: axis/axis1/java/branches/AXIS-2882/samples/misc-sample/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/misc-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff
==
--- axis/axis1/java/branches/AXIS-2882/samples/misc-sample/pom.xml (original)
+++ axis/axis1/java/branches/AXIS-2882/samples/misc-sample/pom.xml Mon Dec 10 
12:01:10 2012
@@ -38,11 +38,6 @@
 junit
 test
 
-
-${project.group

svn commit: r1419378 - in /axis/axis1/java/branches/AXIS-2882/axis-model/src/main/java/org/apache/axis/model/wsdd: Flow.java impl/FlowImpl.java

2012-12-10 Thread veithen

Author: veithen
Date: Mon Dec 10 12:39:58 2012
New Revision: 1419378

URL: http://svn.apache.org/viewvc?rev=1419378&view=rev
Log:
Removed two files that should have been deleted by the last merge from trunk.

Removed:

axis/axis1/java/branches/AXIS-2882/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java

axis/axis1/java/branches/AXIS-2882/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java

svn commit: r1419465 - in /axis/axis1/java/branches/AXIS-2882: axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/ axis-rt-core/src/main/java/org/apache/axis/utils/ axis-rt-core/src/test/java/org/

2012-12-10 Thread veithen

Author: veithen
Date: Mon Dec 10 14:00:31 2012
New Revision: 1419465

URL: http://svn.apache.org/viewvc?rev=1419465&view=rev
Log:
More work on AXIS-2882.

Added:

axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/utils/DummyURLStreamHandler.java
axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/test/java/org/
axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/test/java/org/apache/

axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/test/java/org/apache/axis/

axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/test/java/org/apache/axis/utils/

axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/test/java/org/apache/axis/utils/IOUtilsTest.java
Modified:

axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java

axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java

axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/utils/IOUtils.java

axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/stub/JMSURLStubTest.java

Modified: 
axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java?rev=1419465&r1=1419464&r2=1419465&view=diff
==
--- 
axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
 (original)
+++ 
axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
 Mon Dec 10 14:00:31 2012
@@ -256,6 +256,8 @@ public class JavaServiceImplWriter exten
 writeGetPortName(pw, bindingType, portName);
 writeGetPortNameURL(pw, bindingType, portName, stubClass,
 wsddServiceName);
+writeGetPortNameString(pw, bindingType, portName, stubClass,
+wsddServiceName);
 writeSetPortEndpointAddress(pw, portName);
 }
 
@@ -410,6 +412,36 @@ public class JavaServiceImplWriter exten
 }// writeGetPortNameURL
 
 /**
+ * Write the get(String) method.
+ * 
+ * @param pw  
+ * @param bindingType 
+ * @param portName
+ * @param stubClass   
+ * @param wsddServiceName 
+ */
+protected void writeGetPortNameString(PrintWriter pw, String bindingType,
+  String portName, String stubClass,
+  String wsddServiceName) {
+
+pw.println("public " + bindingType + " get" + portName
++ "(java.lang.String portAddress) throws "
++ javax.xml.rpc.ServiceException.class.getName() + " {");
+pw.println("try {");
+pw.println("" + stubClass + " _stub = new " + stubClass
++ "(portAddress, this);");
+pw.println("_stub.setPortName(get" + wsddServiceName
++ "());");
+pw.println("return _stub;");
+pw.println("}");
+pw.println("catch (org.apache.axis.AxisFault e) {");
+pw.println("return null;");
+pw.println("}");
+pw.println("}");
+pw.println();
+}// writeGetPortNameURL
+
+/**
  * Write the setEndpointAddress(String) method.
  * 
  * @param pw   

Modified: 
axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java?rev=1419465&r1=1419464&r2=1419465&view=diff
==
--- 
axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
 (original)
+++ 
axis/axis1/java/branches/AXIS-2882/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
 Mon Dec 10 14:00:31 2012
@@ -189,6 +189,17 @@ public class JavaStubWriter extends Java
 pw.println();
 pw.println(
 "public " + className
++ "(java.lang.String endpoint, javax.xml.rpc.Service service) 
throws org.apache.axis.AxisFault {");
+pw.println(" this(service);");
+pw.println(" try {");
+pw.println(" super.cachedEndpoint = 
org.apache.axis.utils.IOUtils.toURL(endpoint);");
+pw.println(" } catch (java.net.MalformedURLException ex) {");
+pw.println(" throw 
org.apache.axis.AxisFault.makeFault(ex);");
+pw.print

svn commit: r1419535 - in /axis/axis1/java/branches/AXIS-2882: axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.j

2012-12-10 Thread veithen

Author: veithen
Date: Mon Dec 10 15:50:26 2012
New Revision: 1419535

URL: http://svn.apache.org/viewvc?rev=1419535&view=rev
Log:
More work on AXIS-2882.

Modified:

axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java

axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java

Modified: 
axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java?rev=1419535&r1=1419534&r2=1419535&view=diff
==
--- 
axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
 (original)
+++ 
axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
 Mon Dec 10 15:50:26 2012
@@ -26,10 +26,11 @@ import org.apache.axis.handlers.BasicHan
 import org.apache.axis.message.SOAPEnvelope;
 import org.apache.axis.message.SOAPFault;
 import org.apache.axis.server.AxisServer;
+import org.apache.axis.utils.IOUtils;
 import org.apache.axis.utils.Messages;
 import org.apache.commons.logging.Log;
 
-import java.net.URL;
+import java.net.URI;
 
 /**
  * This is meant to be used on a SOAP Client to call a SOAP server.
@@ -114,8 +115,8 @@ public class LocalSender extends BasicHa
 String transURL = clientContext.getStrProp(MessageContext.TRANS_URL);
 if (transURL != null) {
 try {
-URL url = new URL(transURL);
-String file = url.getFile();
+URI url = IOUtils.toURI(transURL);
+String file = url.getPath();
 if (file.length()>0 && file.charAt(0)=='/') {
 file = file.substring(1);
 }

Modified: 
axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java?rev=1419535&r1=1419534&r2=1419535&view=diff
==
--- 
axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
 (original)
+++ 
axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
 Mon Dec 10 15:50:26 2012
@@ -108,8 +108,7 @@ public class JMSURLTest {
 
 try
 {
-java.net.URL jmsurl = new java.net.URL(sampleJmsUrl);
-call.setTargetEndpointAddress(jmsurl);
+call.setTargetEndpointAddress(sampleJmsUrl);
 
 // set additional params on the call if desired
 call.setUsername(username);
@@ -118,10 +117,6 @@ public class JMSURLTest {
 
 res = (Float) call.invoke(new Object[] {ticker});
 }
-catch (java.net.MalformedURLException e)
-{
-throw new AxisFault("Invalid JMS URL", e);
-}
 catch (java.rmi.RemoteException e)
 {
 throw new AxisFault("Failed in getQuote()", e);

svn commit: r1419789 - in /axis/axis1/java/trunk: distribution/pom.xml pom.xml

2012-12-10 Thread veithen

Author: veithen
Date: Mon Dec 10 21:28:56 2012
New Revision: 1419789

URL: http://svn.apache.org/viewvc?rev=1419789&view=rev
Log:
Skip distribution tests is skipTests=true.

Modified:
axis/axis1/java/trunk/distribution/pom.xml
axis/axis1/java/trunk/pom.xml

Modified: axis/axis1/java/trunk/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/pom.xml?rev=1419789&r1=1419788&r2=1419789&view=diff
==
--- axis/axis1/java/trunk/distribution/pom.xml (original)
+++ axis/axis1/java/trunk/distribution/pom.xml Mon Dec 10 21:28:56 2012
@@ -81,7 +81,7 @@
 run
 
 
-
+
 
 
 
@@ -93,7 +93,7 @@
 run
 
 
-
+
 
 
 
@@ -140,6 +140,7 @@
 
 
${project.build.directory}/axis-${project.version}/lib
 junit
+${skipTests}
 
 
 
@@ -159,6 +160,7 @@
 true
 
${project.build.directory}/jboss/lib
 true
+${skipTests}
 
 
 

Modified: axis/axis1/java/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1419789&r1=1419788&r2=1419789&view=diff
==
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Mon Dec 10 21:28:56 2012
@@ -204,7 +204,7 @@
 
 
 maven-dependency-plugin
-2.4
+2.6
 
 
 org.codehaus.mojo

svn commit: r1419363 [3/3] - in /axis/axis1/java/branches/AXIS-2882: ./ axis-model/model/ axis-model/src/main/java/org/apache/axis/model/wsdd/ axis-model/src/main/java/org/apache/axis/model/wsdd/impl/

svn commit: r1419378 - in /axis/axis1/java/branches/AXIS-2882/axis-model/src/main/java/org/apache/axis/model/wsdd: Flow.java impl/FlowImpl.java

svn commit: r1419465 - in /axis/axis1/java/branches/AXIS-2882: axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/ axis-rt-core/src/main/java/org/apache/axis/utils/ axis-rt-core/src/test/java/org/

svn commit: r1419535 - in /axis/axis1/java/branches/AXIS-2882: axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.j

svn commit: r1419789 - in /axis/axis1/java/trunk: distribution/pom.xml pom.xml

5 matches

Site Navigation

Mail list logo

Footer information