codenotifier - PEtALS: revision 8972

Project: PEtALS

Revision: 8972

Author: nsalatge

Date: 05 Sep 2008 06:02:28

Changes:

update orchestra

Files:
modified: /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/util/LoggerHelper.java (try)
modified: /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/util/WSDLAnalyzer.java (try)
modified: /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/jbi/JBIReceiver.java (try)
modified: /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/util/MarshallingException.java (try)
modified: /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/util/Sender.java (try)
copied: from /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/OrchestraException.java (r8957) to /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/OrchestraEngineException.java (try)
modified: /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/listener/JBIListener.java (try)
modified: /trunk/petals-components/petals-se-orchestra/etc/maven/private-repository/org/ow2/orchestra/orchestra-core/4.0-SNAPSHOT/orchestra-core-4.0-SNAPSHOT.pom (try)
modified: /trunk/petals-components/petals-se-orchestra/etc/maven/private-repository/org/ow2/orchestra/orchestra-core/4.0-SNAPSHOT/orchestra-core-4.0-SNAPSHOT.jar (try)
modified: /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/jbi/JBIInvoker.java (try)
modified: /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/util/Marshaller.java (try)
modified: /trunk/petals-components/petals-se-orchestra/etc/maven/private-repository/org/ow2/orchestra/orchestra-core/4.0-SNAPSHOT/maven-metadata-local.xml (try)
deleted: /trunk/petals-components/petals-se-orchestra/src/main/java/org/ow2/petals/engine/orchestra/OrchestraException.java

Diff:

......	@@ -113,7 +113,10 @@
113	113	private void recopyLogger(Logger oldLogger, Logger newLogger) {
114	114	newLogger.setFilter(oldLogger.getFilter());
115	115	newLogger.setLevel(oldLogger.getLevel());
116		newLogger.setParent(oldLogger.getParent());
	116
	117	if(oldLogger.getParent() != null) {
	118	newLogger.setParent(oldLogger.getParent());
	119	}
117	120	newLogger.setUseParentHandlers(oldLogger.getUseParentHandlers());
118	121	for (Handler handler : newLogger.getHandlers()) {
119	122	// remove handlers

......	@@ -41,7 +41,7 @@
41	41	import javax.xml.namespace.QName;
42	42
43	43	import org.ow2.orchestra.wsdl.WsdlsInfos;
44		import org.ow2.petals.engine.orchestra.OrchestraException;
	44	import org.ow2.petals.engine.orchestra.OrchestraEngineException;
45	45	import org.ow2.petals.engine.orchestra.util.Marshaller.ExchangeStyle;
46	46
47	47	/**
......	@@ -101,7 +101,7 @@
101	101	* @param portTypeQName
102	102	* the interface QName
103	103	* @return the list of services
104		* @throws OrchestraException
	104	* @throws OrchestraEngineException
105	105	*/
106	106	public final Service findFirstCorrespondingService(final QName portTypeQName) {
107	107	Service service = null;
......	@@ -121,7 +121,7 @@
121	121	* @param portTypeQName
122	122	* the interface QName
123	123	* @return the list of services
124		* @throws OrchestraException
	124	* @throws OrchestraEngineException
125	125	*/
126	126	public final List<Binding> getBindings(final Service service, final QName portTypeQName) {
127	127	final List<Binding> bindings = new ArrayList<Binding>();
......	@@ -148,7 +148,7 @@
148	148	* @param portTypeQName
149	149	* the interface QName
150	150	* @return the list of services
151		* @throws OrchestraException
	151	* @throws OrchestraEngineException
152	152	*/
153	153	public final List<Binding> getSOAPBindings(final Service service, final QName portTypeQName) {
154	154	final List<Binding> bindings = new ArrayList<Binding>();
......	@@ -173,7 +173,7 @@
173	173	* @param portTypeQName
174	174	* the interface QName
175	175	* @return the list of services
176		* @throws OrchestraException
	176	* @throws OrchestraEngineException
177	177	*/
178	178	public final Binding getFirstSOAPBindings(final Service service, final QName portTypeQName) {
179	179	Binding binding = null;
......	@@ -188,7 +188,7 @@
188	188	* Get the first binding corresponding to the port type
189	189	* @param portTypeQName
190	190	* @return the binding
191		* @throws OrchestraException
	191	* @throws OrchestraEngineException
192	192	*/
193	193	private Binding getFirstBinding(final QName portTypeQName){
194	194	// We find the bindings for this portType
......	@@ -215,10 +215,10 @@
215	215	* @param portTypeQName
216	216	* @param operationName
217	217	* @return
218		* @throws OrchestraException
	218	* @throws OrchestraEngineException
219	219	*/
220	220	public final String getUseForOperation(final QName portTypeQName, final String operationName)
221		throws OrchestraException {
	221	throws OrchestraEngineException {
222	222	// Use (RPC or document) used for the input of the operation
223	223	String use = null;
224	224
......	@@ -252,7 +252,7 @@
252	252	* @param operationName
253	253	* the operation name
254	254	* @return the style or null if not found
255		* @throws OrchestraException
	255	* @throws OrchestraEngineException
256	256	*/
257	257	public final ExchangeStyle getStyleForOperation(final QName portTypeQName, final String operationName){
258	258	String styleS = null;

......	@@ -44,7 +44,7 @@
44	44	import org.ow2.orchestra.var.Message;
45	45	import org.ow2.petals.component.framework.api.message.Exchange;
46	46	import org.ow2.petals.engine.orchestra.BPELProcessEnvironment;
47		import org.ow2.petals.engine.orchestra.OrchestraException;
	47	import org.ow2.petals.engine.orchestra.OrchestraEngineException;
48	48	import org.ow2.petals.engine.orchestra.util.Marshaller;
49	49	import org.w3c.dom.Document;
50	50
......	@@ -74,19 +74,19 @@
74	74	* the message exchange
75	75	* @throws MessagingException
76	76	* problem with JBI MSgExchange access
77		* @throws OrchestraException
	77	* @throws OrchestraEngineException
78	78	* problem while retrieving information for calling a process
79	79	*/
80	80	public static void onJBIMessageReceived(
81	81	final BPELProcessEnvironment bpelProcessEnv, final Exchange exchange)
82		throws MessagingException, OrchestraException {
	82	throws MessagingException, OrchestraEngineException {
83	83	logger.finest("send the received jbm message to the Orchestra server");
84	84
85	85	if (bpelProcessEnv.bpelProcess == null) {
86		throw new OrchestraException("the Bpel process cannot be null");
	86	throw new OrchestraEngineException("the Bpel process cannot be null");
87	87	}
88	88	if (exchange == null) {
89		throw new OrchestraException("no exchange");
	89	throw new OrchestraEngineException("no exchange");
90	90	}
91	91
92	92	// Initialization of the JBI invoker
......	@@ -103,7 +103,7 @@
103	103
104	104	if (exchange.getEndpoint().getInterfaces() == null
105	105	\|\| exchange.getEndpoint().getInterfaces().length == 0) {
106		throw new OrchestraException("can not find the interface");
	106	throw new OrchestraEngineException("can not find the interface");
107	107	}
108	108	final QName portTypeQName = exchange.getEndpoint().getInterfaces()[0];
109	109	final QName processQName = exchange.getEndpoint().getServiceName();
......	@@ -114,7 +114,7 @@
114	114	final PortType port = bpelProcessEnv.wsdlDef.getPortType(portTypeQName);
115	115
116	116	if (port == null) {
117		throw new OrchestraException(
	117	throw new OrchestraEngineException(
118	118	"the following wsdl port can not be retrieved : "
119	119	+ portTypeQName);
120	120	}
......	@@ -131,7 +131,7 @@
131	131	portTypeQName, operationName);
132	132
133	133	if (operation == null) {
134		throw new OrchestraException("the operation (" + operationName
	134	throw new OrchestraEngineException("the operation (" + operationName
135	135	+ ") does not exist in WSDL document: "
136	136	+ bpelProcessEnv.wsdlURL);
137	137	}
......	@@ -172,7 +172,7 @@
172	172	t.setRollbackOnly();
173	173	}
174	174	}
175		throw new OrchestraException(e);
	175	throw new OrchestraEngineException(e);
176	176	}
177	177
178	178	logger.finest("handle process...");

......	@@ -19,14 +19,14 @@
19	19	*/
20	20	package org.ow2.petals.engine.orchestra.util;
21	21
22		import org.ow2.petals.engine.orchestra.OrchestraException;
	22	import org.ow2.petals.engine.orchestra.OrchestraEngineException;
23	23
24	24	/**
25	25	*
26	26	* @author alouis
27	27	*
28	28	*/
29		public class MarshallingException extends OrchestraException {
	29	public class MarshallingException extends OrchestraEngineException {
30	30
31	31	public MarshallingException(String msg) {
32	32	super(msg);

......	@@ -0,0 +1,72 @@
	1	/**
	2	* PETALS - PETALS Services Platform.
	3	* Copyright (c) 2005-2006 EBM WebSourcing, http://www.ebmwebsourcing.com/
	4	*
	5	* This library is free software; you can redistribute it and/or
	6	* modify it under the terms of the GNU Lesser General Public
	7	* License as published by the Free Software Foundation; either
	8	* version 2.1 of the License, or (at your option) any later version.
	9	* This library is distributed in the hope that it will be useful,
	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	12	* Lesser General Public License for more details.
	13	*
	14	* You should have received a copy of the GNU Lesser General Public
	15	* License along with this library; if not, write to the Free Software
	16	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	17	*
	18	* -------------------------------------------------------------------------
	19	* $Id: OrchestraException.java, v 1.1 31 ao�t 07 11:52:47 lam Exp $
	20	* -------------------------------------------------------------------------
	21	*/
	22
	23	package org.ow2.petals.engine.orchestra;
	24
	25	import org.ow2.petals.component.framework.api.exception.PEtALSCDKException;
	26
	27	/**
	28	* The Orchestra exception class
	29	*
	30	* @author Nicolas SALATGE - eBMWebSourcing
	31	*
	32	*/
	33	public class OrchestraEngineException extends PEtALSCDKException {
	34
	35	/**
	36	* the serialVersionUID
	37	*/
	38	private static final long serialVersionUID = 1L;
	39
	40	/**
	41	* Default constructor
	42	*
	43	* @param msg
	44	* the msg exception
	45	*/
	46	public OrchestraEngineException(final String msg) {
	47	super(msg);
	48	}
	49
	50	/**
	51	* Constructor
	52	*
	53	* @param message
	54	* the message
	55	* @param cause
	56	* the cause
	57	*/
	58	public OrchestraEngineException(final String message, final Throwable cause) {
	59	super(message, cause);
	60	}
	61
	62	/**
	63	* Constructor

......	@@ -44,7 +44,7 @@
44	44	import org.ow2.petals.component.framework.api.message.Exchange;
45	45	import org.ow2.petals.component.framework.message.ExchangeImpl;
46	46	import org.ow2.petals.component.framework.util.SOAPFault;
47		import org.ow2.petals.engine.orchestra.OrchestraException;
	47	import org.ow2.petals.engine.orchestra.OrchestraEngineException;
48	48	import org.w3c.dom.Element;
49	49	import org.w3c.dom.NamedNodeMap;
50	50
......	@@ -56,290 +56,291 @@
56	56
57	57	public class Sender {
58	58
59		private Logger logger;
	59	private Logger logger;
60	60
61		private DeliveryChannel channel;
	61	private DeliveryChannel channel;
62	62
63		private ComponentContext context;
	63	private ComponentContext context;
64	64
65		/**
66		* Send style
67		*
68		*/
69		public static enum SendStyle {
70		ASYNCHRONOUS_SEND, SYNCHRONOUS_SEND, SYNCHRONOUS_SEND_WITH_TIMEOUT
71		};
72
73		/**
74		* Default constructor
75		*
76		*/
77		public Sender(final ComponentContext context,
78		final DeliveryChannel channel, final Logger logger) {
79
80		this.logger = logger;
81		this.channel = channel;
82		this.context = context;