2:13 a.m.
Author: objectiser
Date: 2010-11-16 20:13:41 -0500 (Tue, 16 Nov 2010)
New Revision: 1114
Removed:
trunk/runtime/engine/src/main/java/org/jboss/soa/si/InvocationAdapter.java
trunk/runtime/engine/src/main/java/org/jboss/soa/si/MessageAdapter.java
trunk/runtime/engine/src/main/java/org/jboss/soa/si/ServiceInvoker.java
Modified:
trunk/integration-tests/pom.xml
trunk/runtime/engine/pom.xml
trunk/runtime/pom.xml
Log:
Moved ODE independent SI classes to separate module. These are primarily the runtime side
- need to now look more at the deployment side to see if there is anything generic that
can be extracted.
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2010-11-17 00:07:15 UTC (rev 1113)
+++ trunk/integration-tests/pom.xml 2010-11-17 01:13:41 UTC (rev 1114)
@@ -583,11 +583,11 @@
</systemProperties>
<testFailureIgnore>true</testFailureIgnore>
<includes>
- <!--
<include>**/*TestCase.java</include>
<include>**/*Test.java</include>
+ <!--
+ <include>org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java</include>
-->
- <include>org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java</include>
</includes>
<!-- https://jira.jboss.org/jira/browse/RIFTSAW-34 -->
<excludes>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2010-11-17 00:07:15 UTC (rev 1113)
+++ trunk/runtime/engine/pom.xml 2010-11-17 01:13:41 UTC (rev 1114)
@@ -42,6 +42,11 @@
<artifactId>riftsaw-utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.soa</groupId>
+ <artifactId>si</artifactId>
+ </dependency>
+
<!-- ODE2 dependencies
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
Deleted: trunk/runtime/engine/src/main/java/org/jboss/soa/si/InvocationAdapter.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/si/InvocationAdapter.java 2010-11-17
00:07:15 UTC (rev 1113)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/si/InvocationAdapter.java 2010-11-17
01:13:41 UTC (rev 1114)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.si;
-
-import javax.xml.namespace.QName;
-
-/**
- * Hides the message translation details when invoking ODE from
- * an external component (i.e. ESB or WS).
- *
- * @see org.jboss.soa.bpel.runtime.engine.BPELEngine#invoke(InvocationAdapter)
- *
- * @author Heiko Braun <hbraun(a)redhat.com>
- */
-public interface InvocationAdapter<T> {
-
- String getOperationName();
-
- QName getServiceName();
-
- String getPortName();
-
- /**
- * Callback from the Service towards the adapter when
- * turning an external message representation into a Service request.
- *
- * @param mex
- * @param odeRequest
- */
- void initRequest(javax.wsdl.Operation op, MessageAdapter request);
-
- /**
- * Callback from the Engine towards the adapter when
- * turning an ODE response {@link org.apache.ode.bpel.iapi.Message} into an external
format <T>
- * @param mex
- */
- void createResponse(javax.wsdl.Operation wsdl, MessageAdapter resp);
-
- void createFault(javax.wsdl.Operation op, QName faultName, MessageAdapter fault);
-
- /**
- * Access the invocation result (response)
- * @return T
- */
- T getInvocationResult();
-
-}
Deleted: trunk/runtime/engine/src/main/java/org/jboss/soa/si/MessageAdapter.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/si/MessageAdapter.java 2010-11-17
00:07:15 UTC (rev 1113)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/si/MessageAdapter.java 2010-11-17
01:13:41 UTC (rev 1114)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, 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.jboss.soa.si;
-
-public interface MessageAdapter {
-
- public org.w3c.dom.Element getMessage();
-
- public void setPart(String name, org.w3c.dom.Element elem);
-
- public org.w3c.dom.Element getPart(String name);
-
- public void setHeaderPart(String name, org.w3c.dom.Element elem);
-
- public java.util.Map<String, org.w3c.dom.Node> getHeaderParts();
-
-}
Deleted: trunk/runtime/engine/src/main/java/org/jboss/soa/si/ServiceInvoker.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/si/ServiceInvoker.java 2010-11-17
00:07:15 UTC (rev 1113)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/si/ServiceInvoker.java 2010-11-17
01:13:41 UTC (rev 1114)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, 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.jboss.soa.si;
-
-public interface ServiceInvoker {
-
- /**
- * This method initializes the service invoker. This method must
- * be called before using the invoker.
- *
- * @throws Exception Failed to initialize
- */
- public void init() throws Exception;
-
- /**
- * This method invokes the associated service using the invocation
- * adapter supplied.
- *
- * @param invocationAdapter The invocation adapter
- * @throws Exception Failed to invoke the service
- */
- public void invoke(InvocationAdapter<?> invocationAdapter) throws Exception;
-
- /**
- * This method closes the service invoker.
- *
- * @throws Exception Failed to close
- */
- public void close() throws Exception;
-
-}
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2010-11-17 00:07:15 UTC (rev 1113)
+++ trunk/runtime/pom.xml 2010-11-17 01:13:41 UTC (rev 1114)
@@ -17,12 +17,13 @@
<modules>
<module>deployer</module>
+ <module>si</module>
<module>engine</module>
<module>uddi</module>
<module>engine-assembly</module>
<module>jbossesb-bpel</module>
<module>jbossesb-bpel-assembly</module>
- <module>clustering</module>
+ <module>clustering</module>
</modules>