You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2010/05/11 19:31:56 UTC
svn commit: r943197 - in /ode/branches/APACHE_ODE_1.X: Rakefile
axis2-war/src/test/TimeService-soapui-project.xml
axis2-war/src/test/resources/test-log4j.properties
axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties
Author: rr
Date: Tue May 11 17:31:56 2010
New Revision: 943197
URL: http://svn.apache.org/viewvc?rev=943197&view=rev
Log:
Using dao-hib by default for axis2 tests, added TimeService mock project to run axis2 tests locally, inreased memory limit for axis2 tests, logging to a file instead of console in axis2 tests
Added:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/TimeService-soapui-project.xml (with props)
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties (with props)
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/test-log4j.properties
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=943197&r1=943196&r2=943197&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Tue May 11 17:31:56 2010
@@ -103,8 +103,8 @@ define "ode" do
end
end
- test.using :testng, :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'] }
- test.with projects("tools"), libs, AXIS2_TEST, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J
+ test.using :testng, :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'] }, :java_args=>['-Xmx1024M', '-XX:MaxPermSize=1024m']
+ test.with projects("tools"), libs, AXIS2_TEST, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, SLF4J, LOG4J
webapp_dir = "#{test.compile.target}/webapp"
test.setup task(:prepare_webapp) do |task|
cp_r _("src/main/webapp"), test.compile.target.to_s
Added: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/TimeService-soapui-project.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/TimeService-soapui-project.xml?rev=943197&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/TimeService-soapui-project.xml (added)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/TimeService-soapui-project.xml Tue May 11 17:31:56 2010
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<con:soapui-project name="TimeService" resourceRoot="" soapui-version="3.5-beta1" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="TimeServiceSoap" type="wsdl" bindingName="{http://ws.intalio.com/TimeService/}TimeServiceSoap" soapVersion="1_1" anonymous="optional" definition="file:/home/joker/mind/intalio/pxe/axis2-war/src/test/resources/TestCleanSuccess_All/TimeService.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:/home/joker/mind/intalio/pxe/axis2-war/src/test/resources/TestCleanSuccess_All/TimeService.wsdl"><con:part><con:url>file:/home/joker/mind/intalio/pxe/axis2-war/src/test/resources/TestCleanSuccess_All/TimeService.wsdl</con:url><con:content><![CDATA[<!--~ 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.-->
+<wsdl:definitions targetNamespace="http://ws.intalio.com/TimeService/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.intalio.com/TimeService/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:documentation>A sample Time service</wsdl:documentation>
+ <wsdl:types>
+ <s:schema elementFormDefault="qualified" targetNamespace="http://ws.intalio.com/TimeService/">
+ <s:element name="getUTCTime" type="s:string"/>
+ <s:element name="getUTCTimeResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="getUTCTimeResult" type="s:string"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="getCityTime">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="city" type="s:string"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="getCityTimeResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="getCityTimeResult" type="s:string"/>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ </s:schema>
+ </wsdl:types>
+ <wsdl:message name="getUTCTimeSoapIn">
+ <wsdl:part name="parameters" element="tns:getUTCTime"/>
+ </wsdl:message>
+ <wsdl:message name="getUTCTimeSoapOut">
+ <wsdl:part name="parameters" element="tns:getUTCTimeResponse"/>
+ </wsdl:message>
+ <wsdl:message name="getCityTimeSoapIn">
+ <wsdl:part name="parameters" element="tns:getCityTime"/>
+ </wsdl:message>
+ <wsdl:message name="getCityTimeSoapOut">
+ <wsdl:part name="parameters" element="tns:getCityTimeResponse"/>
+ </wsdl:message>
+ <wsdl:portType name="TimeServiceSoap">
+ <wsdl:operation name="getUTCTime">
+ <wsdl:input message="tns:getUTCTimeSoapIn"/>
+ <wsdl:output message="tns:getUTCTimeSoapOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="getCityTime">
+ <wsdl:input message="tns:getCityTimeSoapIn"/>
+ <wsdl:output message="tns:getCityTimeSoapOut"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="TimeServiceSoap" type="tns:TimeServiceSoap">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getUTCTime">
+ <soap:operation soapAction="http://ws.intalio.com/TimeService/getUTCTime" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="getCityTime">
+ <soap:operation soapAction="http://ws.intalio.com/TimeService/getCityTime" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="TimeService">
+ <wsdl:documentation>A sample Time service</wsdl:documentation>
+ <wsdl:port name="TimeServiceSoap" binding="tns:TimeServiceSoap">
+ <soap:address location="http://ws.intalio.com/TimeService/"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://ws.intalio.com/TimeService/</con:endpoint><con:endpoint>http://joker-laptop:8088/TimeService/</con:endpoint></con:endpoints><con:operation isOneWay="false" action="http://ws.intalio.com/TimeService/getCityTime" name="getCityTime" bindingOperationName="getCityTime" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://ws.intalio.com/TimeService/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tim="http://ws.intalio.com/TimeService/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <tim:getCityTime>
+ <!--Optional:-->
+ <tim:city>?</tim:city>
+ </tim:getCityTime>
+ </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.intalio.com/TimeService/getCityTime"/></con:call></con:operation><con:operation isOneWay="false" action="http://ws.intalio.com/TimeService/getUTCTime" name="getUTCTime" bindingOperationName="getUTCTime" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://ws.intalio.com/TimeService/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tim="http://ws.intalio.com/TimeService/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <tim:getUTCTime>?</tim:getUTCTime>
+ </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.intalio.com/TimeService/getUTCTime"/></con:call></con:operation></con:interface><con:mockService port="8088" path="/TimeService/" host="joker-laptop" name="TimeServiceSoap MockService" bindToHostOnly="false" docroot=""><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.mock.WsdlMockService@require-soap-action">false</con:setting></con:settings><con:mockOperation name="getCityTime" interface="TimeServiceSoap" operation="getCityTime"><con:settings/><con:dispatchStyle>SEQUENCE</con:dispatchStyle><con:defaultResponse>Response 1</con:defaultResponse><con:response name="Response 1" encoding="UTF-8"><con:settings/><con:responseContent><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tim="http://ws.intalio.com/TimeService/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <tim:getCityTimeResponse>
+ <!--Optional:-->
+ <tim:getCityTimeResult>?</tim:getCityTimeResult>
+ </tim:getCityTimeResponse>
+ </soapenv:Body>
+</soapenv:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.intalio.com/TimeService/getCityTime"/></con:response><con:dispatchConfig/></con:mockOperation><con:mockOperation name="getUTCTime" interface="TimeServiceSoap" operation="getUTCTime"><con:settings/><con:dispatchStyle>SEQUENCE</con:dispatchStyle><con:defaultResponse>Response 1</con:defaultResponse><con:response name="Response 1" encoding="UTF-8"><con:settings/><con:responseContent><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tim="http://ws.intalio.com/TimeService/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <tim:getUTCTimeResponse>
+ <!--Optional:-->
+ <tim:getUTCTimeResult>?</tim:getUTCTimeResult>
+ </tim:getUTCTimeResponse>
+ </soapenv:Body>
+</soapenv:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.intalio.com/TimeService/getUTCTime"/></con:response><con:dispatchConfig/></con:mockOperation><con:properties/></con:mockService><con:properties/><con:wssContainer/></con:soapui-project>
\ No newline at end of file
Propchange: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/TimeService-soapui-project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/test-log4j.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/test-log4j.properties?rev=943197&r1=943196&r2=943197&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/test-log4j.properties (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/test-log4j.properties Tue May 11 17:31:56 2010
@@ -1,36 +1,40 @@
+#
+# 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.
#
-# 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.
+# The logging properties used during tests..
#
+#log4j.rootLogger=DEBUG, file
+log4j.rootLogger=INFO, file
-# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=WARN, CONSOLE
-
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=ERROR
-log4j.category.org.hibernate.type=WARN
-log4j.category.org.objectweb=ERROR
-log4j.category.org.apache.ode.axis2=DEBUG
-log4j.category.org.apache.ode.axis2.hooks.SessionInHandler=INFO
-log4j.category.org.apache.ode.bpel.engine=INFO
-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=DEBUG
-log4j.category.org.apache.ode.bpel.epr=INFO
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=target/test/test.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - %m%n
-log4j.category.org.apache.ode.bpel.runtime=DEBUG
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - %m%n
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
+log4j.category.httpclient=INFO
+log4j.category.httpclient.Wire=INFO
+log4j.category.org.apache.ode=INFO
+#log4j.category.hibernate=DEBUG
+#log4j.category.org.hibernate=DEBUG
Added: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties?rev=943197&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties (added)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties Tue May 11 17:31:56 2010
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl
+ode-axis2.db.emb.name=hibdb
+ode-axis2.db.mode=EMBEDDED
+ode-axis2.cluster.localRoute.targets=http://doesntexist:8080/ode/processes/
+ode-axis2.cluster.localRoute.base=http://localhost:8888/ode/processes/
+ode-axis2.event.listeners=org.apache.ode.bpel.common.evt.DebugBpelEventListener
Propchange: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties
------------------------------------------------------------------------------
svn:eol-style = native