Commits

Christian Müller committed d169665

updated the test to reflect the requirements for the test suite

Comments (0)

Files changed (17)

 target
+.settings
+.project
+.classpath

servicemix-osgi/README.txt

 Apache ServiceMix 4.4.2 - powered by Camel
 
-Use Maven 2.x to build the artifacts as:
+Use Maven 3.x to build the artifacts as:
 
     $ cd ~/resources/esbperformance/servicemix-osgi
     $ mvn install
 
-Increase heap memory by editing {SMX_HOME}/bin/servicemix to read as follows
+Increase heap memory by editing ${SMX_HOME}/bin/servicemix to read as follows
 
     JAVA_MIN_MEM=2048M
     JAVA_MAX_MEM=2048M
     
-Copy the configuration files from servicemix-osgi/etc into {SMX_HOME}/etc
+Copy the configuration files from servicemix-osgi/etc into ${SMX_HOME}/etc
     This reduce the number of features which are started by default.
+    Rename ${SMX_HOME}/etc/activemq-broker.xml to activemq-broker.xml.off because we don't need it for the performance test
+    Make sure you remove the ${SMX_HOME}/data directory if you already started SMX before.
 
 Start ServiceMix as
 
-    $ cd bin
+    $ cd ${SMX_HOME}/bin
     $ ./servicemix
 
 First install the DirectProxy deployable artifacts into ServiceMix. On the ServiceMix console,
 type following to install and start each proxy services into ServiceMix
 
-    karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/proxy/1.0.0
- 	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/cbr/1.0.0
-	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/soap-hbr/1.0.0
-	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/http-hbr/1.0.0
-	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/xslt/1.0.0
-	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/secure-proxy/1.0.0
+    karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/proxy/1.1.0
+ 	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/cbr/1.1.0
+	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/soap-hbr/1.1.0
+	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/http-hbr/1.1.0
+	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/xslt/1.1.0
+	karaf@trun> install -s mvn:org.apache.cmueller.camel.esbperf.servicemix-osgi/secure-proxy/1.1.0
     
 Before executing the performance test, re-generate the WS-Security related requests as ServiceMix is particular about the timestamps used
     $ cd client-scripts
     wsdl-url        : http://localhost:8192/service/DirectProxy?wsdl
 
 SOAP Body CBR Proxy
-    url             : http://localhost:8193/service/CBRProxy
-    wsdl-url        : http://localhost:8193/service/CBRProxy?wsdl
+    url             : http://localhost:8192/service/CBRProxy
+    wsdl-url        : http://localhost:8192/service/CBRProxy?wsdl
 
 SOAP Header CBR Proxy
-    url             : http://localhost:8194/service/CBRSOAPHeaderProxy
-    wsdl-url        : http://localhost:8194/service/CBRSOAPHeaderProxy?wsdl
+    url             : http://localhost:8192/service/CBRSOAPHeaderProxy
+    wsdl-url        : http://localhost:8192/service/CBRSOAPHeaderProxy?wsdl
 
 Transport Header CBR Proxy
-    url             : http://localhost:8195/service/CBRTransportHeaderProxy
-    wsdl-url        : http://localhost:8195/service/CBRTransportHeaderProxy?wsdl
+    url             : http://localhost:8192/service/CBRTransportHeaderProxy
+    wsdl-url        : http://localhost:8192/service/CBRTransportHeaderProxy?wsdl
 
 XSLT Transformation Proxy
-    url             : http://localhost:8196/service/XSLTProxy
-    wsdl-url        : http://localhost:8196/service/XSLTProxy?wsdl
+    url             : http://localhost:8192/service/XSLTProxy
+    wsdl-url        : http://localhost:8192/service/XSLTProxy?wsdl
 
 WS-Security Proxy
-    url             : http://localhost:8197/service/SecureProxy
-    wsdl-url        : http://localhost:8197/service/SecureProxy?wsdl
+    url             : http://localhost:8192/service/SecureProxy
+    wsdl-url        : http://localhost:8192/service/SecureProxy?wsdl
 

servicemix-osgi/cbr/pom.xml

     <parent>
         <groupId>org.apache.cmueller.camel.esbperf</groupId>
         <artifactId>servicemix-osgi</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
         <relativePath>..</relativePath>
     </parent>
     

servicemix-osgi/cbr/src/main/resources/META-INF/spring/bundle-context.xml

     <import resource="classpath:META-INF/cxf/cxf.xml" />
 
     <cxf:cxfEndpoint id="cbrProxy"
-        address="http://0.0.0.0:8193/service/CBRProxy"
+        address="/CBRProxy"
         endpointName="service:CBREchoServicePort"
         serviceName="service:CBRProxy"
         wsdlURL="META-INF/wsdl/CBRWSDL-consumer-embedded.wsdl"

servicemix-osgi/etc/org.apache.cxf.osgi.cfg

+################################################################################
+#
+#    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.
+#
+#################################################################################
+
+org.apache.cxf.servlet.context=/service

servicemix-osgi/etc/org.ops4j.pax.web.cfg

+################################################################################
+#
+#    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.
+#
+#################################################################################
+
+#################################################################################
+#
+#    This is a stub configuration file for pax-web ssl configuration.
+#    More details please refer to 
+#    http://wiki.ops4j.org/display/paxweb/SSL+Configuration
+#    Important Notes: If file named org.ops4j.pax.web.cfg in etc folder,
+#                     Pax Web will always try to read configuration from
+this = file, so any org.ops4j.pax.web configuration 
+in = http feature get ignored, that's why we name this 
+                      file as org.ops4j.pax.web.empty.stub.
+                      If you need this configuration file, rename it to
+                      org.ops4j.pax.web before use it.
+#################################################################################
+
+org.ops4j.pax.web.config.file=etc/jetty.xml
+javax.servlet.context.tempdir=data/pax-web-jsp

servicemix-osgi/http-hbr/pom.xml

     <parent>
         <artifactId>servicemix-osgi</artifactId>
         <groupId>org.apache.cmueller.camel.esbperf</groupId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
         <relativePath>..</relativePath>
     </parent>
     

servicemix-osgi/http-hbr/src/main/resources/META-INF/spring/bundle-context.xml

     <import resource="classpath:META-INF/cxf/cxf.xml" />
 
     <cxf:cxfEndpoint id="cbrProxy"
-        address="http://0.0.0.0:8195/service/CBRProxy"
+        address="/CBRTransportHeaderProxy"
         endpointName="service:CBRTransportHeaderEchoServicePort"
         serviceName="service:CBRTransportHeaderProxy"
         wsdlURL="META-INF/wsdl/HBRTransportWSDL-consumer-embedded.wsdl"

servicemix-osgi/pom.xml

     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cmueller.camel.esbperf</groupId>
     <artifactId>servicemix-osgi</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <packaging>pom</packaging>
 
     <properties>

servicemix-osgi/proxy/pom.xml

     <parent>
         <groupId>org.apache.cmueller.camel.esbperf</groupId>
         <artifactId>servicemix-osgi</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
         <relativePath>..</relativePath>
     </parent>
 

servicemix-osgi/proxy/src/main/resources/META-INF/spring/bundle-context.xml

     <import resource="classpath:META-INF/cxf/cxf.xml" />
 
     <cxf:cxfEndpoint id="directProxy"
-        address="http://0.0.0.0:8192/service/DirectProxy"
+        address="/DirectProxy"
         endpointName="service:EchoServicePort"
         serviceName="service:DirectProxy"
         wsdlURL="META-INF/wsdl/ProxyWSDL-consumer-embedded.wsdl"

servicemix-osgi/secure-proxy/pom.xml

     <parent>
         <artifactId>servicemix-osgi</artifactId>
         <groupId>org.apache.cmueller.camel.esbperf</groupId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
         <relativePath>..</relativePath>
     </parent>
     <groupId>org.apache.cmueller.camel.esbperf.servicemix-osgi</groupId>

servicemix-osgi/secure-proxy/src/main/resources/META-INF/spring/bundle-context.xml

 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
 
-    <cxf:cxfEndpoint id="directProxy"
-        address="http://0.0.0.0:8197/service/DirectProxy"
+    <cxf:cxfEndpoint id="secureProxy"
+        address="/SecureProxy"
         endpointName="service:EchoServicePort"
         serviceName="service:SecureProxy"
         wsdlURL="META-INF/wsdl/SecureProxyWSDL-consumer-embedded.wsdl"
 
     <camelContext xmlns="http://camel.apache.org/schema/spring">
         <route id="cxf-secure-proxy">
-            <from uri="cxf:bean:directProxy" />
+            <from uri="cxf:bean:secureProxy" />
             <to uri="cxf:bean:echoService" />
         </route>
     </camelContext>

servicemix-osgi/soap-hbr/pom.xml

     <parent>
         <artifactId>servicemix-osgi</artifactId>
         <groupId>org.apache.cmueller.camel.esbperf</groupId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
         <relativePath>..</relativePath>
     </parent>
 

servicemix-osgi/soap-hbr/src/main/resources/META-INF/spring/bundle-context.xml

     <import resource="classpath:META-INF/cxf/cxf.xml" />
 
     <cxf:cxfEndpoint id="cbrProxy"
-        address="http://0.0.0.0:8194/service/CBRProxy"
+        address="/CBRSOAPHeaderProxy"
         endpointName="service:CBRSOAPHeaderEchoServicePort"
         serviceName="service:CBRSOAPHeaderProxy"
         wsdlURL="META-INF/wsdl/HBRSoapWSDL-consumer-embedded.wsdl"

servicemix-osgi/xslt/pom.xml

     <parent>
         <artifactId>servicemix-osgi</artifactId>
         <groupId>org.apache.cmueller.camel.esbperf</groupId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
         <relativePath>..</relativePath>
     </parent>
     

servicemix-osgi/xslt/src/main/resources/META-INF/spring/bundle-context.xml

     <import resource="classpath:META-INF/cxf/cxf.xml" />
 
     <cxf:cxfEndpoint id="xsltProxy"
-        address="http://0.0.0.0:8196/service/XSLTProxy"
+        address="/XSLTProxy"
         endpointName="service:EchoServicePort"
         serviceName="service:XSLTProxy"
         wsdlURL="META-INF/wsdl/TransformerWSDL-consumer-embedded.wsdl"