Author: ningjiang
Date: Thu Nov 30 22:43:13 2006
New Revision: 481170
URL: http://svn.apache.org/viewvc?view=rev&rev=481170
Log:
Added war and client-servlet targets in build.xml
Added:
incubator/cxf/trunk/benchmark/performance/basic_type/wsdl/cxf-servlet.xml
(with props)
incubator/cxf/trunk/benchmark/performance/complex_type/wsdl/cxf-servlet.xml
(with props)
Modified:
incubator/cxf/trunk/benchmark/performance/basic_type/build.xml
incubator/cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
incubator/cxf/trunk/benchmark/performance/complex_type/build.xml
incubator/cxf/trunk/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
Modified: incubator/cxf/trunk/benchmark/performance/basic_type/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/basic_type/build.xml?view=diff&rev=481170&r1=481169&r2=481170
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/basic_type/build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/basic_type/build.xml Thu Nov 30
22:43:13 2006
@@ -24,6 +24,17 @@
<echo level="info" message="Generating code using wsdl2java..."/>
<wsdl2java file="basic_type.wsdl"/>
</target>
-
+
+ <property name="cxf.war.file.name" value="basic_type"/>
+ <target name="war" depends="build">
+ <cxfwar wsdl="basic_type.wsdl" filename="${cxf.war.file.name}.war"/>
+ </target>
+
+ <target name="client-servlet" description="run demo client hitting
servlet" depends="build">
+ <property name="param" value=""/>
+ <cxf.client.run
classname="org.apache.cxf.performance.basic_type.client.Client" argline=
+ "-WSDL ${base.url}/basic_type/services/basic_type?wsdl " />
+ </target>
+
</project>
Modified:
incubator/cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java?view=diff&rev=481170&r1=481169&r2=481170
==============================================================================
---
incubator/cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
(original)
+++
incubator/cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
Thu Nov 30 22:43:13 2006
@@ -18,8 +18,8 @@
*/
package org.apache.cxf.performance.basic_type.client;
-import java.io.File;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Iterator;
import java.util.List;
@@ -121,9 +121,9 @@
ex.printStackTrace();
}
}
- File wsdl = new File(wsdlPath);
try {
- ss = new BasicService(wsdl.toURL(), SERVICE_NAME);
+ URL wsdl = new URL(wsdlPath);
+ ss = new BasicService(wsdl, SERVICE_NAME);
} catch (MalformedURLException e) {
e.printStackTrace();
}
Added: incubator/cxf/trunk/benchmark/performance/basic_type/wsdl/cxf-servlet.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/basic_type/wsdl/cxf-servlet.xml?view=auto&rev=481170
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/basic_type/wsdl/cxf-servlet.xml
(added)
+++ incubator/cxf/trunk/benchmark/performance/basic_type/wsdl/cxf-servlet.xml
Thu Nov 30 22:43:13 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<endpoints>
+
+ <endpoint
+ name="basic_type"
+ interface="org.apache.cxf.performance.basic_type.BasicPortType"
+
implementation="org.apache.cxf.performance.basic_type.server.ServerImpl"
+ wsdl="WEB-INF/wsdl/basic_type.wsdl"
+ service="{http://cxf.apache.org/performance/basic_type}BasicService";
+ port="{http://cxf.apache.org/performance/basic_type}SoapHttpPort";
+ url-pattern="/basic_type" />
+
+</endpoints>
Propchange:
incubator/cxf/trunk/benchmark/performance/basic_type/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/benchmark/performance/basic_type/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/benchmark/performance/basic_type/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/benchmark/performance/complex_type/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/complex_type/build.xml?view=diff&rev=481170&r1=481169&r2=481170
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/complex_type/build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/complex_type/build.xml Thu Nov 30
22:43:13 2006
@@ -27,4 +27,16 @@
<wsdl2java file="complex_type.wsdl"/>
</target>
+ <property name="cxf.war.file.name" value="complex_type"/>
+ <target name="war" depends="build">
+ <cxfwar wsdl="complex_type.wsdl" filename="${cxf.war.file.name}.war"/>
+ </target>
+
+ <target name="client-servlet" description="run demo client hitting
servlet" depends="build">
+ <property name="param" value=""/>
+ <cxf.client.run
classname="org.apache.cxf.performance.complex_type.client.Client" argline=
+ "-WSDL ${base.url}/complex_type/services/complex_type?wsdl " />
+ </target>
+
+
</project>
Modified:
incubator/cxf/trunk/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java?view=diff&rev=481170&r1=481169&r2=481170
==============================================================================
---
incubator/cxf/trunk/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
(original)
+++
incubator/cxf/trunk/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
Thu Nov 30 22:43:13 2006
@@ -18,10 +18,10 @@
*/
package org.apache.cxf.performance.complex_type.client;
-import java.io.File;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Iterator;
import java.util.List;
@@ -135,9 +135,9 @@
} else {
System.out.println("not using pipe");
}
- File wsdl = new File(wsdlPath);
- try {
- cs = new ComplexService(wsdl.toURL(), SERVICE_NAME);
+ try{
+ URL wsdl = new URL(wsdlPath);
+ cs = new ComplexService(wsdl, SERVICE_NAME);
} catch (MalformedURLException e) {
e.printStackTrace();
}
Added:
incubator/cxf/trunk/benchmark/performance/complex_type/wsdl/cxf-servlet.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/complex_type/wsdl/cxf-servlet.xml?view=auto&rev=481170
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/complex_type/wsdl/cxf-servlet.xml
(added)
+++ incubator/cxf/trunk/benchmark/performance/complex_type/wsdl/cxf-servlet.xml
Thu Nov 30 22:43:13 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<endpoints>
+
+ <endpoint
+ name="complex_type"
+ interface="org.apache.cxf.performance.complex_type.ComplexPortType"
+
implementation="org.apache.cxf.performance.complex_type.server.ServerImpl"
+ wsdl="WEB-INF/wsdl/complex_type.wsdl"
+
service="{http://cxf.apache.org/performance/complex_type}ComplexService";
+ port="{http://cxf.apache.org/performance/complex_type}SoapPort";
+ url-pattern="/complex_type" />
+
+</endpoints>
Propchange:
incubator/cxf/trunk/benchmark/performance/complex_type/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/benchmark/performance/complex_type/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/benchmark/performance/complex_type/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/etc/common_build.xml?view=diff&rev=481170&r1=481169&r2=481170
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/etc/common_build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/etc/common_build.xml Thu Nov 30
22:43:13 2006
@@ -228,9 +228,6 @@
<webinf dir="${wsdl.dir}/..">
<include name="wsdl/@{wsdl}"/>
</webinf>
- <lib dir="${cxf.home}/lib">
- <include name="*.jar"/>
- </lib>
</war>
</sequential>
</macrodef>
