savara SVN: r639 - in branches/experimental/2.0.x/bundles: org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl and 7 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-05 11:52:54 -0500 (Sat, 05 Feb 2011)
New Revision: 639
Added:
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Broker_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Buyer_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_CreditAgency_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierQuoteEngine_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierTxnProcessor_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Buyer_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_CreditAgency_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Store_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Buyer_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Seller_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/ESBBroker.spr
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/PurchaseGoods.spr
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/ReqRespFault.spr
Modified:
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java
Log:
Added WSDL generation from protocol based contract test cases.
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java 2011-02-05 16:50:12 UTC (rev 638)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java 2011-02-05 16:52:54 UTC (rev 639)
@@ -183,7 +183,7 @@
if (url.getFile().indexOf("target/test-classes") != -1) {
f = new java.io.File(url.getFile().replaceFirst("target/test-classes","src/test/resources"));
- } if (url.getFile().indexOf("target/classes") != -1) {
+ } else if (url.getFile().indexOf("target/classes") != -1) {
f = new java.io.File(url.getFile().replaceFirst("target/classes","src/test/resources"));
} else if (url.getFile().indexOf("classes") != -1) {
f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources"));
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-02-05 16:50:12 UTC (rev 638)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-02-05 16:52:54 UTC (rev 639)
@@ -172,6 +172,7 @@
ret.setQName(new javax.xml.namespace.QName(contract.getName()));
}
ret.setTargetNamespace(targetNamespace);
+ ret.addNamespace("tns", targetNamespace);
// Set up namespace mappings
java.util.Iterator<Namespace> iter=contract.getNamespaces().iterator();
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/GeneratorTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/GeneratorTest.java 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,260 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.wsdl.generator;
+
+import javax.wsdl.Definition;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import org.savara.contract.model.Contract;
+import org.scribble.common.logging.CachedJournal;
+import org.scribble.protocol.model.Role;
+import org.scribble.protocol.parser.antlr.ANTLRProtocolParser;
+import org.savara.protocol.contract.generator.ContractGenerator;
+import org.savara.protocol.contract.generator.ContractGeneratorFactory;
+import org.savara.wsdl.generator.soap.SOAPRPCWSDLBinding;
+
+public class GeneratorTest {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Protocol->WSDL Generator Tests");
+
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "Broker"));
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "Buyer"));
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "SupplierTxnProcessor"));
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "CreditAgency"));
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "SupplierQuoteEngine"));
+
+ suite.addTest(new ProtocolToWSDLTester("PurchaseGoods", "Buyer"));
+ suite.addTest(new ProtocolToWSDLTester("PurchaseGoods", "CreditAgency"));
+ suite.addTest(new ProtocolToWSDLTester("PurchaseGoods", "Store"));
+
+ suite.addTest(new ProtocolToWSDLTester("ReqRespFault", "Buyer"));
+ suite.addTest(new ProtocolToWSDLTester("ReqRespFault", "Seller"));
+
+ return suite;
+ }
+
+ protected static class ProtocolToWSDLTester extends TestCase {
+
+ /**
+ * This constructor is initialized with the test
+ * name.
+ *
+ * @param name The test name
+ * @param role The role
+ */
+ public ProtocolToWSDLTester(String name,
+ String role) {
+ super(name+"@"+role);
+ m_name = name;
+ m_role = role;
+ }
+
+ /**
+ * This method runs the test.
+ *
+ * @param result The test result
+ */
+ public void run(TestResult result) {
+
+ // Run test
+ result.startTest(this);
+
+ String filename="testmodels/contract/"+m_name+".spr";
+
+ java.io.InputStream is=
+ ClassLoader.getSystemResourceAsStream(filename);
+
+ if (is == null) {
+ result.addError(this,
+ new Throwable("Unable to locate resource: "+filename));
+ } else {
+ CachedJournal journal=new CachedJournal();
+
+ org.scribble.protocol.model.ProtocolModel model=null;
+
+ ANTLRProtocolParser parser=new ANTLRProtocolParser();
+ parser.setAnnotationProcessor(new org.savara.protocol.parser.AnnotationProcessor());
+
+ try {
+ model = parser.parse(is, journal, null);
+ } catch(Exception e) {
+ result.addError(this, new Throwable("Parsing choreography failed"));
+ }
+
+ if (model == null) {
+ result.addError(this, new Throwable("Model is null"));
+ } else {
+ ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
+ if (cg != null) {
+ Contract contract=cg.generate(model.getProtocol(), null, new Role(m_role), journal);
+
+ if (contract != null) {
+
+ // Convert to WSDL
+ WSDLGenerator gen=WSDLGeneratorFactory.getWSDLGenerator();
+
+ java.util.List<Definition> defns=gen.generate(contract, new SOAPRPCWSDLBinding());
+
+ for (int i=0; i < defns.size(); i++) {
+ Definition defn=defns.get(i);
+
+ try {
+ javax.wsdl.xml.WSDLWriter writer=
+ javax.wsdl.factory.WSDLFactory.newInstance().newWSDLWriter();
+
+ java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream();
+
+ writer.writeWSDL(defn, baos);
+
+ byte[] b=baos.toByteArray();
+
+ baos.close();
+
+ checkResults(result, new String(b), "rpc", i);
+ } catch(Exception e) {
+ result.addError(this, e);
+ }
+ }
+ } else {
+ result.addError(this, new Throwable("No contract"));
+ }
+ }
+ }
+ }
+
+ result.endTest(this);
+ }
+
+ /**
+ * This method checks the generated BPEL against a
+ * previously stored correct version.
+ *
+ * @param result The test result
+ * @param bpel The BPEL
+ */
+ protected void checkResults(TestResult result, String wsdl, String binding, int num) {
+ boolean f_valid=false;
+
+ String filename="results/wsdl/"+m_name+"_"+m_role+"_"+binding+"_"+num+".wsdl";
+
+ java.io.InputStream is=
+ ClassLoader.getSystemResourceAsStream(filename);
+
+ if (is != null) {
+
+ try {
+ byte[] b=new byte[is.available()];
+
+ is.read(b);
+
+ is.close();
+
+ String orig=new String(b);
+
+ if (orig.equals(wsdl) == false) {
+ result.addError(this,
+ new Throwable("Generated WSDL does not match stored version"));
+ } else {
+ f_valid = true;
+ }
+ } catch(Exception e) {
+ result.addError(this, e);
+ }
+ } else {
+ result.addError(this,
+ new Throwable("Resulting WSDL '"+filename+
+ "' not found for comparison"));
+ }
+
+ if (f_valid == false) {
+ String srcfile="testmodels/contract/"+m_name+".spr";
+
+ java.net.URL url=ClassLoader.getSystemResource(srcfile);
+
+ /*
+ try {
+ url = org.eclipse.core.runtime.FileLocator.toFileURL(url);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ */
+
+ if (url != null) {
+ // URL will point to copy of test models in the classes folder, so need
+ // to obtain reference back to source version
+ java.io.File f=null;
+
+ if (url.getFile().indexOf("target/test-classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("target/test-classes","src/test/resources"));
+ } else if (url.getFile().indexOf("target/classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("target/classes","src/test/resources"));
+ } else if (url.getFile().indexOf("classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources"));
+ } else if (url.getFile().indexOf("bin") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources"));
+ } else {
+ result.addError(this, new Exception("Could not locate results folder to record expected result"));
+ }
+
+ if (f != null && f.exists()) {
+ f = f.getParentFile().getParentFile().getParentFile();
+
+ java.io.File resultsDir=new java.io.File(f, "results/wsdl");
+
+ if (resultsDir.exists() == false) {
+ resultsDir.mkdirs();
+ }
+
+ java.io.File resultFile=new java.io.File(resultsDir,
+ m_name+"_"+m_role+"_"+binding+"_"+num+".generated");
+
+ //if (resultFile.exists() == false) {
+ try {
+ java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile);
+
+ fos.write(wsdl.getBytes());
+
+ fos.flush();
+ fos.close();
+
+ } catch(Exception e){
+ result.addError(this, e);
+ }
+ /*
+ } else {
+ System.err.println("NOTE: Generated output '"+resultFile+
+ "' already exists - not being overwritten");
+ }
+ */
+ } else {
+ result.addError(this, new Throwable("Unable to obtain URL for model source '"+
+ m_name+"': "+url));
+ }
+ }
+ }
+ }
+
+ private String m_name=null;
+ private String m_role=null;
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Broker_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Broker_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Broker_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ESBBroker/Broker" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:message name="rejectedFault">
+ <wsdl:part name="content" type="orderRejected">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="makeEnquiryRequest">
+ <wsdl:part name="content" type="enquiry">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="buyResponse">
+ <wsdl:part name="content" type="bookingReference">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="makeEnquiryResponse">
+ <wsdl:part name="content" type="quoteList">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="buyRequest">
+ <wsdl:part name="content" type="buy">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="cancelRequest">
+ <wsdl:part name="content" type="cancel">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Broker">
+ <wsdl:operation name="makeEnquiry">
+ <wsdl:input message="tns:makeEnquiryRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:makeEnquiryResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="buy">
+ <wsdl:input message="tns:buyRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:buyResponse">
+ </wsdl:output>
+ <wsdl:fault name="rejected" message="tns:rejectedFault">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="cancel">
+ <wsdl:input message="tns:cancelRequest">
+ </wsdl:input>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="BrokerBinding" type="tns:Broker">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="makeEnquiry">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="buy">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ </wsdl:output>
+ <wsdl:fault name="rejected">
+ <soap:fault name="rejected" use="literal" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="cancel">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ </wsdl:input>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="BrokerService">
+ <wsdl:port name="BrokerPort" binding="tns:BrokerBinding">
+ <soap:address location="http://localhost:8080/BrokerService/BrokerPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Buyer_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Buyer_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Buyer_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:service name="BuyerService">
+ <wsdl:port name="BuyerPort" binding="tns:BuyerBinding">
+ <soap:address location="http://localhost:8080/BuyerService/BuyerPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_CreditAgency_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_CreditAgency_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_CreditAgency_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:message name="checkCreditResponse">
+ <wsdl:part name="content" type="CreditCheckOk">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="checkCreditRequest">
+ <wsdl:part name="content" type="CreditCheckRequest">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="invalidCreditFault">
+ <wsdl:part name="content" type="CreditCheckInvalid">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="CreditAgency">
+ <wsdl:operation name="checkCredit">
+ <wsdl:input message="tns:checkCreditRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:checkCreditResponse">
+ </wsdl:output>
+ <wsdl:fault name="invalidCredit" message="tns:invalidCreditFault">
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="CreditAgencyBinding" type="tns:CreditAgency">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="checkCredit">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
+ </wsdl:output>
+ <wsdl:fault name="invalidCredit">
+ <soap:fault name="invalidCredit" use="literal" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="CreditAgencyService">
+ <wsdl:port name="CreditAgencyPort" binding="tns:CreditAgencyBinding">
+ <soap:address location="http://localhost:8080/CreditAgencyService/CreditAgencyPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierQuoteEngine_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierQuoteEngine_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierQuoteEngine_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:message name="getQuoteResponse">
+ <wsdl:part name="content" type="quote">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getQuoteRequest">
+ <wsdl:part name="content" type="requestForQuote">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="SupplierQuoteEngine">
+ <wsdl:operation name="getQuote">
+ <wsdl:input message="tns:getQuoteRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:getQuoteResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SupplierQuoteEngineBinding" type="tns:SupplierQuoteEngine">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getQuote">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SupplierQuoteEngineService">
+ <wsdl:port name="SupplierQuoteEnginePort" binding="tns:SupplierQuoteEngineBinding">
+ <soap:address location="http://localhost:8080/SupplierQuoteEngineService/SupplierQuoteEnginePort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierTxnProcessor_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierTxnProcessor_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierTxnProcessor_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:message name="confirmRequest">
+ <wsdl:part name="content" type="orderConfirmed">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="confirmResponse">
+ <wsdl:part name="content" type="bookingReference">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="SupplierTxnProcessor">
+ <wsdl:operation name="confirm">
+ <wsdl:input message="tns:confirmRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:confirmResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SupplierTxnProcessorBinding" type="tns:SupplierTxnProcessor">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="confirm">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SupplierTxnProcessorService">
+ <wsdl:port name="SupplierTxnProcessorPort" binding="tns:SupplierTxnProcessorBinding">
+ <soap:address location="http://localhost:8080/SupplierTxnProcessorService/SupplierTxnProcessorPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Buyer_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Buyer_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Buyer_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="Buyer" targetNamespace="http://www.jboss.org/savara/examples" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:service name="BuyerService">
+ <wsdl:port name="BuyerPort" binding="tns:BuyerBinding">
+ <soap:address location="http://localhost:8080/BuyerService/BuyerPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_CreditAgency_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_CreditAgency_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_CreditAgency_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="java:org.jboss.savara.examples.purchasing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:message name="checkCreditRequest">
+ <wsdl:part name="content" type="tns:CreditCheckRequest">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="CreditCheckFailedFault">
+ <wsdl:part name="content" type="tns:CreditCheckInvalid">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="checkCreditResponse">
+ <wsdl:part name="content" type="tns:CreditCheckOk">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="CreditAgency">
+ <wsdl:operation name="checkCredit">
+ <wsdl:input message="tns:checkCreditRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:checkCreditResponse">
+ </wsdl:output>
+ <wsdl:fault name="CreditCheckFailed" message="tns:CreditCheckFailedFault">
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="CreditAgencyBinding" type="tns:CreditAgency">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="checkCredit">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="java:org.jboss.savara.examples.purchasing"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="java:org.jboss.savara.examples.purchasing"/>
+ </wsdl:output>
+ <wsdl:fault name="CreditCheckFailed">
+ <soap:fault name="CreditCheckFailed" use="literal" namespace="java:org.jboss.savara.examples.purchasing"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="CreditAgencyService">
+ <wsdl:port name="CreditAgencyPort" binding="tns:CreditAgencyBinding">
+ <soap:address location="http://localhost:8080/CreditAgencyService/CreditAgencyPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Store_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Store_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Store_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="Store" targetNamespace="http://www.jboss.org/examples/store" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.jboss.org/examples/store" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:message name="BuyFailedFault">
+ <wsdl:part name="content" type="tns:BuyFailed">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="buyRequest">
+ <wsdl:part name="content" type="tns:BuyRequest">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="buyResponse">
+ <wsdl:part name="content" type="tns:BuyConfirmed">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Store">
+ <wsdl:operation name="buy">
+ <wsdl:input message="tns:buyRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:buyResponse">
+ </wsdl:output>
+ <wsdl:fault name="BuyFailed" message="tns:BuyFailedFault">
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="StoreBinding" type="tns:Store">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="buy">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.jboss.org/examples/store"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="http://www.jboss.org/examples/store"/>
+ </wsdl:output>
+ <wsdl:fault name="BuyFailed">
+ <soap:fault name="BuyFailed" use="literal" namespace="http://www.jboss.org/examples/store"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="StoreService">
+ <wsdl:port name="StorePort" binding="tns:StoreBinding">
+ <soap:address location="http://localhost:8080/StoreService/StorePort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Buyer_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Buyer_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Buyer_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:service name="BuyerService">
+ <wsdl:port name="BuyerPort" binding="tns:BuyerBinding">
+ <soap:address location="http://localhost:8080/BuyerService/BuyerPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Seller_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Seller_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Seller_rpc_0.wsdl 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:message name="checkCreditRequest">
+ <wsdl:part name="content" type="CreditCheckRequest">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="checkCreditResponse">
+ <wsdl:part name="content" type="CreditCheckOk">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="insufficientCreditFault">
+ <wsdl:part name="content" type="CreditCheckInvalid">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Seller">
+ <wsdl:operation name="checkCredit">
+ <wsdl:input message="tns:checkCreditRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:checkCreditResponse">
+ </wsdl:output>
+ <wsdl:fault name="insufficientCredit" message="tns:insufficientCreditFault">
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SellerBinding" type="tns:Seller">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="checkCredit">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
+ </wsdl:output>
+ <wsdl:fault name="insufficientCredit">
+ <soap:fault name="insufficientCredit" use="literal" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SellerService">
+ <wsdl:port name="SellerPort" binding="tns:SellerBinding">
+ <soap:address location="http://localhost:8080/SellerService/SellerPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/ESBBroker.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/ESBBroker.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/ESBBroker.spr 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,100 @@
+import xsd "bookingReference" as BookingReference, "buy" as Buy, "cancel" as Cancel, "CreditCheckRequest" as CreditInformation, "CreditCheckInvalid" as CreditInvalid, "CreditCheckOk" as CreditValid, "enquiry" as Enquiry, "orderConfirmed" as OrderConfirmed, "orderRejected" as OrderRejected, "quote" as Quote, "quoteList" as QuoteList, "requestForQuote" as RequestForQuote;
+[[ Namespace(name=http://www.pi4soa.org/ESBBroker/Broker,role=Broker) ]]
+[[ Namespace(name=http://www.pi4soa.org/ESBBroker/Buyer,role=Buyer) ]]
+[[ Namespace(name=http://www.pi4soa.org/ESBBroker/CreditAgency,role=CreditAg... ]]
+[[ Namespace(name=http://www.pi4soa.org/ESBBroker/Supplier,role=Supplier) ]]
+[[ Type(prefix=tns,namespace=http://www.pi4soa.org/ESBBroker) ]]
+[[ Type(prefix=xsd,namespace=http://www.w3.org/2001/XMLSchema) ]]
+[[ Type(prefix=brk,namespace=http://www.pi4soa.org/ESBBroker/Broker) ]]
+[[ Type(prefix=byr,namespace=http://www.pi4soa.org/ESBBroker/Buyer) ]]
+[[ Type(prefix=cay,namespace=http://www.pi4soa.org/ESBBroker/CreditAgency) ]]
+[[ Type(prefix=spr,namespace=http://www.pi4soa.org/ESBBroker/Supplier) ]]
+[[ Namespace(name=http://www.pi4soa.org/ESBBroker/Supplier,role=SupplierTxnP... ]]
+[[ Namespace(name=http://www.pi4soa.org/ESBBroker/Supplier,role=SupplierQuot... ]]
+protocol ESBBrokerProcess {
+ role Broker, Buyer, CreditAgency, Supplier;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]]
+ [[ Correlation(request=makeEnquiry) ]]
+ makeEnquiry(Enquiry) from Buyer to Broker;
+ repeat {
+ run RequestForQuote(Broker);
+ }
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]]
+ [[ Correlation(replyTo=makeEnquiry) ]]
+ makeEnquiry(QuoteList) from Broker to Buyer;
+ choice from Buyer to Broker {
+ [[ Correlation(request=buy) ]]
+ buy(Buy):
+ role SupplierTxnProcessor;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}CreditAgencyBehavior) ]]
+ [[ Correlation(request=checkCredit) ]]
+ checkCredit(CreditInformation) from Broker to CreditAgency;
+ choice from CreditAgency to Broker {
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditValid):
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]]
+ [[ Correlation(request=confirm) ]]
+ confirm(OrderConfirmed) from Broker to SupplierTxnProcessor;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]]
+ [[ Correlation(replyTo=confirm) ]]
+ confirm(BookingReference) from SupplierTxnProcessor to Broker;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]]
+ [[ Correlation(replyTo=buy) ]]
+ buy(BookingReference) from Broker to Buyer;
+
+ [[ Fault(name=invalidCredit) ]]
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditInvalid):
+ [[ Fault(name=rejected) ]]
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]]
+ [[ Correlation(replyTo=buy) ]]
+ buy(OrderRejected) from Broker to Buyer;
+
+ }
+
+ cancel(Cancel):
+
+ }
+ [[ Namespace(name=http://www.pi4soa.org/ESBBroker/Supplier,role=SupplierTxnP... ]]
+ protocol CompleteTransaction(role Buyer, role Broker, role CreditAgency) {
+ role SupplierTxnProcessor;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]]
+ [[ Correlation(request=buy) ]]
+ buy(Buy) from Buyer to Broker;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}CreditAgencyBehavior) ]]
+ [[ Correlation(request=checkCredit) ]]
+ checkCredit(CreditInformation) from Broker to CreditAgency;
+ choice from CreditAgency to Broker {
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditValid):
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]]
+ [[ Correlation(request=confirm) ]]
+ confirm(OrderConfirmed) from Broker to SupplierTxnProcessor;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]]
+ [[ Correlation(replyTo=confirm) ]]
+ confirm(BookingReference) from SupplierTxnProcessor to Broker;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]]
+ [[ Correlation(replyTo=buy) ]]
+ buy(BookingReference) from Broker to Buyer;
+
+ [[ Fault(name=invalidCredit) ]]
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditInvalid):
+ [[ Fault(name=rejected) ]]
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]]
+ [[ Correlation(replyTo=buy) ]]
+ buy(OrderRejected) from Broker to Buyer;
+
+ }
+ }
+ [[ Namespace(name=http://www.pi4soa.org/ESBBroker/Supplier,role=SupplierQuot... ]]
+ protocol RequestForQuote(role Broker) {
+ role SupplierQuoteEngine;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]]
+ [[ Correlation(request=getQuote) ]]
+ getQuote(RequestForQuote) from Broker to SupplierQuoteEngine;
+ [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]]
+ [[ Correlation(replyTo=getQuote) ]]
+ getQuote(Quote) from SupplierQuoteEngine to Broker;
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/PurchaseGoods.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/PurchaseGoods.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/PurchaseGoods.spr 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,35 @@
+import xsd "{http://www.jboss.org/examples/store}BuyConfirmed" as BuyConfirmed, "{http://www.jboss.org/examples/store}BuyFailed" as BuyFailed, "{http://www.jboss.org/examples/store}BuyRequest" as BuyRequest from "http://www.jboss.org/examples/store";
+import xsd "{java:org.jboss.savara.examples.purchasing}CreditCheckInvalid" as CreditCheckInvalid, "{java:org.jboss.savara.examples.purchasing}CreditCheckOk" as CreditCheckOk, "{java:org.jboss.savara.examples.purchasing}CreditCheckRequest" as CreditCheckRequest from "java:org.jboss.savara.examples.purchasing";
+import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDType, "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema";
+[[ Namespace(name=http://www.jboss.org/savara/examples,role=Buyer) ]]
+[[ Namespace(name=java:org.jboss.savara.examples.purchasing,role=CreditAgency) ]]
+[[ Namespace(name=http://www.jboss.org/examples/store,role=Store) ]]
+[[ Type(prefix=tns,namespace=http://www.jboss.org/savara/examples) ]]
+[[ Type(prefix=xsd,namespace=http://www.w3.org/2001/XMLSchema) ]]
+[[ Type(prefix=pur,namespace=java:org.jboss.savara.examples.purchasing) ]]
+[[ Type(prefix=sto,namespace=http://www.jboss.org/examples/store) ]]
+protocol PurchaseGoodsProcess {
+ role Buyer, CreditAgency, Store;
+ [[ Interface(name={http://www.jboss.org/examples/store}StoreInterface) ]]
+ [[ Correlation(request=buy) ]]
+ buy(BuyRequest) from Buyer to Store;
+ [[ Interface(name={java:org.jboss.savara.examples.purchasing}CreditAgencyInterface) ]]
+ [[ Correlation(request=checkCredit) ]]
+ checkCredit(CreditCheckRequest) from Store to CreditAgency;
+ choice from CreditAgency to Store {
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditCheckOk):
+ [[ Interface(name={http://www.jboss.org/examples/store}StoreInterface) ]]
+ [[ Correlation(replyTo=buy) ]]
+ buy(BuyConfirmed) from Store to Buyer;
+
+ [[ Fault(name=CreditCheckFailed) ]]
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditCheckInvalid):
+ [[ Fault(name=BuyFailed) ]]
+ [[ Interface(name={http://www.jboss.org/examples/store}StoreInterface) ]]
+ [[ Correlation(replyTo=buy) ]]
+ buy(BuyFailed) from Store to Buyer;
+
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/ReqRespFault.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/ReqRespFault.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/ReqRespFault.spr 2011-02-05 16:52:54 UTC (rev 639)
@@ -0,0 +1,22 @@
+import xsd "CreditCheckRequest" as CreditInformation, "CreditCheckInvalid" as CreditInvalid, "CreditCheckOk" as CreditValid;
+[[ Namespace(name=http://www.pi4soa.org/ReqRespFault/Buyer,role=Buyer) ]]
+[[ Namespace(name=http://www.pi4soa.org/ReqRespFault/Seller,role=Seller) ]]
+[[ Type(prefix=tns,namespace=http://www.pi4soa.org/ReqRespFault) ]]
+[[ Type(prefix=xsd,namespace=http://www.w3.org/2001/XMLSchema) ]]
+[[ Type(prefix=byr,namespace=http://www.pi4soa.org/ReqRespFault/Buyer) ]]
+[[ Type(prefix=slr,namespace=http://www.pi4soa.org/ReqRespFault/Seller) ]]
+protocol ReqRespFaultProcess {
+ role Buyer, Seller;
+ [[ Interface(name={http://www.pi4soa.org/ReqRespFault}SellerBehavior) ]]
+ [[ Correlation(request=checkCredit) ]]
+ checkCredit(CreditInformation) from Buyer to Seller;
+ choice from Seller to Buyer {
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditValid):
+
+ [[ Fault(name=insufficientCredit) ]]
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditInvalid):
+
+ }
+}
15 years, 2 months
- 1
- 0
savara SVN: r638 - branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-05 11:50:12 -0500 (Sat, 05 Feb 2011)
New Revision: 638
Removed:
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/
Log:
Redundant folders.
15 years, 2 months
- 1
- 0
savara SVN: r637 - in branches/experimental/2.0.x/bundles: org.savara.monitor/src/main/java/org/savara/monitor/impl and 6 other directories.
by do-not-reply＠jboss.org
Author: jeff.yuchang
Date: 2011-02-04 22:18:19 -0500 (Fri, 04 Feb 2011)
New Revision: 637
Added:
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/DummySession.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/DummySession.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/META-INF/persistence.xml
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStoreTest.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/META-INF/persistence.xml
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java
Log:
*SAVARA-166, update the SessionStore API, remove the checked exception etc.
* renaming the savara-session to savara-monitor-session.
* added capability of getting transaction manager from JNDI name that was specified in configuration.
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -17,6 +17,8 @@
*/
package org.savara.monitor;
+import java.io.Serializable;
+
import org.savara.common.config.Configuration;
import org.savara.protocol.ProtocolId;
@@ -35,7 +37,7 @@
* @param config The configuration
* @throws IOException Failed to initialize session store
*/
- public void initialize(Configuration config) throws java.io.IOException;
+ public void initialize(Configuration config);
/**
* This method returns a new session associated with
@@ -43,12 +45,10 @@
*
* @param pid The protocol id
* @param cid The conversation instance id
+ * @param session, The session object
* @return The session
- * @throws IllegalArgumentException Protocol or conversation instance id is invalid
- * @throws IOException Failed to create new session
*/
- public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, java.io.IOException;
+ public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid, Serializable session);
/**
* This method returns an existing session associated with
@@ -57,11 +57,8 @@
* @param pid The protocol id
* @param cid The conversation instance id
* @return The session
- * @throws IllegalArgumentException Protocol or conversation instance id is invalid
- * @throws IOException Failed to retrieve session
*/
- public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, java.io.IOException;
+ public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid);
/**
* This method removes an existing session associated
@@ -69,11 +66,8 @@
*
* @param pid The protocol id
* @param cid The conversation instance id
- * @throws IllegalArgumentException Conversation instance id is invalid or unknown
- * @throws java.io.IOException Failed to remove existing session
*/
- public void remove(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, java.io.IOException;
+ public void remove(ProtocolId pid, ConversationInstanceId cid);
/**
* This method updates an existing session associated
@@ -82,18 +76,13 @@
* @param pid The protocol id
* @param cid The conversation instance id
* @param session The session
- * @throws IllegalArgumentException Conversation instance id is invalid or unknown
- * @throws java.io.IOException Failed to update existing session
*/
public void update(ProtocolId pid, ConversationInstanceId cid,
- java.io.Serializable session) throws IllegalArgumentException,
- java.io.IOException;
+ java.io.Serializable session);
/**
* This method closes the session store.
- *
- * @throws java.io.IOException Failed to close the session store
*/
- public void close() throws java.io.IOException;
+ public void close();
}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -32,6 +32,7 @@
import org.scribble.protocol.export.monitor.MonitorProtocolExporter;
import org.scribble.protocol.model.ProtocolModel;
import org.scribble.protocol.monitor.DefaultProtocolMonitor;
+import org.scribble.protocol.monitor.DefaultSession;
import org.scribble.protocol.monitor.MonitorContext;
import org.scribble.protocol.monitor.ProtocolMonitor;
import org.scribble.protocol.monitor.Result;
@@ -170,7 +171,8 @@
boolean f_created=false;
if (session == null) {
- session = m_sessionStore.create(pid, cid);
+ session = new DefaultSession();
+ m_sessionStore.create(pid, cid, session);
// Try to create new session
if (session instanceof Session) {
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -17,11 +17,12 @@
*/
package org.savara.monitor.impl;
+import java.io.Serializable;
+
import org.savara.common.config.Configuration;
import org.savara.monitor.ConversationInstanceId;
import org.savara.monitor.SessionStore;
import org.savara.protocol.ProtocolId;
-import org.scribble.protocol.monitor.DefaultSession;
public class InMemorySessionStore implements SessionStore {
@@ -35,7 +36,7 @@
* @param config The configuration
* @throws IOException Failed to initialize session store
*/
- public void initialize(Configuration config) throws java.io.IOException {
+ public void initialize(Configuration config){
}
/**
@@ -70,19 +71,16 @@
* @throws IllegalArgumentException Protocol or conversation id is invalid
* @throws IOException Failed to create new session
*/
- public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, java.io.IOException {
+ public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid, Serializable session) {
if (pid == null) {
throw new IllegalArgumentException("Protocol id not specified");
} else if (cid == null) {
throw new IllegalArgumentException("Conversation instance id not specified");
}
- java.io.Serializable ret=new DefaultSession();
+ addSession(pid, cid, session);
- addSession(pid, cid, ret);
-
- return(ret);
+ return(session);
}
/**
@@ -95,8 +93,7 @@
* @throws IllegalArgumentException Protocol or conversation id is invalid
* @throws IOException Failed to retrieve session
*/
- public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, java.io.IOException {
+ public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid) {
java.io.Serializable ret=null;
if (pid == null) {
@@ -124,8 +121,7 @@
* @throws IllegalArgumentException Conversation instance id is invalid or unknown
* @throws java.io.IOException Failed to remove existing session
*/
- public void remove(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, java.io.IOException {
+ public void remove(ProtocolId pid, ConversationInstanceId cid) {
if (pid == null) {
throw new IllegalArgumentException("Protocol id not specified");
} else if (cid == null) {
@@ -154,12 +150,8 @@
* @param pid The protocol id
* @param cid The conversation instance id
* @param session The session
- * @throws IllegalArgumentException Conversation instance id is invalid or unknown
- * @throws java.io.IOException Failed to update existing session
*/
- public void update(ProtocolId pid, ConversationInstanceId cid,
- java.io.Serializable session) throws IllegalArgumentException,
- java.io.IOException {
+ public void update(ProtocolId pid, ConversationInstanceId cid, java.io.Serializable session) {
if (pid == null) {
throw new IllegalArgumentException("Protocol id not specified");
} else if (cid == null) {
@@ -181,7 +173,7 @@
*
* @throws java.io.IOException Failed to close the session store
*/
- public void close() throws java.io.IOException {
+ public void close(){
}
}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -130,7 +130,7 @@
DefaultSession s1=new DefaultSession();
try {
- store.create(pid, cid);
+ store.create(pid, cid, s1);
store.update(pid, cid, s1);
} catch(Exception e) {
fail("Failed: "+e);
@@ -194,8 +194,7 @@
return(s1);
}
- public void remove(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, IOException {
+ public void remove(ProtocolId pid, ConversationInstanceId cid) {
f_removed = true;
}
};
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -22,6 +22,7 @@
import org.junit.Test;
import org.savara.monitor.ConversationInstanceId;
import org.savara.protocol.ProtocolId;
+import org.scribble.protocol.monitor.DefaultSession;
public class InMemorySessionStoreTest {
@@ -30,7 +31,7 @@
InMemorySessionStore store=new InMemorySessionStore();
try {
- store.create(new ProtocolId("name","role"), null);
+ store.create(new ProtocolId("name","role"), null, null);
fail("Should have thrown IllegalArgumentException");
} catch(IllegalArgumentException iae) {
@@ -45,7 +46,7 @@
InMemorySessionStore store=new InMemorySessionStore();
try {
- store.create(null, new ConversationInstanceId("id"));
+ store.create(null, new ConversationInstanceId("id"), null);
fail("Should have thrown IllegalArgumentException");
} catch(IllegalArgumentException iae) {
@@ -58,18 +59,18 @@
@Test
public void testCreateSessionDuplicateInvalidId() {
InMemorySessionStore store=new InMemorySessionStore();
-
+ DefaultSession session = new DefaultSession();
try {
ProtocolId pid=new ProtocolId("p","r");
ConversationInstanceId id=new ConversationInstanceId("1");
try {
- store.create(pid, id);
+ store.create(pid, id, session);
} catch(Exception inner) {
fail("Should not have failed");
}
- store.create(pid, id);
+ store.create(pid, id, session);
fail("Should have thrown IllegalArgumentException");
} catch(IllegalArgumentException iae) {
@@ -82,12 +83,12 @@
@Test
public void testCreateSession() {
InMemorySessionStore store=new InMemorySessionStore();
-
+ DefaultSession s = new DefaultSession();
try {
ProtocolId pid=new ProtocolId("p","r");
ConversationInstanceId id=new ConversationInstanceId("1");
- if (store.create(pid, id) == null) {
+ if (store.create(pid, id, s) == null) {
fail("No context created");
}
@@ -99,12 +100,12 @@
@Test
public void testRemoveSession() {
InMemorySessionStore store=new InMemorySessionStore();
-
+ DefaultSession s = new DefaultSession();
try {
ProtocolId pid=new ProtocolId("p","r");
ConversationInstanceId id=new ConversationInstanceId("1");
- if (store.create(pid, id) == null) {
+ if (store.create(pid, id, s) == null) {
fail("No context created");
}
@@ -127,6 +128,7 @@
@Test
public void testFindSession() {
InMemorySessionStore store=new InMemorySessionStore();
+ DefaultSession s = new DefaultSession();
try {
ProtocolId pid=new ProtocolId("p","r");
@@ -134,7 +136,7 @@
java.io.Serializable c1=null;
- if ((c1=store.create(pid, id1)) == null) {
+ if ((c1=store.create(pid, id1, s)) == null) {
fail("No context created for id 1");
}
@@ -142,7 +144,7 @@
java.io.Serializable c2=null;
- if ((c2=store.create(pid, id2)) == null) {
+ if ((c2=store.create(pid, id2, s)) == null) {
fail("No context created for id 2");
}
@@ -163,6 +165,7 @@
@Test
public void testUpdateSession() {
InMemorySessionStore store=new InMemorySessionStore();
+ DefaultSession s = new DefaultSession();
try {
ProtocolId pid=new ProtocolId("p","r");
@@ -170,7 +173,7 @@
java.io.Serializable c1=null;
- if ((c1=store.create(pid, id1)) == null) {
+ if ((c1=store.create(pid, id1, s)) == null) {
fail("No session created for id 1");
}
@@ -178,7 +181,7 @@
java.io.Serializable c2=null;
- if ((c2=store.create(pid, id2)) == null) {
+ if ((c2=store.create(pid, id2, s)) == null) {
fail("No session created for id 2");
}
Deleted: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/DummySession.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/DummySession.java 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/DummySession.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -1,21 +0,0 @@
-package org.savara.monitor.sstore.rdbms;
-
-import java.io.Serializable;
-
-public class DummySession implements Serializable{
-
- private static final long serialVersionUID = -6624913741004684358L;
-
- private String description;
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
-
-
-}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -24,6 +24,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -43,8 +45,11 @@
*/
public class RDBMSSessionStore implements SessionStore {
+ public static final String TRANSACTION_MANAGER_JNDI_NAME = "transaction.manager.jndi.name";
+
private static final Logger logger = Logger.getLogger(RDBMSSessionStore.class.toString());
+
private static EntityManagerFactory emf;
private EntityManager entityManager;
@@ -57,47 +62,65 @@
this.txManager = txManager;
}
+ public RDBMSSessionStore() {
+
+ }
+
/*
* (non-Javadoc)
* @see org.savara.monitor.SessionStore#initialize(org.savara.common.config.Configuration)
*/
- public void initialize(Configuration config) throws java.io.IOException {
+ public void initialize(Configuration config){
if (emf == null) {
Map<String, String> props = new HashMap<String, String>();
//TODO: convert some of configuration properties into props map.
- emf = Persistence.createEntityManagerFactory("savara-session", props);
+ emf = Persistence.createEntityManagerFactory("savara-monitor-session", props);
}
if (entityManager == null || !entityManager.isOpen()) {
entityManager = emf.createEntityManager();
}
+ if (config != null) {
+ String txManagerJndiName = config.getProperty(TRANSACTION_MANAGER_JNDI_NAME);
+ if (txManagerJndiName != null) {
+ getTransactionManagerFromJNDI(txManagerJndiName);
+ }
+ }
if (txManager != null) {
tx = new JPAJTAContext(txManager, entityManager);
} else {
tx = new JPANonTxContext(entityManager);
}
}
+
+ private void getTransactionManagerFromJNDI(String txManagerJndiName) {
+ try {
+ txManager = (TransactionManager) InitialContext.doLookup(txManagerJndiName);
+ } catch (NamingException e) {
+ logger.log(Level.SEVERE, "Error in getting Transaction Manager from JNDI: " + txManagerJndiName);
+ throw new RuntimeException(e);
+ }
+ }
/*
* (non-Javadoc)
* @see org.savara.monitor.SessionStore#create(org.savara.protocol.ProtocolId, org.savara.monitor.ConversationInstanceId)
*/
- public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, java.io.IOException {
+ public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid, Serializable session) {
RDBMSSession psession = new RDBMSSession();
psession.setProtocolName(pid.getName());
psession.setProtocolRole(pid.getRole());
psession.setConversationInstanceId(cid.getId());
- psession.setSession(new DummySession());
+ psession.setSession(session);
- try {
- Serializable s = this.find(pid, cid);
- if (s != null) {
- throw new IllegalArgumentException("The session with [" + pid + cid +"] already existed.");
- }
-
+ Serializable s = this.find(pid, cid);
+ if (s != null) {
+ throw new IllegalArgumentException("The session with [" + pid + cid +"] already existed.");
+ }
+
+ try {
tx.begin();
entityManager.persist(psession);
tx.commit();
@@ -114,8 +137,7 @@
* (non-Javadoc)
* @see org.savara.monitor.SessionStore#find(org.savara.protocol.ProtocolId, org.savara.monitor.ConversationInstanceId)
*/
- public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, java.io.IOException {
+ public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid) {
try {
tx.begin();
List<?> sessions = entityManager.createNamedQuery(RDBMSSession.GET_SESSION_BY_KEY)
@@ -143,8 +165,7 @@
* (non-Javadoc)
* @see org.savara.monitor.SessionStore#remove(org.savara.protocol.ProtocolId, org.savara.monitor.ConversationInstanceId)
*/
- public void remove(ProtocolId pid, ConversationInstanceId cid)
- throws IllegalArgumentException, java.io.IOException {
+ public void remove(ProtocolId pid, ConversationInstanceId cid) {
try {
tx.begin();
entityManager.createNamedQuery(RDBMSSession.REMOVE_SESSION_BY_KEY)
@@ -165,8 +186,7 @@
* @see org.savara.monitor.SessionStore#update(org.savara.protocol.ProtocolId, org.savara.monitor.ConversationInstanceId, java.io.Serializable)
*/
public void update(ProtocolId pid, ConversationInstanceId cid,
- java.io.Serializable session) throws IllegalArgumentException,
- java.io.IOException {
+ java.io.Serializable session) {
try {
tx.begin();
RDBMSSession s = (RDBMSSession) entityManager.createNamedQuery(RDBMSSession.GET_SESSION_BY_KEY)
@@ -188,7 +208,7 @@
* (non-Javadoc)
* @see org.savara.monitor.SessionStore#close()
*/
- public void close() throws java.io.IOException {
+ public void close() {
if (entityManager != null && entityManager.isOpen()) {
entityManager.close();
}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -45,7 +45,7 @@
// Register the SessionStore implementation
Properties props = new Properties();
- SessionStore ss=new RDBMSSessionStore(null);
+ SessionStore ss=new RDBMSSessionStore();
m_serviceRegistration = context.registerService(SessionStore.class.getName(),
ss, props);
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/META-INF/persistence.xml 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/META-INF/persistence.xml 2011-02-05 03:18:19 UTC (rev 637)
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
- <persistence-unit name="savara-session" transaction-type="JTA">
+ <persistence-unit name="savara-monitor-session" transaction-type="JTA">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<class>org.savara.monitor.sstore.rdbms.RDBMSSession</class>
</persistence-unit>
Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/DummySession.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/DummySession.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/DummySession.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -0,0 +1,21 @@
+package org.savara.monitor.sstore.rdbms;
+
+import java.io.Serializable;
+
+public class DummySession implements Serializable{
+
+ private static final long serialVersionUID = -6624913741004684358L;
+
+ private String description;
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStoreTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStoreTest.java 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStoreTest.java 2011-02-05 03:18:19 UTC (rev 637)
@@ -29,27 +29,31 @@
import org.savara.protocol.ProtocolId;
/**
+ *
+ *
* @author Jeff Yu
*
*/
public class RDBMSSessionStoreTest extends Assert{
private static RDBMSSessionStore store;
-
+
private static ProtocolId pid;
- private static ConversationInstanceId cid;
+ private static DummySession session;
@BeforeClass
public static void setUp() throws Exception{
Class.forName("org.h2.Driver");
DriverManager.getConnection("jdbc:h2:target/db/h2", "sa", "");
+
+ store = new RDBMSSessionStore();
+ store.initialize(null);
- pid = new ProtocolId("Jeff", "Developer");
- cid = new ConversationInstanceId();
+ pid = new ProtocolId("name", "role");
- store = new RDBMSSessionStore(null);
- store.initialize(null);
+ session = new DummySession();
+ session.setDescription("DummySession");
}
@@ -59,17 +63,50 @@
}
@Test
- public void testCreateNewSession() throws Exception {
- Serializable o = store.create(pid, cid);
+ public void testCreateNewSession() throws Exception {
+ ConversationInstanceId cid = new ConversationInstanceId("1");
+ Serializable o = store.create(pid, cid, session);
+ assertEquals("DummySession", ((DummySession)o).getDescription());
}
@Test
+ public void testCreateDuplicatedSession() throws Exception {
+ ConversationInstanceId cid = new ConversationInstanceId("11");
+ store.create(pid, cid, session);
+ DummySession session2 = new DummySession();
+
+ try {
+ store.create(pid, cid, session2);
+ fail ("here should not be executed");
+ } catch (IllegalArgumentException e) {
+ // expected exception
+ }
+ }
+
+ @Test
public void testFindSession() throws Exception {
+ ConversationInstanceId cid = new ConversationInstanceId("2");
+ store.create(pid, cid, session);
Serializable o = store.find(pid, cid);
+ assertEquals("DummySession", ((DummySession)o).getDescription() );
}
@Test
+ public void testUpdateSession() throws Exception {
+ ConversationInstanceId cid = new ConversationInstanceId("3");
+ DummySession ds = new DummySession();
+ ds.setDescription("first one");
+ store.create(pid, cid, ds);
+ ds.setDescription("Updated Session");
+ store.update(pid, cid, ds);
+ Serializable o = store.find(pid, cid);
+ assertEquals("Updated Session", ((DummySession)o).getDescription() );
+ }
+
+ @Test
public void testDeleteSession() throws Exception {
+ ConversationInstanceId cid = new ConversationInstanceId("4");
+ store.create(pid, cid, session);
store.remove(pid, cid);
Serializable o = store.find(pid, cid);
assertNull(o);
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/META-INF/persistence.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/META-INF/persistence.xml 2011-02-04 11:35:10 UTC (rev 636)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/META-INF/persistence.xml 2011-02-05 03:18:19 UTC (rev 637)
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
- <persistence-unit name="savara-session" transaction-type="RESOURCE_LOCAL">
+ <persistence-unit name="savara-monitor-session" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<class>org.savara.monitor.sstore.rdbms.RDBMSSession</class>
<properties>
15 years, 2 months
- 1
- 0
savara SVN: r636 - in branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms: src and 14 other directories.
by do-not-reply＠jboss.org
Author: jeff.yuchang
Date: 2011-02-04 06:35:10 -0500 (Fri, 04 Feb 2011)
New Revision: 636
Added:
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/DummySession.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/JPAJTAContext.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/JPANonTxContext.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSession.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/TxContext.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/META-INF/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/META-INF/persistence.xml
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStoreTest.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/META-INF/
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/META-INF/persistence.xml
Modified:
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java
Log:
*SAVARA-166, first working prototype, will update the API according to the discussed result in forum in my next commit.
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml 2011-02-03 18:53:07 UTC (rev 635)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml 2011-02-04 11:35:10 UTC (rev 636)
@@ -12,6 +12,14 @@
<artifactId>bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
+
+ <properties>
+ <hibernate.version>3.3.2.GA</hibernate.version>
+ <hibernate.entitymanager.version>3.4.0.GA</hibernate.entitymanager.version>
+ <javassist.version>3.9.0.GA</javassist.version>
+ <h2.version>1.2.131</h2.version>
+ <slf4j.version>1.4.3</slf4j.version>
+ </properties>
<dependencies>
<dependency>
@@ -25,6 +33,18 @@
<version>${savara.version}</version>
</dependency>
<dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
@@ -35,5 +55,53 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>jta</groupId>
+ <artifactId>javax.transaction</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.entitymanager.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>jta</groupId>
+ <artifactId>javax.transaction</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.4.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/DummySession.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/DummySession.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/DummySession.java 2011-02-04 11:35:10 UTC (rev 636)
@@ -0,0 +1,21 @@
+package org.savara.monitor.sstore.rdbms;
+
+import java.io.Serializable;
+
+public class DummySession implements Serializable{
+
+ private static final long serialVersionUID = -6624913741004684358L;
+
+ private String description;
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/JPAJTAContext.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/JPAJTAContext.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/JPAJTAContext.java 2011-02-04 11:35:10 UTC (rev 636)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.monitor.sstore.rdbms;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.persistence.EntityManager;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+
+/**
+ *
+ *
+ * @author Jeff Yu
+ *
+ */
+public class JPAJTAContext implements TxContext {
+
+ private static Logger logger = Logger.getLogger(JPAJTAContext.class.getName());
+
+ private TransactionManager txManager;
+
+ private EntityManager em;
+
+ public JPAJTAContext(TransactionManager txManager, EntityManager em) {
+ this.txManager = txManager;
+ this.em = em;
+ }
+
+ public void begin() {
+ try {
+ if (txManager.getStatus() == Status.STATUS_ACTIVE) {
+ em.joinTransaction();
+ }
+ }catch (SystemException e) {
+ logger.log(Level.SEVERE, "error in joining in transaction");
+ throw new RuntimeException(e);
+ }
+
+ }
+
+ public void commit() {
+
+ }
+
+ public void rollback() {
+ try {
+ if (txManager.getStatus() == Status.STATUS_ACTIVE) {
+ txManager.setRollbackOnly();
+ }
+ }catch (SystemException e) {
+ logger.log(Level.SEVERE, "unable to set roll back.");
+ throw new RuntimeException(e);
+ }
+
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/JPANonTxContext.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/JPANonTxContext.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/JPANonTxContext.java 2011-02-04 11:35:10 UTC (rev 636)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.monitor.sstore.rdbms;
+
+import javax.persistence.EntityManager;
+
+/**
+ *
+ * @author Jeff Yu
+ *
+ */
+public class JPANonTxContext implements TxContext {
+
+ private EntityManager em;
+
+ public JPANonTxContext(EntityManager em) {
+ this.em = em;
+ }
+
+ /* (non-Javadoc)
+ * @see org.savara.monitor.sstore.rdbms.TxContext#begin()
+ */
+ public void begin() {
+ em.getTransaction().begin();
+ }
+
+ /* (non-Javadoc)
+ * @see org.savara.monitor.sstore.rdbms.TxContext#commit()
+ */
+ public void commit() {
+ em.getTransaction().commit();
+ }
+
+ /* (non-Javadoc)
+ * @see org.savara.monitor.sstore.rdbms.TxContext#rollback()
+ */
+ public void rollback() {
+ em.getTransaction().rollback();
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSession.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSession.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSession.java 2011-02-04 11:35:10 UTC (rev 636)
@@ -0,0 +1,185 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.monitor.sstore.rdbms;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ *
+ *
+ * @author Jeff Yu
+ *
+ */
+@Entity
+@Table(name="SAVARA_SESSION")
+@NamedQueries({
+ @NamedQuery(name=RDBMSSession.GET_SESSION_BY_KEY, query="select s from RDBMSSession as s where s.protocolName = :name and s.protocolRole = :role and s.conversationInstanceId = :id"),
+ @NamedQuery(name=RDBMSSession.REMOVE_SESSION_BY_KEY, query="delete from RDBMSSession as s where s.protocolName = :name and s.protocolRole = :role and s.conversationInstanceId = :id")
+})
+public class RDBMSSession implements Serializable{
+
+ public static final String GET_SESSION_BY_KEY = "GET_SESSION_BY_KEY";
+
+ public static final String REMOVE_SESSION_BY_KEY = "REMOVE_SESSION_BY_KEY";
+
+ private static final long serialVersionUID = 5514308301188696320L;
+
+ private static final Logger logger = Logger.getLogger(RDBMSSession.class.toString()) ;
+
+ private long id;
+
+ private String protocolName;
+
+ private String protocolRole;
+
+ private String conversationInstanceId;
+
+ private Serializable session;
+
+
+ @Id
+ @Column(name="ID")
+ @GeneratedValue(strategy= GenerationType.AUTO)
+ public long getId() {
+ return id;
+ }
+
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+
+ @Column(name="PROTOCOL_NAME")
+ public String getProtocolName() {
+ return protocolName;
+ }
+
+
+ public void setProtocolName(String protocolName) {
+ this.protocolName = protocolName;
+ }
+
+ @Column(name="PROTOCOL_ROLE")
+ public String getProtocolRole() {
+ return protocolRole;
+ }
+
+
+ public void setProtocolRole(String protocolRole) {
+ this.protocolRole = protocolRole;
+ }
+
+ @Column(name="CONVERSATION_INSTANCE_ID")
+ public String getConversationInstanceId() {
+ return conversationInstanceId;
+ }
+
+
+ public void setConversationInstanceId(String conversationInstanceId) {
+ this.conversationInstanceId = conversationInstanceId;
+ }
+
+ @Transient
+ public Serializable getSession() {
+ return session;
+ }
+
+
+ public void setSession(Serializable session) {
+ this.session = session;
+ }
+
+ @Lob
+ @Column(name = "SESSION_IN_BYTE")
+ public byte[] getByteSession() {
+ if (this.session != null) {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream os = null;
+ try {
+ os = new ObjectOutputStream(bos);
+ os.writeObject(this.session);
+ return bos.toByteArray();
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "Error in getting session in byte.");
+ } finally {
+ try {
+ if (os != null) {
+ os.close();
+ }
+ } catch (IOException e) {
+ logger.log(Level.SEVERE, "Error in closing ObjectOutputStream.");
+ }
+ }
+ }
+ return null;
+ }
+
+
+ public void setByteSession(byte[] byteSession) {
+ if (byteSession != null && byteSession.length > 0) {
+ ByteArrayInputStream bis = new ByteArrayInputStream(byteSession);
+ ObjectInputStream is = null;
+ try {
+ is = new ObjectInputStream(bis);
+ this.session = (Serializable)is.readObject();
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "error in set session in byte");
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ logger.log(Level.SEVERE, "Error in closing ObjectInputStream.");
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o instanceof RDBMSSession) {
+ RDBMSSession s = (RDBMSSession) o;
+ if (s.getId() == this.id) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java 2011-02-03 18:53:07 UTC (rev 635)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java 2011-02-04 11:35:10 UTC (rev 636)
@@ -17,6 +17,18 @@
*/
package org.savara.monitor.sstore.rdbms;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.transaction.TransactionManager;
+
import org.savara.common.config.Configuration;
import org.savara.monitor.ConversationInstanceId;
import org.savara.monitor.SessionStore;
@@ -25,83 +37,166 @@
/**
* This class defines the RDBMS implementation of the SessionStore
* interface.
+ *
+ * @author Jeff Yu
*
*/
public class RDBMSSessionStore implements SessionStore {
-
- /**
- * This method sets the configuration for use by the session
- * store.
- *
- * @param config The configuration
- * @throws IOException Failed to initialize session store
+
+ private static final Logger logger = Logger.getLogger(RDBMSSessionStore.class.toString());
+
+ private static EntityManagerFactory emf;
+
+ private EntityManager entityManager;
+
+ private TransactionManager txManager;
+
+ private TxContext tx;
+
+ public RDBMSSessionStore(TransactionManager txManager) {
+ this.txManager = txManager;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.savara.monitor.SessionStore#initialize(org.savara.common.config.Configuration)
*/
public void initialize(Configuration config) throws java.io.IOException {
+ if (emf == null) {
+ Map<String, String> props = new HashMap<String, String>();
+ //TODO: convert some of configuration properties into props map.
+ emf = Persistence.createEntityManagerFactory("savara-session", props);
+ }
+ if (entityManager == null || !entityManager.isOpen()) {
+ entityManager = emf.createEntityManager();
+ }
+
+ if (txManager != null) {
+ tx = new JPAJTAContext(txManager, entityManager);
+ } else {
+ tx = new JPANonTxContext(entityManager);
+ }
}
- /**
- * This method returns a new session associated with
- * the supplied protocol and conversation instance id.
- *
- * @param pid The protocol id
- * @param cid The conversation instance id
- * @return The session
- * @throws IllegalArgumentException Protocol or conversation instance id is invalid
- * @throws IOException Failed to create new session
+ /*
+ * (non-Javadoc)
+ * @see org.savara.monitor.SessionStore#create(org.savara.protocol.ProtocolId, org.savara.monitor.ConversationInstanceId)
*/
public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid)
throws IllegalArgumentException, java.io.IOException {
- return(null);
+
+ RDBMSSession psession = new RDBMSSession();
+
+ psession.setProtocolName(pid.getName());
+ psession.setProtocolRole(pid.getRole());
+ psession.setConversationInstanceId(cid.getId());
+ psession.setSession(new DummySession());
+
+ try {
+ Serializable s = this.find(pid, cid);
+ if (s != null) {
+ throw new IllegalArgumentException("The session with [" + pid + cid +"] already existed.");
+ }
+
+ tx.begin();
+ entityManager.persist(psession);
+ tx.commit();
+ return psession.getSession();
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "error in creating a session");
+ tx.rollback();
+ throw new RuntimeException(e);
+ }
+
}
- /**
- * This method returns an existing session associated with
- * the supplied protocol and conversation instance id.
- *
- * @param pid The protocol id
- * @param cid The conversation instance id
- * @return The session
- * @throws IllegalArgumentException Protocol or conversation instance id is invalid
- * @throws IOException Failed to retrieve session
+ /*
+ * (non-Javadoc)
+ * @see org.savara.monitor.SessionStore#find(org.savara.protocol.ProtocolId, org.savara.monitor.ConversationInstanceId)
*/
public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid)
throws IllegalArgumentException, java.io.IOException {
- return(null);
+ try {
+ tx.begin();
+ List<?> sessions = entityManager.createNamedQuery(RDBMSSession.GET_SESSION_BY_KEY)
+ .setParameter("name", pid.getName())
+ .setParameter("role", pid.getRole())
+ .setParameter("id", cid.getId())
+ .getResultList();
+ tx.commit();
+ if (sessions == null || sessions.size() < 1) {
+ return null;
+ }
+ if (sessions.size() > 1) {
+ throw new IllegalArgumentException("Found two sessions with [" + pid + cid + "]");
+ }
+ RDBMSSession session = (RDBMSSession)sessions.get(0);
+ return session.getSession();
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "error in finding a session");
+ tx.rollback();
+ throw new RuntimeException(e);
+ }
}
- /**
- * This method removes an existing session associated
- * with the supplied protocol and conversation instance id.
- *
- * @param pid The protocol id
- * @param cid The conversation instance id
- * @throws IllegalArgumentException Conversation instance id is invalid or unknown
- * @throws java.io.IOException Failed to remove existing session
+ /*
+ * (non-Javadoc)
+ * @see org.savara.monitor.SessionStore#remove(org.savara.protocol.ProtocolId, org.savara.monitor.ConversationInstanceId)
*/
public void remove(ProtocolId pid, ConversationInstanceId cid)
throws IllegalArgumentException, java.io.IOException {
+ try {
+ tx.begin();
+ entityManager.createNamedQuery(RDBMSSession.REMOVE_SESSION_BY_KEY)
+ .setParameter("name", pid.getName())
+ .setParameter("role", pid.getRole())
+ .setParameter("id", cid.getId())
+ .executeUpdate();
+ tx.commit();
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "error in removing a session");
+ tx.rollback();
+ throw new RuntimeException(e);
+ }
}
- /**
- * This method updates an existing session associated
- * with the supplied protocol and conversation instance id.
- *
- * @param pid The protocol id
- * @param cid The conversation instance id
- * @param session The session
- * @throws IllegalArgumentException Conversation instance id is invalid or unknown
- * @throws java.io.IOException Failed to update existing session
+ /*
+ * (non-Javadoc)
+ * @see org.savara.monitor.SessionStore#update(org.savara.protocol.ProtocolId, org.savara.monitor.ConversationInstanceId, java.io.Serializable)
*/
public void update(ProtocolId pid, ConversationInstanceId cid,
java.io.Serializable session) throws IllegalArgumentException,
java.io.IOException {
+ try {
+ tx.begin();
+ RDBMSSession s = (RDBMSSession) entityManager.createNamedQuery(RDBMSSession.GET_SESSION_BY_KEY)
+ .setParameter("name", pid.getName())
+ .setParameter("role", pid.getRole())
+ .setParameter("id", cid.getId())
+ .getSingleResult();
+ s.setSession(session);
+ entityManager.persist(s);
+ tx.commit();
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "error in updating a session");
+ tx.rollback();
+ throw new RuntimeException(e);
+ }
}
- /**
- * This method closes the session store.
- *
- * @throws java.io.IOException Failed to close the session store
+ /*
+ * (non-Javadoc)
+ * @see org.savara.monitor.SessionStore#close()
*/
public void close() throws java.io.IOException {
+ if (entityManager != null && entityManager.isOpen()) {
+ entityManager.close();
+ }
+ if (emf != null) {
+ emf.close();
+ emf = null;
+ }
}
+
+
}
Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/TxContext.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/TxContext.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/TxContext.java 2011-02-04 11:35:10 UTC (rev 636)
@@ -0,0 +1,20 @@
+/**
+ *
+ */
+package org.savara.monitor.sstore.rdbms;
+
+/**
+ * Transaction context
+ *
+ * @author Jeff Yu
+ *
+ */
+public interface TxContext {
+
+ public void begin();
+
+ public void commit();
+
+ public void rollback();
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java 2011-02-03 18:53:07 UTC (rev 635)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java 2011-02-04 11:35:10 UTC (rev 636)
@@ -45,7 +45,7 @@
// Register the SessionStore implementation
Properties props = new Properties();
- SessionStore ss=new RDBMSSessionStore();
+ SessionStore ss=new RDBMSSessionStore(null);
m_serviceRegistration = context.registerService(SessionStore.class.getName(),
ss, props);
Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/META-INF/persistence.xml (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/resources/META-INF/persistence.xml 2011-02-04 11:35:10 UTC (rev 636)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+ <persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+ <persistence-unit name="savara-session" transaction-type="JTA">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <class>org.savara.monitor.sstore.rdbms.RDBMSSession</class>
+ </persistence-unit>
+
+</persistence>
\ No newline at end of file
Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStoreTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStoreTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStoreTest.java 2011-02-04 11:35:10 UTC (rev 636)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.monitor.sstore.rdbms;
+
+import java.io.Serializable;
+import java.sql.DriverManager;
+
+import junit.framework.Assert;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.savara.monitor.ConversationInstanceId;
+import org.savara.protocol.ProtocolId;
+
+/**
+ * @author Jeff Yu
+ *
+ */
+public class RDBMSSessionStoreTest extends Assert{
+
+ private static RDBMSSessionStore store;
+
+ private static ProtocolId pid;
+
+ private static ConversationInstanceId cid;
+
+ @BeforeClass
+ public static void setUp() throws Exception{
+ Class.forName("org.h2.Driver");
+ DriverManager.getConnection("jdbc:h2:target/db/h2", "sa", "");
+
+ pid = new ProtocolId("Jeff", "Developer");
+ cid = new ConversationInstanceId();
+
+ store = new RDBMSSessionStore(null);
+ store.initialize(null);
+ }
+
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ store.close();
+ }
+
+ @Test
+ public void testCreateNewSession() throws Exception {
+ Serializable o = store.create(pid, cid);
+ }
+
+ @Test
+ public void testFindSession() throws Exception {
+ Serializable o = store.find(pid, cid);
+ }
+
+ @Test
+ public void testDeleteSession() throws Exception {
+ store.remove(pid, cid);
+ Serializable o = store.find(pid, cid);
+ assertNull(o);
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/META-INF/persistence.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/META-INF/persistence.xml (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/test/resources/META-INF/persistence.xml 2011-02-04 11:35:10 UTC (rev 636)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+ <persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+ <persistence-unit name="savara-session" transaction-type="RESOURCE_LOCAL">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <class>org.savara.monitor.sstore.rdbms.RDBMSSession</class>
+ <properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+ <property name="hibernate.hbm2ddl.auto" value="create"/>
+ <property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
+ <property name="hibernate.connection.url" value="jdbc:h2:target/db/h2"/>
+ <property name="hibernate.connection.username" value="sa"/>
+ <property name="hibernate.connection.password" value=""/>
+ <property name="hibernate.show_sql" value="false"/>
+ </properties>
+ </persistence-unit>
+
+</persistence>
\ No newline at end of file
15 years, 2 months
- 1
- 0
savara SVN: r635 - in branches/experimental/2.0.x/bundles: org.savara.scenario/src/main/java/org/savara/scenario/simulation and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-03 13:53:07 -0500 (Thu, 03 Feb 2011)
New Revision: 635
Modified:
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java
branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java
Log:
Provide access to values in the message.
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java 2011-01-31 22:16:46 UTC (rev 634)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java 2011-02-03 18:53:07 UTC (rev 635)
@@ -31,8 +31,20 @@
private String m_sourceEndpointAddress=null;
private String m_sourceEndpointType=null;
private ProtocolCriteria.Direction m_direction=Direction.Outbound;
+ private java.util.List<String> m_values=new java.util.Vector<String>();
/**
+ * This method returns the list of values associated with the message.
+ *
+ * NOTE: The number of values must match the number of types.
+ *
+ * @return The list of values
+ */
+ public java.util.List<String> getValues() {
+ return(m_values);
+ }
+
+ /**
* This method provides the destination endpoint address of the component that
* is the subject of the interaction.
*
Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java 2011-01-31 22:16:46 UTC (rev 634)
+++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java 2011-02-03 18:53:07 UTC (rev 635)
@@ -85,7 +85,9 @@
protected Message getMessageForEvent(MessageEvent event) {
Message mesg=new Message();
mesg.setOperator(event.getOperationName());
-
+ mesg.getTypes().add(event.getType());
+ mesg.getValues().add(event.getValue());
+
return(mesg);
}
15 years, 2 months
- 1
- 0
Hudson build is back to Hudson build is back to normal : jbosstools-savara-1.2_trunk #244
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/244/cha...>
15 years, 2 months
- 1
- 0
Build failed in Hudson: jbosstools-savara-1.1_trunk #183
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/183/>
------------------------------------------
Started by an SCM change
Building remotely on soa4-rhel5-x86_64
Updating http://anonsvn.jboss.org/repos/savara/branches/1.1.x
ERROR: Failed to update http://anonsvn.jboss.org/repos/savara/branches/1.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot write entries file '<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...'>: No space left on device
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:624)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:275)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:263)
at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.doReport(DAVConnection.java:266)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.runReport(DAVRepository.java:1263)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.update(DAVRepository.java:820)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:564)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:635)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:596)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Updating http://anonsvn.jboss.org/repos/savara/branches/1.1.x
ERROR: Failed to update http://anonsvn.jboss.org/repos/savara/branches/1.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot write entries file '<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...'>: No space left on device
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:624)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:275)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:263)
at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.doReport(DAVConnection.java:266)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.runReport(DAVRepository.java:1263)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.update(DAVRepository.java:820)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:564)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:635)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:596)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Updating http://anonsvn.jboss.org/repos/savara/branches/1.1.x
ERROR: Failed to update http://anonsvn.jboss.org/repos/savara/branches/1.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot write entries file '<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...'>: No space left on device
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:624)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:275)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:263)
at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.doReport(DAVConnection.java:266)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.runReport(DAVRepository.java:1263)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.update(DAVRepository.java:820)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:564)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:635)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:596)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Updating http://anonsvn.jboss.org/repos/savara/branches/1.1.x
ERROR: Failed to update http://anonsvn.jboss.org/repos/savara/branches/1.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot write entries file '<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...'>: No space left on device
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:624)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:275)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:263)
at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.doReport(DAVConnection.java:266)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.runReport(DAVRepository.java:1263)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.update(DAVRepository.java:820)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:564)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:635)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:596)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Updating http://anonsvn.jboss.org/repos/savara/branches/1.1.x
ERROR: Failed to update http://anonsvn.jboss.org/repos/savara/branches/1.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot write entries file '<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...'>: No space left on device
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:624)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:275)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:263)
at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.doReport(DAVConnection.java:266)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.runReport(DAVRepository.java:1263)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.update(DAVRepository.java:820)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:564)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:635)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:596)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Updating http://anonsvn.jboss.org/repos/savara/branches/1.1.x
ERROR: Failed to update http://anonsvn.jboss.org/repos/savara/branches/1.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot write entries file '<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...'>: No space left on device
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:624)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:275)
at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:263)
at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.doReport(DAVConnection.java:266)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.runReport(DAVRepository.java:1263)
at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.update(DAVRepository.java:820)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:564)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:635)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:596)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Archiving artifacts
Recording test results
15 years, 2 months
- 1
- 3