You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/03/19 06:03:17 UTC
svn commit: r755836 [1/2] - in /cxf/trunk/benchmark/performance: base/
base/src/main/ base/src/main/java/ base/src/main/java/org/
base/src/main/java/org/apache/cxf/pat/internal/ base/src/org/ base/wsdl/
soap_http_doc_lit/ soap_http_doc_lit/src/main/ so...
Author: dkulp
Date: Thu Mar 19 05:03:16 2009
New Revision: 755836
URL: http://svn.apache.org/viewvc?rev=755836&view=rev
Log:
Add some security policy stuff to benchmark
change to using mvn
Added:
cxf/trunk/benchmark/performance/base/pom.xml (with props)
cxf/trunk/benchmark/performance/base/src/main/
cxf/trunk/benchmark/performance/base/src/main/java/
cxf/trunk/benchmark/performance/base/src/main/java/org/
- copied from r754887, cxf/trunk/benchmark/performance/base/src/org/
cxf/trunk/benchmark/performance/soap_http_doc_lit/pom.xml (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/
- copied from r754887, cxf/trunk/benchmark/performance/soap_http_doc_lit/src/org/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.jks (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.jks (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/logging.properties (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/
- copied from r754887, cxf/trunk/benchmark/performance/soap_http_doc_lit/wsdl/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf_policy.wsdl (with props)
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/webapp/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/webapp/WEB-INF/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/webapp/WEB-INF/cxf-servlet.xml
- copied, changed from r754887, cxf/trunk/benchmark/performance/soap_http_doc_lit/wsdl/cxf-servlet.xml
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/webapp/WEB-INF/web.xml
- copied unchanged from r754887, cxf/trunk/distribution/src/main/release/etc/web.xml
Removed:
cxf/trunk/benchmark/performance/base/src/org/
cxf/trunk/benchmark/performance/base/wsdl/
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/cxf-servlet.xml
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/org/
cxf/trunk/benchmark/performance/soap_http_doc_lit/wsdl/
Modified:
cxf/trunk/benchmark/performance/base/build.xml
cxf/trunk/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf.wsdl
Modified: cxf/trunk/benchmark/performance/base/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/base/build.xml?rev=755836&r1=755835&r2=755836&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/base/build.xml (original)
+++ cxf/trunk/benchmark/performance/base/build.xml Thu Mar 19 05:03:16 2009
@@ -23,7 +23,7 @@
<mkdir dir="${basedir}/build/classes"/>
</target>
<target name="base.compile" depends="init">
- <javac srcdir="${basedir}/src" destdir="${basedir}/build/classes"
+ <javac srcdir="${basedir}/src/main/java/" destdir="${basedir}/build/classes"
debug="true">
<classpath refid="cxf.classpath"/>
</javac>
Added: cxf/trunk/benchmark/performance/base/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/base/pom.xml?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/base/pom.xml (added)
+++ cxf/trunk/benchmark/performance/base/pom.xml Thu Mar 19 05:03:16 2009
@@ -0,0 +1,58 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf.benchmark</groupId>
+ <artifactId>cxf-benchmark-base</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Apache CXF Benchmark Base</name>
+ <url>http://cxf.apache.org</url>
+ <properties>
+ <cxf.version>2.2.1-SNAPSHOT</cxf.version>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: cxf/trunk/benchmark/performance/base/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/base/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/base/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java?rev=755836&r1=754887&r2=755836&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java (original)
+++ cxf/trunk/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java Thu Mar 19 05:03:16 2009
@@ -20,6 +20,9 @@
import java.util.*;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+
public abstract class TestCaseBase<T> {
@@ -47,7 +50,9 @@
protected List<TestResult> results = new ArrayList<TestResult>();
- private int numberOfThreads;
+ protected int numberOfThreads;
+
+ protected String busCfg;
private String name;
@@ -120,6 +125,9 @@
} else if ("-PacketSize".equals(args[count])) {
packetSize = Integer.parseInt(args[count + 1]);
count += 2;
+ } else if ("-BUScfg".equals(args[count])) {
+ busCfg = args[count + 1];
+ count += 2;
} else {
count++;
}
@@ -151,7 +159,12 @@
}
// for the cxf init , here do nothing
- private void initBus() {
+ public void initBus() {
+ if (busCfg == null || "none".equals(busCfg)) {
+ BusFactory.getDefaultBus();
+ } else {
+ BusFactory.setDefaultBus(new SpringBusFactory().createBus(busCfg));
+ }
}
public void tearDown() {
@@ -339,7 +352,7 @@
}
public void setWSDLPath(String wpath) {
- this.wsdlPath = wsdlPath;
+ this.wsdlPath = wpath;
}
public void setServiceName(String sname) {
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/pom.xml?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/pom.xml (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/pom.xml Thu Mar 19 05:03:16 2009
@@ -0,0 +1,257 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf.benchmark</groupId>
+ <artifactId>cxf-benchmark-soapdoclit</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Apache CXF Benchmark SOAP/HTTP/Doc/Lit</name>
+ <url>http://cxf.apache.org</url>
+
+ <properties>
+ <cxf.version>2.2.1-SNAPSHOT</cxf.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.benchmark</groupId>
+ <artifactId>cxf-benchmark-base</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf.version}</version>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <wsdlRoot>src/main/resources/wsdl</wsdlRoot>
+ <wsdlLocation>classpath:/wsdl/perf.wsdl</wsdlLocation>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>server</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <host>localhost</host>
+ <protocol>http</protocol>
+ <cfg>none</cfg>
+ </properties>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <classpathScope>test</classpathScope>
+ <mainClass>org.apache.cxf.performance.complex_type.server.Server</mainClass>
+ <arguments>
+ <argument>-host</argument>
+ <argument>${host}</argument>
+ <argument>-protocol</argument>
+ <argument>${protocol}</argument>
+ <argument>-BUScfg</argument>
+ <argument>${cfg}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>client</id>
+ <properties>
+ <host>localhost</host>
+ <protocol>http</protocol>
+ <operation>echoComplexTypeDoc</operation>
+ <threads>4</threads>
+ <size>1</size>
+ <time>30</time>
+ <cfg>none</cfg>
+ </properties>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <classpathScope>test</classpathScope>
+ <mainClass>org.apache.cxf.performance.complex_type.client.Client</mainClass>
+ <arguments>
+ <argument>-WSDL</argument>
+ <argument>${protocol}://${host}:8080/cxf-benchmark-soapdoclit/services/SoapHttpDocLitPort?wsdl</argument>
+ <argument>-Operation</argument>
+ <argument>${operation}</argument>
+ <argument>-Threads</argument>
+ <argument>${threads}</argument>
+ <argument>-Amount</argument>
+ <argument>${time}</argument>
+ <argument>-PacketSize</argument>
+ <argument>${size}</argument>
+ <argument>-BUScfg</argument>
+ <argument>${cfg}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>clientserver</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <host>localhost</host>
+ <protocol>http</protocol>
+ <operation>echoComplexTypeDoc</operation>
+ <threads>4</threads>
+ <size>1</size>
+ <time>30</time>
+ <cfg>none</cfg>
+ <srvcfg>none</srvcfg>
+ </properties>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <classpathScope>test</classpathScope>
+ <mainClass>org.apache.cxf.performance.complex_type.client.Client</mainClass>
+ <arguments>
+ <argument>-WSDL</argument>
+ <argument>${protocol}://${host}:8080/cxf-benchmark-soapdoclit/services/SoapHttpDocLitPort?wsdl</argument>
+ <argument>-Operation</argument>
+ <argument>${operation}</argument>
+ <argument>-Threads</argument>
+ <argument>${threads}</argument>
+ <argument>-Amount</argument>
+ <argument>${time}</argument>
+ <argument>-PacketSize</argument>
+ <argument>${size}</argument>
+ <argument>-BUScfg</argument>
+ <argument>${cfg}</argument>
+ <argument>-Server</argument>
+ <argument>-host</argument>
+ <argument>${host}</argument>
+ <argument>-protocol</argument>
+ <argument>${protocol}</argument>
+ <argument>-BUScfg</argument>
+ <argument>${srvcfg}</argument>
+ <argument>-nowait</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java?rev=755836&r1=754887&r2=755836&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java (original)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java Thu Mar 19 05:03:16 2009
@@ -26,10 +26,13 @@
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.namespace.QName;
+import javax.xml.ws.Holder;
import org.apache.cxf.frontend.ClientProxy;
@@ -64,16 +67,20 @@
private byte[] inputBase64;
private String inputString = new String();
+ private static int statId;
private final int asciiCount = 1 * 1024;
public Client(String[] args, boolean warmup) {
super("Base TestCase", args, warmup);
- serviceName = "PerfService";
- portName = "PerfService";
+ wsdlPath = PerfService.WSDL_LOCATION.toString();
+ serviceName = SERVICE_NAME.getLocalPart();
+ portName = PORT_NAME.getLocalPart();
operationName = "echoComplexTypeDoc";
wsdlNameSpace = "http://cxf.apache.org/cxf/performance";
amount = 30;
packetSize = 1;
+ usingTime = true;
+ numberOfThreads = 4;
}
public void processArgs() {
@@ -90,14 +97,28 @@
}
public static void main(String args[]) throws Exception {
-
+ //workaround issue of xmlsec logging too much
+ Logger.getLogger("org.apache.xml.security.signature.Reference").setLevel(Level.WARNING);
+
int threadIdx = -1;
+ int servIdx = -1;
for (int x = 0; x < args.length; x++) {
if ("-Threads".equals(args[x])) {
threadIdx = x + 1;
+ } else if ("-Server".equals(args[x])) {
+ servIdx = x;
+ break;
}
}
-
+ if (servIdx != -1) {
+ String tmp[] = new String[args.length - servIdx];
+ System.arraycopy(args, servIdx, tmp, 0, args.length - servIdx);
+ Server.main(tmp);
+
+ tmp = new String[servIdx];
+ System.arraycopy(args, 0, tmp, 0, servIdx);
+ args = tmp;
+ }
List<String> threadList = new ArrayList<String>();
if (threadIdx != -1) {
String threads[] = args[threadIdx].split(",");
@@ -176,7 +197,7 @@
complexType.setVarUByte((short)255);
complexType.setVarUnsignedLong(new BigInteger("13691056728"));
complexType.setVarFloat(Float.MAX_VALUE);
- complexType.setVarQName(new QName("return", "return"));
+ complexType.setVarQName(new QName("http://cxf.apache.org", "return"));
try {
complexType.setVarStruct(getSimpleStruct());
} catch (DatatypeConfigurationException e) {
@@ -225,20 +246,27 @@
port.echoBase64Doc(inputBase64);
break;
case 2:
- port.echoComplexTypeDoc(complexTypeSeq);
+ int id = ++statId;
+ Holder<Integer> i = new Holder<Integer>();
+ port.echoComplexTypeDoc(complexTypeSeq, id, i);
+ if (id != i.value) {
+ System.out.println(id + " != " + i.value);
+ }
break;
default:
- port.echoComplexTypeDoc(complexTypeSeq);
+ port.echoComplexTypeDoc(complexTypeSeq, 0, new Holder<Integer>());
}
} catch (Exception e) {
e.printStackTrace();
}
}
- public DocPortType getPort() {
+ public synchronized DocPortType getPort() {
try {
URL wsdl = null;
- if ((wsdlPath.startsWith("file://")) || (wsdlPath.startsWith("http://"))) {
+ if (wsdlPath.startsWith("file:")
+ || wsdlPath.startsWith("http://")
+ || wsdlPath.startsWith("https://")) {
wsdl = new URL(wsdlPath);
} else {
wsdl = new URL("file://" + wsdlPath);
@@ -248,7 +276,7 @@
e.printStackTrace();
}
DocPortType port = cs.getSoapHttpDocLitPort();
-
+ /*
org.apache.cxf.endpoint.Client client = ClientProxy.getClient(port);
HTTPConduit http = (HTTPConduit) client.getConduit();
@@ -256,7 +284,7 @@
//httpClientPolicy.setAllowChunking(false);
http.setClient(httpClientPolicy);
-
+ */
return port;
}
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java Thu Mar 19 05:03:16 2009
@@ -0,0 +1,60 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.performance.complex_type.common;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ */
+
+public class KeystorePasswordCallback implements CallbackHandler {
+
+ private Map<String, String> passwords =
+ new HashMap<String, String>();
+
+ public KeystorePasswordCallback() {
+ passwords.put("myclientkey", "ckpass");
+ passwords.put("myservicekey", "skpass");
+ }
+
+ /**
+ * It attempts to get the password from the private
+ * alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+ String pass = passwords.get(pc.getIdentifier());
+ if (pass != null) {
+ pc.setPassword(pass);
+ return;
+ }
+ }
+ }
+
+}
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java?rev=755836&r1=754887&r2=755836&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java (original)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java Thu Mar 19 05:03:16 2009
@@ -20,6 +20,9 @@
import javax.xml.ws.Endpoint;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+
public class Server implements Runnable {
@@ -34,14 +37,35 @@
public static void main(String args[]) throws Exception {
String host = "localhost";
- if ("-host".equals(args[0])) {
- host = args[1];
+ String protocol = "http";
+ String cfg = null;
+ boolean wait = true;
+ for (int x = 0; x < args.length; x++) {
+ if ("-host".equals(args[x])) {
+ host = args[x + 1];
+ x++;
+ } else if ("-protocol".equals(args[x])) {
+ protocol = args[x + 1];
+ x++;
+ } else if ("-BUScfg".equals(args[x])) {
+ cfg = args[x + 1];
+ x++;
+ } else if ("-nowait".equals(args[x])) {
+ wait = false;
+ }
+ }
+ if (cfg == null || "none".equals(cfg)) {
+ BusFactory.getDefaultBus();
+ } else {
+ BusFactory.setDefaultBus(new SpringBusFactory().createBus(cfg));
}
- Server server = new Server("http://" + host + ":20003/performance/SoapHttpDocLitPort");
+ Server server = new Server(protocol + "://" + host
+ + ":8080/cxf-benchmark-soapdoclit/services/SoapHttpDocLitPort");
server.run();
-
- Thread.sleep(10000000);
+ if (wait) {
+ Thread.sleep(10000000);
+ }
}
public void run() {
Modified: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java?rev=755836&r1=754887&r2=755836&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java (original)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java Thu Mar 19 05:03:16 2009
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.performance.complex_type.server;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.cxf.performance.DocPortType;
@@ -30,16 +31,18 @@
@javax.jws.WebService(portName = "SoapHttpDocLitPort", serviceName = "PerfService",
targetNamespace = "http://cxf.apache.org/cxf/performance",
- endpointInterface = "org.apache.cxf.cxf.performance.DocPortType")
-
+ endpointInterface = "org.apache.cxf.cxf.performance.DocPortType",
+ wsdlLocation="/wsdl/perf.wsdl")
public class ServerImpl implements DocPortType {
-
- private static final Logger LOG =
- Logger.getLogger(ServerImpl.class.getPackage().getName());
+ static {
+ //workaround issue of xmlsec logging too much
+ Logger.getLogger("org.apache.xml.security.signature.Reference").setLevel(Level.WARNING);
+ }
- public NestedComplexTypeSeq echoComplexTypeDoc(NestedComplexTypeSeq request) {
+ public NestedComplexTypeSeq echoComplexTypeDoc(NestedComplexTypeSeq request, int id, javax.xml.ws.Holder<Integer> i) {
//System.out.println("Executing operation echoComplexTypeDoc\n");
//System.out.println("Message received: " + request + "\n");
+ i.value = id;
return request;
}
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.jks
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.jks?rev=755836&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties Thu Mar 19 05:03:16 2009
@@ -0,0 +1,7 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=cspass
+org.apache.ws.security.crypto.merlin.keystore.alias=myclientkey
+org.apache.ws.security.crypto.merlin.file=etc/clientKeystore.jks
+
+
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/clientKeystore.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml Thu Mar 19 05:03:16 2009
@@ -0,0 +1,51 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:security="http://schemas.iona.com/soa/security-config"
+ xmlns:interop="http://InteropBaseAddress/interop"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
+ ">
+
+ <http:conduit name="https://.*">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="ckpass">
+ <sec:keyStore type="jks" password="cspass" resource="etc/clientKeystore.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="sspass" resource="etc/serviceKeystore.jks"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml Thu Mar 19 05:03:16 2009
@@ -0,0 +1,54 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:security="http://schemas.iona.com/soa/security-config"
+ xmlns:interop="http://InteropBaseAddress/interop"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
+ ">
+
+ <httpj:engine-factory id="tls-settings">
+ <httpj:engine port="8080">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="skpass">
+ <sec:keyStore type="jks" password="sspass" resource="etc/serviceKeystore.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="cspass" resource="etc/clientKeystore.jks"/>
+ </sec:trustManagers>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+</beans>
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml Thu Mar 19 05:03:16 2009
@@ -0,0 +1,56 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <jaxws:endpoint
+ createdFromAPI="true"
+ name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
+
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties" value="etc/clientKeystore.properties"/>
+ <entry key="ws-security.signature.properties" value="etc/serviceKeystore.properties"/>
+ </jaxws:properties>
+
+ </jaxws:endpoint>
+
+ <jaxws:client name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="etc/clientKeystore.properties"/>
+ <entry key="ws-security.encryption.properties" value="etc/serviceKeystore.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+
+
+</beans>
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml Thu Mar 19 05:03:16 2009
@@ -0,0 +1,52 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <jaxws:endpoint
+ createdFromAPI="true"
+ name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties" value="etc/serviceKeystore.properties"/>
+ </jaxws:properties>
+ </jaxws:endpoint>
+
+ <jaxws:client name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties" value="etc/serviceKeystore.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+
+
+</beans>
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml Thu Mar 19 05:03:16 2009
@@ -0,0 +1,52 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+ <jaxws:endpoint
+ createdFromAPI="true"
+ name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties.sct" value="etc/serviceKeystore.properties"/>
+ </jaxws:properties>
+ </jaxws:endpoint>
+
+ <jaxws:client name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort" createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties.sct" value="etc/serviceKeystore.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+
+
+</beans>
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.jks
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.jks?rev=755836&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties Thu Mar 19 05:03:16 2009
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=sspass
+org.apache.ws.security.crypto.merlin.keystore.alias=myservicekey
+org.apache.ws.security.crypto.merlin.file=etc/serviceKeystore.jks
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/serviceKeystore.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/logging.properties?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/logging.properties (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/logging.properties Thu Mar 19 05:03:16 2009
@@ -0,0 +1,74 @@
+#
+#
+# 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.
+#
+#
+############################################################
+# Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+# Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler
+# classes. These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+#handlers= java.util.logging.ConsoleHandler
+
+# To also add the FileHandler, use the following line instead.
+#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers. For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= WARNING
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+# default file output is in user's home directory.
+java.util.logging.FileHandler.pattern = %h/java%u.log
+java.util.logging.FileHandler.limit = 50000
+java.util.logging.FileHandler.count = 1
+java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
+
+# Limit the message that are printed on the console to INFO and above.
+java.util.logging.ConsoleHandler.level = WARNING
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+#com.xyz.foo.level = SEVERE
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/logging.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/logging.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf.wsdl?rev=755836&r1=754887&r2=755836&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf.wsdl (original)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf.wsdl Thu Mar 19 05:03:16 2009
@@ -23,8 +23,11 @@
xmlns:x1="http://cxf.apache.org/cxf/performance/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
targetNamespace="http://cxf.apache.org/cxf/performance">
+ <wsdl:import location="perf_policy.wsdl" namespace="http://cxf.apache.org/cxf/performance/policy"/>
+
<types>
<schema targetNamespace="http://cxf.apache.org/cxf/performance/types"
xmlns="http://www.w3.org/2001/XMLSchema"
@@ -100,13 +103,15 @@
<complexType>
<sequence>
<element name="in" type="x1:NestedComplexTypeSeq"/>
+ <element name="id" type="xsd:int"/>
</sequence>
</complexType>
</element>
<element name="echoComplexTypeDocResponse">
<complexType>
<sequence>
- <element name="out" type="x1:NestedComplexTypeSeq"/>
+ <element name="return" type="x1:NestedComplexTypeSeq"/>
+ <element name="idout" type="xsd:int"/>
</sequence>
</complexType>
</element>
@@ -140,10 +145,10 @@
<part name="out" element="x1:echoBase64DocResponse"/>
</message>
<message name="echoComplexTypeDoc">
- <part name="in" element="x1:echoComplexTypeDoc"/>
+ <part name="parameters" element="x1:echoComplexTypeDoc"/>
</message>
<message name="echoComplexTypeDocResponse">
- <part name="out" element="x1:echoComplexTypeDocResponse"/>
+ <part name="parameters" element="x1:echoComplexTypeDocResponse"/>
</message>
<message name="echoComplexTypeRPCRequest">
@@ -233,6 +238,7 @@
</binding>
<binding name="SoapBindingDocLit" type="tns:DocPortType">
+ <wsp:PolicyReference URI="#SymD_policy"/>
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="echoStringDoc">
@@ -297,14 +303,14 @@
</binding>
<service name="PerfService">
- <port name="SoapHttpRPCLitPort" binding="tns:SoapBindingRPCLit">
- <soap:address location="http://localhost:20003/performance/SoapHttpRPCLitPort"/>
- </port>
<port name="SoapHttpDocLitPort" binding="tns:SoapBindingDocLit">
- <soap:address location="http://localhost:20003/performance/SoapHttpDocLitPort"/>
+ <soap:address location="http://localhost:8080/cxf-benchmark-soapdoclit/services/SoapHttpDocLitPort"/>
+ </port>
+ <port name="SoapHttpRPCLitPort" binding="tns:SoapBindingRPCLit">
+ <soap:address location="http://localhost:8080/cxf-benchmark-soapdoclit/services/SoapHttpRPCLitPort"/>
</port>
<port name="SoapHttpDocLitPortWrapped" binding="tns:SoapBindingDocLitWrapped">
- <soap:address location="http://localhost:20003/performance/SoapHttpDocLitWrappedPort"/>
+ <soap:address location="http://localhost:8080/cxf-benchmark-soapdoclit/services/SoapHttpDocLitWrappedPort"/>
</port>
</service>
Added: cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf_policy.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf_policy.wsdl?rev=755836&view=auto
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf_policy.wsdl (added)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf_policy.wsdl Thu Mar 19 05:03:16 2009
@@ -0,0 +1,356 @@
+<?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.
+-->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://cxf.apache.org/cxf/performance/policy"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy"
+ xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+
+ targetNamespace="http://cxf.apache.org/cxf/performance/policy">
+
+
+
+ <wsp:Policy wsu:Id="Asym_policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding >
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:EncryptSignature/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss10>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ <sp:SignedParts>
+ <sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <wsap:UsingAddressing/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+
+
+ <wsp:Policy wsu:Id="Sym_policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ <sp:RequireSignatureConfirmation/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust10>
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens/>
+ <sp:RequireClientEntropy/>
+ <sp:RequireServerEntropy/>
+ </wsp:Policy>
+ </sp:Trust10>
+ <wsap:UsingAddressing/>
+ <sp:SignedParts>
+ <sp:Body/>
+ <sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ </sp:SignedParts>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+
+ <wsp:Policy wsu:Id="SymD_policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:RequireDerivedKeys/>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ <sp:RequireSignatureConfirmation/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust10>
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens/>
+ <sp:RequireClientEntropy/>
+ <sp:RequireServerEntropy/>
+ </wsp:Policy>
+ </sp:Trust10>
+ <wsap:UsingAddressing/>
+ <sp:SignedParts>
+ <sp:Body/>
+ <sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ </sp:SignedParts>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+
+ <wsp:Policy wsu:Id="SymSC_policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:SecureConversationToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:BootstrapPolicy>
+ <wsp:Policy>
+ <sp:SignedParts>
+ <sp:Body/>
+ <sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ </sp:SignedParts>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:EndorsingSupportingTokens>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust10>
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens/>
+ <sp:RequireClientEntropy/>
+ <sp:RequireServerEntropy/>
+ </wsp:Policy>
+ </sp:Trust10>
+ </wsp:Policy>
+ </sp:BootstrapPolicy>
+ </wsp:Policy>
+ </sp:SecureConversationToken>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust10>
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens/>
+ <sp:RequireClientEntropy/>
+ <sp:RequireServerEntropy/>
+ </wsp:Policy>
+ </sp:Trust10>
+ <wsap:UsingAddressing/>
+ <sp:SignedParts>
+ <sp:Body/>
+ <sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ </sp:SignedParts>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+</definitions>