You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2009/11/24 02:51:03 UTC
svn commit: r883568 [2/3] - in /ode/trunk:
axis2/src/main/java/org/apache/ode/axis2/
bpel-api/src/main/java/org/apache/ode/bpel/evt/
bpel-api/src/main/java/org/apache/ode/bpel/iapi/
bpel-api/src/main/java/org/apache/ode/bpel/rapi/ bpel-compiler/src/mai...
Added: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestContextAssign/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestContextAssign/deploy.xml?rev=883568&view=auto
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestContextAssign/deploy.xml (added)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestContextAssign/deploy.xml Tue Nov 24 01:48:48 2009
@@ -0,0 +1,44 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
+ xmlns:pns="http://ode/bpel/unit-testContextAssign"
+ xmlns:wns="http://ode/bpel/unit-testContextAssign.wsdl">
+
+
+ <process name="pns:TestContextAssign">
+ <property name="punctuation">!</property>
+ <property name="epr">
+ <sref:service-ref
+ xmlns:sref=" http://docs.oasis-open.org/wsbpel/2.0/serviceref"
+ xmlns:addr="http://example.com/addressing"
+ xmlns:as="http://example.com/auction/wsdl/auctionService/">
+ <addr:EndpointReference>
+ <addr:Address>http://example.com/auction/RegistrationService/</addr:Address>
+ <addr:ServiceName>as:RegistrationService</addr:ServiceName>
+ </addr:EndpointReference>
+ </sref:service-ref>
+ </property>
+ <active>true</active>
+ <provide partnerLink="TestAssignPartnerLink">
+ <service name="wns:TestContextAssignService" port="TestAssignPort"/>
+ <service name="wns:TestContextAssignService" port="TestAssignPort"/>
+ </provide>
+ </process>
+</deploy>
Added: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestContextAssign/test.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestContextAssign/test.properties?rev=883568&view=auto
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestContextAssign/test.properties (added)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestContextAssign/test.properties Tue Nov 24 01:48:48 2009
@@ -0,0 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+namespace=http://ode/bpel/unit-testContextAssign.wsdl
+service=TestContextAssignService
+operation=testAssign
+request1=<message><TestPart>Hello</TestPart></message>
+response1=.*Hello baz test.*
\ No newline at end of file
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java Tue Nov 24 01:48:48 2009
@@ -131,7 +131,8 @@
.addClass(HActivityRecovery.class)
.addClass(HResourceRoute.class)
.addClass(HLargeData.class)
- .addClass(HMessageExchangeProperty.class);
+ .addClass(HMessageExchangeProperty.class)
+ .addClass(HContextValue.class);
}
public static TransactionManager getTransactionManager(Properties props) {
Added: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ContextValueDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ContextValueDaoImpl.java?rev=883568&view=auto
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ContextValueDaoImpl.java (added)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ContextValueDaoImpl.java Tue Nov 24 01:48:48 2009
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.daohib.bpel;
+
+import org.apache.ode.bpel.dao.ContextValueDAO;
+import org.apache.ode.daohib.SessionManager;
+import org.apache.ode.daohib.bpel.hobj.HContextValue;
+
+/**
+ * Hibernate-based {@link ContextValueDAO} implementation.
+ */
+public class ContextValueDaoImpl extends HibernateDao implements ContextValueDAO {
+
+ private HContextValue _self;
+
+ public ContextValueDaoImpl(SessionManager sessionManager, HContextValue hobj) {
+ super(sessionManager, hobj);
+ entering("PartnerLinkDAOImpl.PartnerLinkDAOImpl");
+ _self = hobj;
+ }
+
+ public String getKey() {
+ return _self.getKey();
+ }
+
+ public String getNamespace() {
+ return _self.getNamespace();
+ }
+
+ public String getValue() {
+ return _self.getValue();
+ }
+
+ public void setKey(String key) {
+ _self.setKey(key);
+ }
+
+ public void setNamespace(String namespace) {
+ _self.setNamespace(namespace);
+ }
+
+ public void setValue(String value) {
+ _self.setValue(value);
+ }
+
+}
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java Tue Nov 24 01:48:48 2009
@@ -19,13 +19,22 @@
package org.apache.ode.daohib.bpel;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
import javax.xml.namespace.QName;
+import org.apache.ode.bpel.dao.ContextValueDAO;
import org.apache.ode.bpel.dao.PartnerLinkDAO;
import org.apache.ode.daohib.SessionManager;
+import org.apache.ode.daohib.bpel.hobj.HContextValue;
import org.apache.ode.daohib.bpel.hobj.HLargeData;
import org.apache.ode.daohib.bpel.hobj.HPartnerLink;
import org.apache.ode.utils.DOMUtils;
+import org.hibernate.Query;
+import org.hibernate.Session;
import org.w3c.dom.Element;
/**
@@ -35,6 +44,8 @@
* (general endpoint configuration).
*/
public class PartnerLinkDAOImpl extends HibernateDao implements PartnerLinkDAO {
+ private static final String QRY_DEL_CTX_VALUES = "delete from " + HContextValue.class.getName()
+ + " where namespace = ? and key = ?".intern();
/** Cached copy of my epr */
@@ -152,4 +163,47 @@
}
+ public Collection<ContextValueDAO> getContextValues() {
+ entering("PartnerLinkDAOImpl.getContextValues");
+ Set<ContextValueDAO> results = new HashSet<ContextValueDAO>();
+ for (HContextValue hContextValue : _self.getContextValues()) {
+ results.add(new ContextValueDaoImpl(_sm, hContextValue));
+ }
+ return results;
+ }
+
+ public void removeContextValue(String namespace, String key) {
+ entering("PartnerLinkDAOImpl.removeContextValue");
+ Session session = getSession();
+ Query q = session.createQuery(QRY_DEL_CTX_VALUES);
+ q.setString(0, namespace); // namespace
+ q.setString(0, key); // key
+ q.executeUpdate();
+ session.flush(); // explicit flush to ensure value removed.
+ }
+
+ public void setContextValue(String namespace, String key, String value) {
+ entering("PartnerLinkDAOImpl.setContextValue");
+ HContextValue hvalue = null;
+ for (HContextValue c : _self.getContextValues()) {
+ if (c.getNamespace().equals(namespace) && c.getKey().equals(key)) {
+ hvalue = c;
+ }
+ }
+
+ if (hvalue == null) {
+ hvalue = new HContextValue();
+ hvalue.setNamespace(namespace);
+ hvalue.setKey(key);
+ hvalue.setPartnerLink(_self);
+ _self.getContextValues().add(hvalue);
+
+ hvalue.setLock(0);
+ hvalue.setCreated(new Date());
+ getSession().save(hvalue);
+ }
+
+ hvalue.setValue(value);
+ }
+
}
Added: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HContextValue.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HContextValue.java?rev=883568&view=auto
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HContextValue.java (added)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HContextValue.java Tue Nov 24 01:48:48 2009
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.daohib.bpel.hobj;
+
+
+/**
+ * Hibernate table-mapped class representing one valued property in a
+ * context.
+ *
+ * @hibernate.class table="BPEL_CONTEXT_VALUE"
+ */
+public class HContextValue extends HObject {
+ private String _key;
+ private String _data;
+ private String _value;
+ private String _namespace;
+
+ private HPartnerLink _partnerLink;
+
+ /**
+ * @hibernate.property
+ * @hibernate.column name="NAMESPACE" length="100" not-null="true" index="IDX_CTX_NSKEY"
+ */
+ public String getNamespace() {
+ return _namespace;
+ }
+
+ public void setNamespace(String namespace) {
+ _namespace = namespace;
+ }
+
+ /**
+ * @hibernate.property
+ * @hibernate.column name="KEY_NAME" length="100" not-null="true" index="IDX_CTX_NSKEY"
+ */
+ public String getKey() {
+ return _key;
+ }
+
+ public void setKey(String key) {
+ _key = key;
+ }
+
+ /**
+ * @hibernate.property
+ * @hibernate.column name="VALUE" length="255" not-null="true" index="IDX_CTX_VAL"
+ */
+ public String getInternalValue() {
+ return _value;
+ }
+
+ public void setInternalValue(String value) {
+ _value = value;
+ }
+
+ /**
+ * @hibernate.property
+ * @hibernate.column name="DATA" sql-type="blob(2G)"
+ */
+ public String getData() {
+ return _data;
+ }
+
+ public void setData(String data) {
+ _data = data;
+ }
+
+ public String getValue() {
+ if (_value != null) {
+ return _value;
+ }
+
+ if (_data != null) {
+ return _data;
+ }
+
+ return null;
+ }
+
+ public void setValue(String value) {
+ // store large data in the clob, small data indexable in a varchar
+ if (value.length() <= 250) {
+ _value = value;
+ _data = null;
+ } else {
+ _value = null;
+ _data = value;
+ }
+ }
+
+ /**
+ * @hibernate.many-to-one column="PARTNERLINK" foreign-key="none"
+ */
+ public HPartnerLink getPartnerLink() {
+ return _partnerLink;
+ }
+
+ public void setPartnerLink(HPartnerLink pl) {
+ _partnerLink = pl;
+ }
+
+}
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java Tue Nov 24 01:48:48 2009
@@ -19,6 +19,7 @@
package org.apache.ode.daohib.bpel.hobj;
+import java.util.HashSet;
import java.util.Set;
/**
@@ -57,6 +58,8 @@
private Set<HMessageExchange> _mex;
+ private Set<HContextValue> _contextValues = new HashSet<HContextValue>();
+
public HPartnerLink() {
super();
}
@@ -201,4 +204,20 @@
_mex = mex;
}
+ /**
+ * Get the context value objects for partner links.
+ *
+ * @return {@link Set}<{@link HContextValue}> with context values
+ * @hibernate.set lazy="true" inverse="true" cascade="delete"
+ * @hibernate.collection-key column="PARTNERLINK" foreign-key="none"
+ * @hibernate.collection-one-to-many class="org.apache.ode.daohib.bpel.hobj.HContextValue"
+ */
+ public Set<HContextValue> getContextValues() {
+ return _contextValues;
+ }
+
+ public void setContextValues(Set<HContextValue> contextValues) {
+ _contextValues = contextValues;
+ }
+
}
Added: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ContextValueDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ContextValueDAOImpl.java?rev=883568&view=auto
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ContextValueDAOImpl.java (added)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ContextValueDAOImpl.java Tue Nov 24 01:48:48 2009
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.dao.jpa;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import org.apache.ode.bpel.dao.ContextValueDAO;
+import org.apache.openjpa.persistence.jdbc.Index;
+
+@Entity
+@Table(name="ODE_CONTEXT_VALUE")
+@NamedQueries({
+ @NamedQuery(name=ContextValueDAOImpl.DELETE_CONTEXT_VALUES_BY_KEYS, query="delete from ContextValueDAOImpl as l where l._key = :key and l._namespace = :namespace")
+})
+
+public class ContextValueDAOImpl extends OpenJPADAO implements ContextValueDAO {
+ public static final String DELETE_CONTEXT_VALUES_BY_KEYS = "DELETE_CONTEXT_VALUES_BY_KEYS";
+
+ @Id @Column(name="CONTEXT_VALUE_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ @SuppressWarnings("unused")
+ private Long _id;
+
+ @Basic @Column(name="NAMESPACE")
+ @Index(name="IDX_CTX_NS", enabled=true, unique=false)
+ private String _namespace;
+
+ @Basic @Column(name="KEY_NAME")
+ @Index(name="IDX_CTX_KEY", enabled=true, unique=false)
+ private String _key;
+
+ @Lob @Column(name="DATA")
+ private String _data;
+
+ @Basic @Column(name="VALUE")
+ @Index(name="IDX_CTX_VAL", enabled=true, unique=false)
+ private String _value;
+
+// @Basic @Column(name="PARTNER_LINK_ID", nullable=true, insertable=false, updatable=false)
+// @SuppressWarnings("unused")
+// private Long _partnerLinkId;
+
+ @SuppressWarnings("unused")
+ @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST})
+ @Column(name="PLINK")
+ private PartnerLinkDAOImpl _partnerLink;
+
+
+ public ContextValueDAOImpl() {}
+ public ContextValueDAOImpl(PartnerLinkDAOImpl partnerLink, String namespace, String key){
+ _partnerLink = partnerLink;
+ _namespace = namespace;
+ _key = key;
+ }
+
+ public String getKey() {
+ return _key;
+ }
+
+ public String getValue() {
+ if (_value != null) {
+ return _value;
+ }
+
+ if (_data != null) {
+ return _data;
+ }
+
+ return null;
+ }
+
+ public void setValue(String value) {
+ // store large data in the clob, small data indexable in a varchar
+ if (value.length() <= 250) {
+ _value = value;
+ _data = null;
+ } else {
+ _value = null;
+ _data = value;
+ }
+ }
+
+ public String getNamespace() {
+ return _namespace;
+ }
+
+ public void setKey(String key) {
+ _key = key;
+ }
+
+ public void setNamespace(String namespace) {
+ _namespace = namespace;
+ }
+}
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java Tue Nov 24 01:48:48 2009
@@ -20,9 +20,8 @@
package org.apache.ode.dao.jpa;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
-import org.apache.ode.utils.DOMUtils;
-import org.w3c.dom.Element;
+import java.util.ArrayList;
+import java.util.Collection;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
@@ -36,16 +35,23 @@
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.Query;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.xml.namespace.QName;
+import org.apache.ode.bpel.dao.ContextValueDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.apache.ode.utils.DOMUtils;
+import org.w3c.dom.Element;
+
@Entity
@Table(name="ODE_PARTNER_LINK")
@NamedQueries({
@NamedQuery(name=PartnerLinkDAOImpl.DELETE_PARTNER_LINKS_BY_SCOPE_IDS, query="delete from PartnerLinkDAOImpl as l where l._scopeId in (:scopeIds)")
})
-public class PartnerLinkDAOImpl implements PartnerLinkDAO {
+public class PartnerLinkDAOImpl extends OpenJPADAO implements PartnerLinkDAO {
public final static String DELETE_PARTNER_LINKS_BY_SCOPE_IDS = "DELETE_PARTNER_LINKS_BY_SCOPE_IDS";
@Id @Column(name="PARTNER_LINK_ID")
@@ -81,6 +87,9 @@
@ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="SCOPE_ID")
@SuppressWarnings("unused")
private ScopeDAOImpl _scope;
+
+ @OneToMany(targetEntity=ContextValueDAOImpl.class,mappedBy="_partnerLink",fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.REFRESH, CascadeType.PERSIST})
+ private Collection<ContextValueDAO> _contextValues = new ArrayList<ContextValueDAO>();
public PartnerLinkDAOImpl() {}
public PartnerLinkDAOImpl(int modelId, String name, String myRole, String partnerRole) {
@@ -171,4 +180,32 @@
public void setScope(ScopeDAOImpl scope) {
_scope = scope;
}
+
+ public Collection<ContextValueDAO> getContextValues() {
+ return _contextValues;
+ }
+
+ public void removeContextValue(String namespace, String key) {
+ Query q = getEM().createNamedQuery(ContextValueDAOImpl.DELETE_CONTEXT_VALUES_BY_KEYS);
+ q.setParameter("namespace", namespace);
+ q.setParameter("key", key);
+ }
+
+ public void setContextValue(String namespace, String key, String value) {
+ ContextValueDAO val = null;
+ for (ContextValueDAO v : getContextValues()) {
+ if (v.getNamespace().equals(namespace) && v.getKey().equals(key)) {
+ val = v;
+ }
+ }
+
+ if (val == null) {
+ val = new ContextValueDAOImpl(this, namespace, key);
+ getEM().persist(val);
+ _contextValues.add(val);
+ }
+
+ val.setValue(value);
+ }
+
}
Modified: ode/trunk/dao-jpa/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/resources/META-INF/persistence.xml?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/resources/META-INF/persistence.xml (original)
+++ ode/trunk/dao-jpa/src/main/resources/META-INF/persistence.xml Tue Nov 24 01:48:48 2009
@@ -43,5 +43,6 @@
<class>org.apache.ode.dao.jpa.CorrSetProperty</class>
<class>org.apache.ode.dao.jpa.MexProperty</class>
<class>org.apache.ode.dao.jpa.XmlDataProperty</class>
+ <class>org.apache.ode.dao.jpa.ContextValueDAOImpl</class>
</persistence-unit>
</persistence>
\ No newline at end of file
Added: ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/AbstractContextInterceptor.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/AbstractContextInterceptor.java?rev=883568&view=auto
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/AbstractContextInterceptor.java (added)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/AbstractContextInterceptor.java Tue Nov 24 01:48:48 2009
@@ -0,0 +1,49 @@
+package org.apache.ode.bpel.context;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.engine.DbBackedMessageImpl;
+import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.rapi.ContextData;
+import org.apache.ode.bpel.rapi.IOContext;
+import org.w3c.dom.Element;
+
+public abstract class AbstractContextInterceptor implements ContextInterceptor {
+ static final Log __log = LogFactory.getLog(ContextInterceptor.class);
+
+ public abstract void configure(Element configuration);
+
+ /**
+ * Translates the data stored within the context object into SOAP headers or
+ * vice versa.
+ *
+ * If direction is OUTBOUND, context data must be converted into message headers
+ * if direction is INBOUND, context data must be extracted from the message.
+ */
+ public void process(ContextData ctx, MessageExchangeDAO mexdao, IOContext.Direction dir) throws ContextException {
+ if (dir == IOContext.Direction.INBOUND && mexdao.getRequest() != null) {
+ __log.debug("Delegating inbound request to context interceptor");
+ Message msg = new DbBackedMessageImpl(mexdao.getRequest());
+ onProcessInvoke(ctx, msg);
+ } else if (dir == IOContext.Direction.OUTBOUND && mexdao.getRequest() != null) {
+ __log.debug("Delegating outbound request to context interceptor");
+ Message msg = new DbBackedMessageImpl(mexdao.getRequest());
+ onPartnerInvoke(ctx, msg);
+ } else if (dir == IOContext.Direction.OUTBOUND_REPLY && mexdao.getResponse() != null) {
+ __log.debug("Delegating inbound response to context interceptor");
+ Message msg = new DbBackedMessageImpl(mexdao.getResponse());
+ onPartnerReply(ctx, msg);
+ } else if (dir == IOContext.Direction.INBOUND_REPLY && mexdao.getResponse() != null) {
+ Message msg = new DbBackedMessageImpl(mexdao.getResponse());
+ onProcessReply(ctx, msg);
+ }
+ }
+
+ public abstract void onPartnerInvoke(ContextData ctx, Message msg);
+ public abstract void onPartnerReply(ContextData ctx, Message msg);
+ public abstract void onProcessInvoke(ContextData ctx, Message msg);
+ public abstract void onProcessReply(ContextData ctx, Message msg);
+
+}
Added: ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/ContextDataImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/ContextDataImpl.java?rev=883568&view=auto
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/ContextDataImpl.java (added)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/ContextDataImpl.java Tue Nov 24 01:48:48 2009
@@ -0,0 +1,219 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.bpel.context;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.ode.bpel.rapi.ContextData;
+import org.apache.ode.schemas.context.x2009.ContextsDocument;
+import org.apache.ode.schemas.context.x2009.TContext;
+import org.apache.ode.schemas.context.x2009.TContextValue;
+import org.apache.ode.schemas.context.x2009.TContexts;
+import org.apache.xmlbeans.XmlException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+
+/**
+ * Represents a BPEL context.
+ *
+ * The context contains key/value pairs. The class basically serves as a
+ * data transfer object between interceptors and the engine's core.
+ *
+ * @author Tammo van Lessen
+ */
+public class ContextDataImpl implements ContextData {
+
+ protected Map<String, Map<String,String>> contexts = new HashMap<String, Map<String, String>>();
+
+ public ContextDataImpl() {
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#put(java.lang.String, java.lang.String, java.lang.String)
+ */
+ public void put(String context, String key, String value) {
+ Map<String, String> ctx = contexts.get(context);
+ if (ctx == null) {
+ ctx = new HashMap<String, String>();
+ contexts.put(context, ctx);
+ }
+ ctx.put(key, value);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#put(org.apache.ode.bpel.context.ContextName, java.lang.String)
+ */
+ public void put(ContextName name, String value) {
+ put(name.getNamespace(), name.getKey(), value);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#get(java.lang.String, java.lang.String)
+ */
+ public String get(String context, String key) {
+ Map<String, String> ctx = contexts.get(context);
+ if (ctx != null) {
+ return ctx.get(key);
+ }
+
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#get(org.apache.ode.bpel.context.ContextName)
+ */
+ public String get(ContextName name) {
+ return get(name.getNamespace(), name.getKey());
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#isSet(java.lang.String, java.lang.String)
+ */
+ public boolean isSet(String context, String key) {
+ Map<String, String> ctx = contexts.get(context);
+ if (ctx != null) {
+ return ctx.get(key) != null;
+ }
+
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#isSet(org.apache.ode.bpel.context.ContextName)
+ */
+ public boolean isSet(ContextName name) {
+ return isSet(name.getNamespace(), name.getKey());
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#getKeys(java.lang.String)
+ */
+ public String[] getKeys(String context) {
+ Map<String, String> ctx = contexts.get(context);
+ if (ctx != null) {
+ return ctx.keySet().toArray(new String[] {});
+ }
+
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#getContexts()
+ */
+ public String[] getContexts() {
+ return contexts.keySet().toArray(new String[] {});
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#getContextNames()
+ */
+ public List<ContextName> getContextNames() {
+ List<ContextName> names = new LinkedList<ContextName>();
+ for (String context : contexts.keySet()) {
+ for (String key : contexts.get(context).keySet()) {
+ names.add(new ContextName(context, key));
+ }
+ }
+
+ return Collections.unmodifiableList(names);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#removeContext(java.lang.String)
+ */
+ public void removeContext(String name) {
+ contexts.remove(name);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ode.bpel.context.ContextData#toXML()
+ */
+ public Element toXML(Set<String> contextFilter) {
+ if (contextFilter == null) {
+ contextFilter = new HashSet<String>();
+ contextFilter.add("*");
+ }
+
+ ContextsDocument doc = ContextsDocument.Factory.newInstance();
+ TContexts ctxs = doc.addNewContexts();
+ for (String cname : contexts.keySet()) {
+ if (!contextFilter.contains("*") && !contextFilter.contains(cname)) {
+ continue;
+ }
+ TContext ctx = ctxs.addNewContext();
+ ctx.setName(cname);
+ Map<String, String> cvalues = contexts.get(cname);
+ for (String key : cvalues.keySet()) {
+ TContextValue ctxval = ctx.addNewValue();
+ ctxval.setKey(key);
+ ctxval.setStringValue(cvalues.get(key));
+ }
+ }
+
+ // workaround to a level 3 dom node
+ Element root = ((Document)doc.newDomNode()).getDocumentElement();
+
+ DocumentBuilder builder;
+ try {
+ builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ Document level3doc = builder.newDocument();
+ level3doc.appendChild(level3doc.importNode(root, true));
+ return level3doc.getDocumentElement();
+
+ } catch (ParserConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public Element toXML() {
+ return toXML(null);
+ }
+
+ public static ContextData fromXML(Node node) {
+ try {
+ TContexts ctxs = ContextsDocument.Factory.parse(node).getContexts();
+ if (ctxs == null) {
+ return null;
+ }
+ ContextData cdata = new ContextDataImpl();
+ for (TContext ctx : ctxs.getContextList()) {
+ for (TContextValue ctxval : ctx.getValueList()) {
+ cdata.put(ctx.getName(), ctxval.getKey(), ctxval.getStringValue());
+ }
+ }
+
+ return cdata;
+ } catch (XmlException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ }
Added: ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/ContextInterceptor.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/ContextInterceptor.java?rev=883568&view=auto
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/ContextInterceptor.java (added)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/ContextInterceptor.java Tue Nov 24 01:48:48 2009
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.bpel.context;
+
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.rapi.ContextData;
+import org.apache.ode.bpel.rapi.IOContext;
+import org.w3c.dom.Element;
+
+/**
+ * Context Interceptors can map message headers (or even payload) to
+ * context information that is attached to process models.
+ *
+ * @author Tammo van Lessen
+ */
+public interface ContextInterceptor {
+
+ /**
+ * Configures the interceptor. This method will be called immediatedly after
+ * instantiation of the implementing class. The passed element will contain the
+ * configuration elements given in the deploy.xml. In case of a declaration in
+ * xxx-ode.properties, the method won't be called.
+ *
+ * @param configuration
+ */
+ void configure(Element configuration);
+
+ /**
+ * Translates the data stored within the context object into SOAP headers or
+ * vice versa.
+ *
+ * If direction is OUTBOUND, context data must be converted into message headers
+ * if direction is INBOUND, context data must be extracted from the message.
+ */
+ void process(ContextData ctx, MessageExchangeDAO mexdao, IOContext.Direction dir) throws ContextException;
+
+}
Added: ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/TracingContextInterceptor.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/TracingContextInterceptor.java?rev=883568&view=auto
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/TracingContextInterceptor.java (added)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/context/TracingContextInterceptor.java Tue Nov 24 01:48:48 2009
@@ -0,0 +1,55 @@
+package org.apache.ode.bpel.context;
+
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.rapi.ContextData;
+import org.apache.ode.utils.DOMUtils;
+import org.apache.ode.utils.uuid.UUID;
+import org.w3c.dom.Element;
+
+public class TracingContextInterceptor extends AbstractContextInterceptor {
+
+ public void configure(Element configuration) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void onPartnerInvoke(ContextData ctx, Message msg) {
+ String tid = ctx.get("tracing", "id");
+ if (tid != null) {
+ try {
+ msg.setHeaderPart("TracingId", DOMUtils.stringToDOM("<TracingId xmlns=\"urn:trace\">" + tid + "</TracingId>"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void onPartnerReply(ContextData ctx, Message msg) {
+ Element tide = msg.getHeaderPart("TracingId");
+ if (tide != null) {
+ String pids = ctx.get("tracing", "partner-ids");
+ ctx.put("tracing", "partner-ids", (pids == null) ? tide.getTextContent() : pids + ", " + tide.getTextContent());
+ }
+ }
+
+ public void onProcessInvoke(ContextData ctx, Message msg) {
+ Element tide = msg.getHeaderPart("TracingId");
+ if (tide != null) {
+ ctx.put("tracing", "id", tide.getTextContent());
+ } else {
+ ctx.put("tracing", "id", new UUID().toString());
+ }
+ }
+
+ public void onProcessReply(ContextData ctx, Message msg) {
+ String tid = ctx.get("tracing", "id");
+ if (tid != null) {
+ try {
+ msg.setHeaderPart("TracingId", DOMUtils.stringToDOM("<TracingId xmlns=\"urn:trace\">" + tid + "</TracingId>"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+}
Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java (original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java Tue Nov 24 01:48:48 2009
@@ -21,7 +21,14 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import javax.wsdl.Operation;
import javax.xml.namespace.QName;
@@ -31,6 +38,9 @@
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.common.ProcessState;
+import org.apache.ode.bpel.context.ContextDataImpl;
+import org.apache.ode.bpel.context.ContextInterceptor;
+import org.apache.ode.bpel.dao.ContextValueDAO;
import org.apache.ode.bpel.dao.CorrelationSetDAO;
import org.apache.ode.bpel.dao.CorrelatorDAO;
import org.apache.ode.bpel.dao.MessageDAO;
@@ -49,7 +59,13 @@
import org.apache.ode.bpel.evt.ProcessMessageExchangeEvent;
import org.apache.ode.bpel.evt.ProcessTerminationEvent;
import org.apache.ode.bpel.evt.ScopeEvent;
-import org.apache.ode.bpel.iapi.*;
+import org.apache.ode.bpel.iapi.BpelEngineException;
+import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.bpel.iapi.MessageExchange;
+import org.apache.ode.bpel.iapi.PartnerRoleChannel;
+import org.apache.ode.bpel.iapi.Scheduler;
+import org.apache.ode.bpel.iapi.WSMessageExchange;
import org.apache.ode.bpel.iapi.MessageExchange.AckType;
import org.apache.ode.bpel.iapi.MessageExchange.FailureType;
import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
@@ -57,6 +73,7 @@
import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY;
import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
import org.apache.ode.bpel.memdao.ProcessInstanceDaoImpl;
+import org.apache.ode.bpel.rapi.ContextData;
import org.apache.ode.bpel.rapi.CorrelationSet;
import org.apache.ode.bpel.rapi.FaultInfo;
import org.apache.ode.bpel.rapi.NoSuchOperationException;
@@ -64,10 +81,14 @@
import org.apache.ode.bpel.rapi.OdeRTInstanceContext;
import org.apache.ode.bpel.rapi.PartnerLink;
import org.apache.ode.bpel.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.PropagationRule;
+import org.apache.ode.bpel.rapi.Resource;
+import org.apache.ode.bpel.rapi.ResourceModel;
import org.apache.ode.bpel.rapi.Selector;
import org.apache.ode.bpel.rapi.UninitializedPartnerEPR;
import org.apache.ode.bpel.rapi.UninitializedVariableException;
import org.apache.ode.bpel.rapi.Variable;
+import org.apache.ode.bpel.rapi.ContextData.ContextName;
import org.apache.ode.il.config.OdeConfigProperties;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.GUID;
@@ -78,10 +99,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.ode.bpel.rapi.*;
-import org.apache.ode.bpel.rapi.Resource;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Text;
class BpelRuntimeContextImpl implements OdeRTInstanceContext {
@@ -396,6 +414,66 @@
public Element fetchMyRoleEndpointReferenceData(PartnerLink pLink) {
return ((ODEWSProcess)_bpelProcess).getInitialMyRoleEPR(pLink.getModel()).toXML().getDocumentElement();
}
+
+ public ContextData fetchContextData(PartnerLink pLink) {
+ ContextData cdata = new ContextDataImpl();
+
+ PartnerLinkDAO pldao = fetchPartnerLinkDAO(pLink);
+ for (ContextValueDAO cvd : pldao.getContextValues()) {
+ cdata.put(cvd.getNamespace(), cvd.getKey(), cvd.getValue());
+ }
+
+ return cdata;
+ }
+
+ public void writeContextData(PartnerLink pLink, Node ctxData, Set<String> filter) {
+ writeContextData(pLink, ContextDataImpl.fromXML(ctxData), filter);
+ }
+
+ /**
+ * @param filter if null, select all.
+ */
+ private void writeContextData(PartnerLink pLink, ContextData ctxData, Set<String> filter) {
+ boolean removeUnsetKeys;
+ boolean useFilter;
+
+ if (filter == null) {
+ removeUnsetKeys = true;
+ useFilter = false;
+ } else if (filter.contains("*")) {
+ removeUnsetKeys = true;
+ useFilter = false;
+ } else if (filter.contains("+")) {
+ removeUnsetKeys = false;
+ useFilter = false;
+ } else {
+ useFilter = true;
+ removeUnsetKeys = false;
+ }
+
+ //TODO evaluate filter
+ Set<ContextName> unusedKeys = new HashSet<ContextName>();
+ PartnerLinkDAO pldao = fetchPartnerLinkDAO(pLink);
+ for (ContextValueDAO cvd : pldao.getContextValues()) {
+ unusedKeys.add(new ContextName(cvd.getNamespace(), cvd.getKey()));
+ }
+
+ // update existing and add new context values.
+ for (ContextName name : ctxData.getContextNames()) {
+ if (useFilter && !filter.contains(name.getNamespace())) {
+ continue;
+ }
+ pldao.setContextValue(name.getNamespace(), name.getKey(), ctxData.get(name));
+ unusedKeys.remove(name);
+ }
+
+ if (removeUnsetKeys) {
+ // remove deleted context keys
+ for (ContextName n : unusedKeys) {
+ pldao.removeContextValue(n.getNamespace(), n.getKey());
+ }
+ }
+ }
private PartnerLinkDAO fetchPartnerLinkDAO(PartnerLink pLink) {
ScopeDAO scopeDAO = _dao.getScope(pLink.getScopeId());
@@ -468,7 +546,7 @@
dataDAO.setProperty(QNameUtils.fromQName(property), value);
}
- public void reply(String mexId, final PartnerLink plink, final String opName, Element msg, QName fault)
+ public void reply(String mexId, final PartnerLink plink, final String opName, Element msg, QName fault, Set<org.apache.ode.bpel.rapi.PropagationRule> propagationRules)
throws NoSuchOperationException {
// prepare event
ProcessMessageExchangeEvent evt = new ProcessMessageExchangeEvent();
@@ -489,6 +567,10 @@
myrolemex.setResponse(message);
+ if (propagationRules != null) {
+ invokeContextInterceptorsOutbound(myrolemex, plink, propagationRules, Direction.INBOUND_REPLY);
+ }
+
AckType ackType;
if (fault != null) {
ackType = AckType.FAULT;
@@ -599,7 +681,7 @@
_bpelProcess.scheduleJob(j, null);
}
- public String invoke(String requestId, PartnerLink partnerLink, Operation operation, Element outgoingMessage)
+ public String invoke(String requestId, PartnerLink partnerLink, Operation operation, Element outgoingMessage, Set<PropagationRule> propagationRules)
throws UninitializedPartnerEPR {
MessageExchangeDAO mexDao = _dao.getConnection().createMessageExchange(new GUID().toString(),
@@ -637,6 +719,10 @@
mexDao.setProperty(MessageExchange.PROPERTY_SEP_MYROLE_TRANSACTED, Boolean.valueOf(_atomicScope).toString());
message.setType(operation.getInput().getMessage().getQName());
buildOutgoingMessage(message, outgoingMessage);
+
+ if (propagationRules != null) {
+ invokeContextInterceptorsOutbound(mexDao, partnerLink, propagationRules, Direction.OUTBOUND);
+ }
// prepare event
ProcessMessageExchangeEvent evt = new ProcessMessageExchangeEvent();
@@ -835,7 +921,7 @@
evt.setNewState(ProcessState.STATE_ACTIVE);
sendEvent(evt);
}
-
+ // TODO: place context processing here
_rti.onSelectEvent(responseChannelId, mexdao.getMessageExchangeId(), idx);
}
@@ -1183,4 +1269,68 @@
}
return dao;
}
+
+ public void invokeContextInterceptorsOutbound(MessageExchangeDAO mexdao, PartnerLink pl, Set<PropagationRule> propagationRules, Direction dir) {
+ Set<ContextName> knownKeys = new HashSet<ContextName>();
+ ContextData cdata = new ContextDataImpl();
+
+ for (PropagationRule pr : propagationRules) {
+ PartnerLinkDAO pldao = fetchPartnerLinkDAO(pr.getFromPL());
+ for (ContextValueDAO cvd : pldao.getContextValues()) {
+ ContextName cn = new ContextName(cvd.getNamespace(), cvd.getKey());
+ if (!knownKeys.contains(cn) && (pr.isPropagateAll() || pr.getContexts().contains(cvd.getNamespace()))) {
+ cdata.put(cvd.getNamespace(), cvd.getKey(), cvd.getValue());
+ knownKeys.add(cn);
+ } else {
+ __log.warn("ContextPropagation: Duplicate context key from a different partner link. Taking the first one declared.");
+ }
+ }
+ }
+
+ // process process interceptors
+ // -> use a linkedhashset to get rid of duplicates while perserving the order
+ // (local contexts first, then global contexts).
+ Set<ContextInterceptor> interceptors = new LinkedHashSet<ContextInterceptor>();
+ interceptors.addAll(_bpelProcess._ctxInterceptors);
+ interceptors.addAll(_contexts.contextInterceptorRegistry);
+
+ for (ContextInterceptor interceptor : interceptors) {
+ try {
+ interceptor.process(cdata, mexdao, dir);
+ } catch (Exception e) {
+ // catch all
+ __log.error("Error in context interceptor '" + interceptor.getClass().getName() + "' while processing " + dir + " MEX " + mexdao, e);
+ }
+ }
+
+ }
+
+ public void invokeContextInterceptorsInbound(String mexId, PartnerLink pl, Direction dir) {
+ MessageExchangeDAO mexdao = getExistingMex(mexId);
+
+ ContextData cdata = fetchContextData(pl);
+
+ // process process interceptors
+ // -> use a linkedhashset to get rid of duplicates while perserving the order
+ // (local contexts first, then global contexts).
+ Set<ContextInterceptor> interceptors = new LinkedHashSet<ContextInterceptor>();
+ interceptors.addAll(_bpelProcess._ctxInterceptors);
+ interceptors.addAll(_contexts.contextInterceptorRegistry);
+
+ for (ContextInterceptor interceptor : interceptors) {
+ try {
+ interceptor.process(cdata, mexdao, dir);
+ } catch (Exception e) {
+ // catch all
+ __log.error("Error in context interceptor '" + interceptor.getClass().getName() + "' while processing in " + dir + " MEX " + mexdao, e);
+ }
+ }
+
+ writeContextData(pl, cdata, null);
+ }
+
+ public List<org.apache.ode.bpel.iapi.ProcessConf.PropagationRule> getPropagationRules() {
+ return _bpelProcess._pconf.getPropagationRules();
+ }
+
}
Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java (original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java Tue Nov 24 01:48:48 2009
@@ -40,6 +40,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.context.ContextInterceptor;
import org.apache.ode.bpel.dao.*;
import org.apache.ode.bpel.engine.cron.CronScheduler;
import org.apache.ode.bpel.evar.ExternalVariableModule;
@@ -278,6 +279,14 @@
_contexts.extensionRegistry.remove(nsURI);
}
+ public void registerContextInterceptor(ContextInterceptor interceptor) {
+ _contexts.contextInterceptorRegistry.add(interceptor);
+ }
+
+ public void unregisterContextInterceptor(ContextInterceptor interceptor) {
+ _contexts.contextInterceptorRegistry.remove(interceptor);
+ }
+
public void stop() {
_mngmtLock.writeLock().lock();
try {
Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/Contexts.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/Contexts.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/Contexts.java (original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/Contexts.java Tue Nov 24 01:48:48 2009
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.engine;
-import java.util.List;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
@@ -34,7 +34,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.context.ContextInterceptor;
import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
+import org.apache.ode.bpel.engine.cron.CronScheduler;
+import org.apache.ode.bpel.evar.ExternalVariableModule;
+import org.apache.ode.bpel.extension.ExtensionBundleRuntime;
import org.apache.ode.bpel.iapi.BindingContext;
import org.apache.ode.bpel.iapi.BpelEngineException;
import org.apache.ode.bpel.iapi.BpelEventListener;
@@ -42,9 +46,6 @@
import org.apache.ode.bpel.iapi.MessageExchangeContext;
import org.apache.ode.bpel.iapi.Scheduler;
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
-import org.apache.ode.bpel.engine.cron.CronScheduler;
-import org.apache.ode.bpel.evar.ExternalVariableModule;
-import org.apache.ode.bpel.extension.ExtensionBundleRuntime;
/**
* Aggregation of all the contexts provided to the BPEL engine by the integration layer.
@@ -69,6 +70,9 @@
/** Global extension bundle registry **/
final Map<String, ExtensionBundleRuntime> extensionRegistry = new ConcurrentHashMap<String, ExtensionBundleRuntime>();
+ /** Global context interceptor registry **/
+ final List<ContextInterceptor> contextInterceptorRegistry = new CopyOnWriteArrayList<ContextInterceptor>();
+
/** Mapping from external variable engine identifier to the engine implementation. */
final HashMap<QName, ExternalVariableModule> externalVariableEngines = new HashMap<QName, ExternalVariableModule>();
Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/DbBackedMessageImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/DbBackedMessageImpl.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/DbBackedMessageImpl.java (original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/DbBackedMessageImpl.java Tue Nov 24 01:48:48 2009
@@ -5,7 +5,7 @@
import org.apache.ode.bpel.dao.MessageDAO;
import org.w3c.dom.Element;
-class DbBackedMessageImpl extends MessageImpl {
+public class DbBackedMessageImpl extends MessageImpl {
private MessageDAO _dao;
Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java (original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java Tue Nov 24 01:48:48 2009
@@ -37,11 +37,25 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.dao.*;
+import org.apache.ode.bpel.context.ContextInterceptor;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.CorrelatorDAO;
+import org.apache.ode.bpel.dao.MessageDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.MessageRouteDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.engine.extvar.ExternalVariableConf;
import org.apache.ode.bpel.engine.extvar.ExternalVariableManager;
import org.apache.ode.bpel.evt.ProcessInstanceEvent;
-import org.apache.ode.bpel.iapi.*;
+import org.apache.ode.bpel.iapi.BpelEngineException;
+import org.apache.ode.bpel.iapi.BpelEventListener;
+import org.apache.ode.bpel.iapi.Endpoint;
+import org.apache.ode.bpel.iapi.InvocationStyle;
+import org.apache.ode.bpel.iapi.MessageExchange;
+import org.apache.ode.bpel.iapi.ProcessConf;
+import org.apache.ode.bpel.iapi.Scheduler;
+import org.apache.ode.bpel.iapi.WSMessageExchange;
import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
import org.apache.ode.bpel.intercept.FailMessageExchangeException;
import org.apache.ode.bpel.intercept.FaultMessageExchangeException;
@@ -49,8 +63,13 @@
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
import org.apache.ode.bpel.memdao.ProcessInstanceDaoImpl;
+import org.apache.ode.bpel.rapi.FaultInfo;
+import org.apache.ode.bpel.rapi.OdeRTInstance;
+import org.apache.ode.bpel.rapi.OdeRuntime;
+import org.apache.ode.bpel.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.ProcessModel;
+import org.apache.ode.bpel.rapi.Serializer;
import org.apache.ode.il.config.OdeConfigProperties;
-import org.apache.ode.bpel.rapi.*;
import org.apache.ode.jacob.soup.ReplacementMap;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
import org.apache.ode.utils.ObjectPrinter;
@@ -90,7 +109,10 @@
/** Deploy-time configuraton for external variables. */
protected ExternalVariableConf _extVarConf;
- protected ExternalVariableManager _evm;
+ protected ExternalVariableManager _evm;
+
+ /** process' context interceptors. */
+ protected List<ContextInterceptor> _ctxInterceptors = new ArrayList<ContextInterceptor>();
ODEProcess(BpelServerImpl server, ProcessConf conf, BpelEventListener debugger, IncomingMessageExchangeCache mexCache) {
_server = server;
@@ -136,7 +158,7 @@
}
/**
- * Intiialize the external variable configuration/engine manager. This is called from hydration logic, so it
+ * Initialize the external variable configuration/engine manager. This is called from hydration logic, so it
* is possible to change the external variable configuration at runtime.
*
*/
@@ -146,6 +168,25 @@
_evm = new ExternalVariableManager(_pid, _extVarConf, _contexts.externalVariableEngines);
}
+ /**
+ * Initialize and configure context interceptors. This is called from hydration logic.
+ */
+ void initContextInterceptors() {
+ _ctxInterceptors = new ArrayList<ContextInterceptor>();
+ Map<String, Element> conf = _pconf.getContextInterceptors();
+ for (String fqcn : conf.keySet()) {
+ try {
+ ContextInterceptor ci = (ContextInterceptor)Class.forName(fqcn).newInstance();
+ ci.configure(conf.get(fqcn));
+ _ctxInterceptors.add(ci);
+ __log.info("Context interceptor " + fqcn + " successfully loaded and configured.");
+ } catch (Exception e) {
+ __log.warn("Couldn't register the context interceptor " + fqcn + ", the class couldn't be "
+ + "loaded properly: " + e);
+ }
+ }
+ }
+
public OdeConfigProperties getProperties() {
return _server.getConfigProperties();
}
@@ -322,7 +363,7 @@
* Process the message-exchange interceptors.
* @return <code>true</code> if execution should continue, <code>false</code> otherwise
*/
- boolean processInterceptors(MessageExchangeDAO mexdao, InterceptorInvoker invoker) {
+ boolean processMexInterceptors(MessageExchangeDAO mexdao, InterceptorInvoker invoker) {
InterceptorContextImpl ictx = new InterceptorContextImpl(_contexts.dao.getConnection(), mexdao, getProcessDAO(), _pconf);
try {
@@ -341,6 +382,7 @@
return true;
}
+
/**
* Handle a work event; this method is called from the scheduler thread and should be very quick, i.e. any serious work needs to
Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEWSProcess.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEWSProcess.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEWSProcess.java (original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEWSProcess.java Tue Nov 24 01:48:48 2009
@@ -1,24 +1,40 @@
package org.apache.ode.bpel.engine;
-import org.apache.ode.bpel.rapi.PartnerLinkModel;
-import org.apache.ode.bpel.rapi.ProcessModel;
-import org.apache.ode.bpel.rapi.ConstantsModel;
-import org.apache.ode.bpel.rapi.InvalidProcessException;
-import org.apache.ode.bpel.iapi.*;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+import javax.wsdl.Operation;
+import javax.xml.namespace.QName;
+
+import org.apache.ode.bpel.dao.MessageDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.iapi.BpelEngineException;
+import org.apache.ode.bpel.iapi.BpelEventListener;
+import org.apache.ode.bpel.iapi.Endpoint;
+import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.bpel.iapi.InvocationStyle;
+import org.apache.ode.bpel.iapi.MessageExchange;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.apache.ode.bpel.iapi.PartnerRoleChannel;
+import org.apache.ode.bpel.iapi.ProcessConf;
import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
import org.apache.ode.bpel.iapi.Scheduler.JobType;
-import org.apache.ode.bpel.dao.MessageExchangeDAO;
-import org.apache.ode.bpel.dao.MessageDAO;
import org.apache.ode.bpel.intercept.InterceptorInvoker;
-import org.apache.ode.utils.*;
-import org.w3c.dom.Element;
+import org.apache.ode.bpel.rapi.ConstantsModel;
+import org.apache.ode.bpel.rapi.InvalidProcessException;
+import org.apache.ode.bpel.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.ProcessModel;
+import org.apache.ode.utils.DOMUtils;
+import org.apache.ode.utils.GUID;
+import org.apache.ode.utils.Namespaces;
import org.w3c.dom.Document;
-
-import javax.xml.namespace.QName;
-import javax.wsdl.Operation;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.io.InputStream;
+import org.w3c.dom.Element;
public class ODEWSProcess extends ODEProcess {
@@ -277,6 +293,7 @@
_partnerRoles = null;
_myRoles = null;
_endpointToMyRoleMap = null;
+ _ctxInterceptors = null;
}
private void doHydrate() {
@@ -298,6 +315,7 @@
setRoles(_processModel);
initExternalVariables();
+ initContextInterceptors();
if (!_hydratedOnce) {
for (PartnerLinkPartnerRoleImpl prole : _partnerRoles.values()) {
@@ -367,7 +385,7 @@
mexdao.setPattern((op.getOutput() == null) ? MessageExchange.MessageExchangePattern.REQUEST_ONLY
: MessageExchange.MessageExchangePattern.REQUEST_RESPONSE);
- if (!processInterceptors(mexdao, InterceptorInvoker.__onProcessInvoked)) {
+ if (!processMexInterceptors(mexdao, InterceptorInvoker.__onProcessInvoked)) {
__log.debug("Aborting processing of mex " + mexdao.getMessageExchangeId() + " due to interceptors.");
onMyRoleMexAck(mexdao, oldstatus);
return;
@@ -381,7 +399,7 @@
}
mexdao.setProcess(getProcessDAO());
-
+
markused();
MyRoleMessageExchange.CorrelationStatus cstatus = target.invokeMyRole(mexdao);
if (cstatus == null) {
@@ -594,14 +612,14 @@
Operation operation = oplink.getPartnerRoleOperation(mexdao.getOperation());
- if (!processInterceptors(mexdao, InterceptorInvoker.__onPartnerInvoked)) {
+ if (!processMexInterceptors(mexdao, InterceptorInvoker.__onPartnerInvoked)) {
__log.debug("Partner invocation intercepted.");
return;
}
-
+
mexdao.setStatus(MessageExchange.Status.REQ);
try {
- if (p2pProcesses != null && p2pProcesses.size() != 0) {
+ if (p2pProcesses != null && p2pProcesses.size() != 0) {
/* P2P (process-to-process) invocation, special logic */
// First, make a copy of the original request message
MessageDAO request = mexdao.getRequest();
Added: ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/ContextValueDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/ContextValueDAOImpl.java?rev=883568&view=auto
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/ContextValueDAOImpl.java (added)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/ContextValueDAOImpl.java Tue Nov 24 01:48:48 2009
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.bpel.memdao;
+
+import org.apache.ode.bpel.dao.ContextValueDAO;
+
+public class ContextValueDAOImpl extends DaoBaseImpl implements ContextValueDAO {
+
+ private String _namespace;
+ private String _key;
+ private String _value;
+
+ public ContextValueDAOImpl() {}
+ public ContextValueDAOImpl(String namespace, String key){
+ _namespace = namespace;
+ _key = key;
+ }
+
+ public String getKey() {
+ return _key;
+ }
+
+ public String getValue() {
+ return _value;
+ }
+
+ public void setValue(String value) {
+ _value = value;
+ }
+
+ public String getNamespace() {
+ return _namespace;
+ }
+
+ public void setKey(String key) {
+ _key = key;
+ }
+
+ public void setNamespace(String namespace) {
+ _namespace = namespace;
+ }
+
+}
Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/PartnerLinkDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/PartnerLinkDAOImpl.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/PartnerLinkDAOImpl.java (original)
+++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/PartnerLinkDAOImpl.java Tue Nov 24 01:48:48 2009
@@ -19,11 +19,16 @@
package org.apache.ode.bpel.memdao;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
-import org.w3c.dom.Element;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
import javax.xml.namespace.QName;
+import org.apache.ode.bpel.dao.ContextValueDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.w3c.dom.Element;
+
/**
* A very simple, in-memory implementation of the
* {@link org.apache.ode.bpel.dao.PartnerLinkDAO} interface.
@@ -47,6 +52,8 @@
private String _partnerSessionId;
private String _mySessionId;
+
+ private Map<String, ContextValueDAO> _contextValues = new HashMap<String, ContextValueDAO>();
public String getPartnerLinkName() {
return _linkName;
@@ -120,4 +127,22 @@
_mySessionId = sessionId;
}
+ public Collection<ContextValueDAO> getContextValues() {
+ return _contextValues.values();
+ }
+
+ public void removeContextValue(String namespace, String key) {
+ _contextValues.remove(namespace + "#:#" + key);
+ }
+
+ public void setContextValue(String namespace, String key, String value) {
+ ContextValueDAO val = _contextValues.get(namespace + "#:#" + key);
+ if (val == null) {
+ val = new ContextValueDAOImpl(namespace, key);
+ _contextValues.put(namespace + "#:#" + key, val);
+ }
+
+ val.setValue(value);
+ }
+
}
Added: ode/trunk/engine/src/test/java/org/apache/ode/bpel/context/ContextDataTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/test/java/org/apache/ode/bpel/context/ContextDataTest.java?rev=883568&view=auto
==============================================================================
--- ode/trunk/engine/src/test/java/org/apache/ode/bpel/context/ContextDataTest.java (added)
+++ ode/trunk/engine/src/test/java/org/apache/ode/bpel/context/ContextDataTest.java Tue Nov 24 01:48:48 2009
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.bpel.context;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.ode.bpel.rapi.ContextData;
+import org.apache.ode.utils.DOMUtils;
+import org.apache.ode.utils.NSContext;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public class ContextDataTest extends TestCase {
+
+ public void testToXML() throws Exception {
+ ContextData cdata = new ContextDataImpl();
+ cdata.put("tracing", "id", "4711");
+ cdata.put("foo", "bar", "baz");
+ cdata.put("foo", "mykey", "myval");
+
+ Node xml = cdata.toXML();
+
+ NSContext nsContext = new NSContext();
+ nsContext.register("ctx", "http://www.apache.org/ode/schemas/context/2009");
+
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ xpath.setNamespaceContext(nsContext);
+ Assert.assertEquals("tracing", xpath.evaluate("/ctx:contexts/ctx:context[1]/@name", xml));
+ Assert.assertEquals("foo", xpath.evaluate("/ctx:contexts/ctx:context[2]/@name", xml));
+
+ Assert.assertEquals("id", xpath.evaluate("/ctx:contexts/ctx:context[1]/ctx:value/@key", xml));
+ Assert.assertEquals("4711", xpath.evaluate("/ctx:contexts/ctx:context[1]/ctx:value", xml));
+ Assert.assertEquals("baz", xpath.evaluate("/ctx:contexts/ctx:context[@name='foo']/ctx:value[@key='bar']", xml));
+ Assert.assertEquals("myval", xpath.evaluate("/ctx:contexts/ctx:context[@name='foo']/ctx:value[@key='mykey']", xml));
+ }
+
+ public void testToXMLFiltered() throws Exception {
+ ContextData cdata = new ContextDataImpl();
+ cdata.put("tracing", "id", "4711");
+ cdata.put("foo", "bar", "baz");
+ cdata.put("foo", "mykey", "myval");
+
+ Set<String> filter = new HashSet<String>();
+ filter.add("tracing");
+
+ Node xml = cdata.toXML(filter);
+
+ NSContext nsContext = new NSContext();
+ nsContext.register("ctx", "http://www.apache.org/ode/schemas/context/2009");
+
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ xpath.setNamespaceContext(nsContext);
+ Assert.assertEquals("tracing", xpath.evaluate("/ctx:contexts/ctx:context[1]/@name", xml));
+ Assert.assertEquals("", xpath.evaluate("/ctx:contexts/ctx:context[2]/@name", xml));
+
+ Assert.assertEquals("id", xpath.evaluate("/ctx:contexts/ctx:context[1]/ctx:value/@key", xml));
+ Assert.assertEquals("4711", xpath.evaluate("/ctx:contexts/ctx:context[1]/ctx:value", xml));
+ Assert.assertEquals("", xpath.evaluate("/ctx:contexts/ctx:context[@name='foo']/ctx:value[@key='bar']", xml));
+ Assert.assertEquals("", xpath.evaluate("/ctx:contexts/ctx:context[@name='foo']/ctx:value[@key='mykey']", xml));
+ }
+
+ public void testFromXML() throws Exception {
+ String doc = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ns:contexts xmlns:ns=\"http://www.apache.org/ode/schemas/context/2009\"><ns:context name=\"tracing\"><ns:value key=\"id\">4711</ns:value></ns:context><ns:context name=\"foo\"><ns:value key=\"bar\">baz</ns:value><ns:value key=\"mykey\">myval</ns:value></ns:context></ns:contexts>";
+ Element el = DOMUtils.stringToDOM(doc);
+
+ ContextData cdata = ContextDataImpl.fromXML(el);
+
+ Assert.assertNotNull(cdata);
+ Assert.assertEquals("4711", cdata.get("tracing", "id"));
+ Assert.assertEquals("baz", cdata.get("foo", "bar"));
+ Assert.assertEquals("myval", cdata.get("foo", "mykey"));
+ Assert.assertNull(cdata.get("foo", "foo"));
+ }
+}
Modified: ode/trunk/il-common/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
URL: http://svn.apache.org/viewvc/ode/trunk/il-common/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/il-common/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java (original)
+++ ode/trunk/il-common/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java Tue Nov 24 01:48:48 2009
@@ -88,6 +88,8 @@
public static final String PROP_EXTENSION_BUNDLES_RT = "extension.bundles.runtime";
public static final String PROP_EXTENSION_BUNDLES_VAL = "extension.bundles.validation";
+
+ public static final String PROP_CONTEXT_INTERCEPTORS = "context.interceptors";
private File _cfgFile;
@@ -288,4 +290,9 @@
public int getAtomicScopeRetryDelay() {
return Integer.valueOf(getProperty(OdeConfigProperties.PROP_ATOMIC_SCOPES_RETRY_DELAY, "60"));
}
+
+ public String getContextInterceptors() {
+ return getProperty(PROP_CONTEXT_INTERCEPTORS);
+ }
+
}
Modified: ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSDL11Endpoint.java
URL: http://svn.apache.org/viewvc/ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSDL11Endpoint.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSDL11Endpoint.java (original)
+++ ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSDL11Endpoint.java Tue Nov 24 01:48:48 2009
@@ -110,7 +110,7 @@
Element serviceRef = doc.createElementNS(Namespaces.WSBPEL2_0_FINAL_SERVREF, "service-ref");
doc.appendChild(serviceRef);
serviceRef.appendChild(doc.importNode(_serviceElmt, true));
- return _serviceElmt.getOwnerDocument();
+ return doc;
}
public Map toMap() {
Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/Messages.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/Messages.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/jbi/src/main/java/org/apache/ode/jbi/Messages.java (original)
+++ ode/trunk/jbi/src/main/java/org/apache/ode/jbi/Messages.java Tue Nov 24 01:48:48 2009
@@ -153,4 +153,8 @@
return format("Registered message exchange interceptor: {0}", interceptorCN);
}
+ public String msgContextInterceptorRegistered(String interceptorCN) {
+ return format("Registered context interceptor: {0}", interceptorCN);
+ }
+
}
Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java (original)
+++ ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java Tue Nov 24 01:48:48 2009
@@ -42,6 +42,7 @@
import org.apache.ode.bpel.extension.ExtensionBundleRuntime;
import org.apache.ode.bpel.extension.ExtensionBundleValidation;
import org.apache.ode.bpel.connector.BpelServerConnector;
+import org.apache.ode.bpel.context.ContextInterceptor;
import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
import org.apache.ode.bpel.engine.BpelServerImpl;
import org.apache.ode.bpel.engine.ProcessAndInstanceManagementMBean;
@@ -128,6 +129,8 @@
registerMexInterceptors();
+ registerContextInterceptors();
+
registerExtensionActivityBundles();
registerMBean();
@@ -352,6 +355,22 @@
}
}
+ private void registerContextInterceptors() {
+ String interceptorsStr = _ode._config.getContextInterceptors();
+ if (interceptorsStr != null) {
+ for (StringTokenizer tokenizer = new StringTokenizer(interceptorsStr, ",;"); tokenizer.hasMoreTokens();) {
+ String interceptorCN = tokenizer.nextToken();
+ try {
+ _ode._server.registerContextInterceptor((ContextInterceptor) Class.forName(interceptorCN).newInstance());
+ __log.info(__msgs.msgContextInterceptorRegistered(interceptorCN));
+ } catch (Exception e) {
+ __log.warn("Couldn't register the context interceptor " + interceptorCN + ", the class couldn't be "
+ + "loaded properly: " + e);
+ }
+ }
+ }
+ }
+
private void registerExtensionActivityBundles() {
String extensionsRTStr = _ode._config.getExtensionActivityBundlesRT();
String extensionsValStr = _ode._config.getExtensionActivityBundlesValidation();
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/common/extension/ExtensibilityQNames.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/common/extension/ExtensibilityQNames.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/common/extension/ExtensibilityQNames.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/common/extension/ExtensibilityQNames.java Tue Nov 24 01:48:48 2009
@@ -30,6 +30,16 @@
public static final QName FAILURE_HANDLING_RETRY_DELAY = new QName(NS_ACTIVITY_RECOVERY, "retryDelay");
public static final QName FAILURE_HANDLING_FAULT_ON = new QName(NS_ACTIVITY_RECOVERY, "faultOnFailure");
+ /*
+ * Context Propagation extensibility elements and attributes
+ */
+ public static final String NS_CONTEXT_PROPAGATION = "http://ode.apache.org/contextPropagation";
+ public static final QName CONTEXT_PROPAGATE = new QName(NS_CONTEXT_PROPAGATION, "propagate");
+ public static final QName CONTEXT_FROM_PARTNER_LINK = new QName(NS_CONTEXT_PROPAGATION, "fromPartnerLink");
+ public static final QName CONTEXT_FROM_VARIABLE = new QName(NS_CONTEXT_PROPAGATION, "fromVariable");
+ public static final QName CONTEXT_CONTEXT = new QName(NS_CONTEXT_PROPAGATION, "context");
+
+
public static final String NS_BPEL_EXTENSIBILITY = "http://ode.apache.org/bpelExtensibility";
public static final QName UNKNOWN_EA_FAULT_NAME = new QName(NS_BPEL_EXTENSIBILITY, "unknownExtensionImplementation");
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OPartnerLink.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OPartnerLink.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OPartnerLink.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OPartnerLink.java Tue Nov 24 01:48:48 2009
@@ -30,6 +30,7 @@
import org.apache.ode.bpel.rapi.CorrelationSetModel;
import org.apache.ode.bpel.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.ScopeModel;
/**
* Compiled representation of a BPEL partnerLink.
@@ -73,6 +74,10 @@
public String getName() {
return name;
}
+
+ public ScopeModel getDeclaringScope() {
+ return declaringScope;
+ }
public boolean hasMyRole() {
return myRolePortType != null;
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeInstanceImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeInstanceImpl.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeInstanceImpl.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeInstanceImpl.java Tue Nov 24 01:48:48 2009
@@ -447,7 +447,7 @@
throw new FaultException(_runtime._oprocess.constants.qnMissingRequest);
try {
- _brc.reply(mexid, plink, opName, element, fault);
+ _brc.reply(mexid, plink, opName, element, fault, null);
} catch (NoSuchOperationException e) {
// reply to operation that is either not defined or one-way. Perhaps this should be detected at compile time?
throw new FaultException(_runtime._oprocess.constants.qnMissingRequest,
@@ -573,7 +573,7 @@
public String invoke(String invokeId, PartnerLinkInstance instance, Operation operation, Element outboundMsg, Object object)
throws FaultException {
try {
- return _brc.invoke(invokeId, instance, operation, outboundMsg);
+ return _brc.invoke(invokeId, instance, operation, outboundMsg, null);
} catch (UninitializedPartnerEPR e) {
throw new FaultException(_runtime._oprocess.constants.qnUninitializedPartnerRole);
}
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITY.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITY.java?rev=883568&r1=883567&r2=883568&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITY.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITY.java Tue Nov 24 01:48:48 2009
@@ -18,19 +18,26 @@
*/
package org.apache.ode.bpel.rtrep.v2;
-import org.apache.ode.bpel.evt.ActivityDisabledEvent;
import java.io.Serializable;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import org.apache.ode.bpel.common.FaultException;
+import org.apache.ode.bpel.evar.ExternalVariableModuleException;
+import org.apache.ode.bpel.evt.ActivityDisabledEvent;
import org.apache.ode.bpel.evt.ActivityEvent;
import org.apache.ode.bpel.evt.EventContext;
import org.apache.ode.bpel.evt.ScopeEvent;
import org.apache.ode.bpel.evt.VariableReadEvent;
-import org.apache.ode.bpel.common.FaultException;
-import org.apache.ode.bpel.evar.ExternalVariableModuleException;
+import org.apache.ode.bpel.rapi.PartnerLink;
+import org.apache.ode.bpel.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.PropagationRule;
import org.apache.ode.jacob.IndexedObject;
import org.w3c.dom.Node;
@@ -143,7 +150,71 @@
void commitChanges(VariableInstance var, Node val) throws ExternalVariableModuleException {
getBpelRuntime().commitChanges(var, _scopeFrame, val);
}
+
+ Set<PropagationRule> computePropagationRules(OComm ocomm, Set<OContextPropagation> propagates) {
+ Map<PartnerLink, Set<String>> contextsByPL = new LinkedHashMap<PartnerLink, Set<String>>();
+
+ if (propagates != null) {
+ for (OContextPropagation p : propagates) {
+ PartnerLink pl = _scopeFrame.resolve(p.fromPartnerLink);
+ Set<String> contexts = contextsByPL.get(pl);
+ if (contexts == null) {
+ contexts = new HashSet<String>();
+ contextsByPL.put(pl, contexts);
+ }
+ if (contexts.contains("*")) {
+ continue;
+ }
+ for (String context : p.contexts) {
+ if (context.equals("*")) {
+ contexts.clear();
+ contexts.add("*");
+ break;
+ } else {
+ contexts.add(context);
+ }
+ }
+ }
+ }
+
+ for (org.apache.ode.bpel.iapi.ProcessConf.PropagationRule p : getBpelRuntime().getPropagationRules()) {
+ PartnerLinkModel pl = _self.o.getOwner().getPartnerLink(p.getFromPL());
+ if (pl == null) {
+ __log.warn("Invoke " + ocomm + " is configured to propagate context information from partner link " + p.getFromPL() + " which could not be resolved. Therefore the propagation rule will be ignored." );
+ continue;
+ }
+ if (p.getToPL().equals(ocomm.getPartnerLink().name)) {
+ Set<String> contexts = contextsByPL.get(pl);
+ if (contexts == null) {
+ contexts = new HashSet<String>();
+ contextsByPL.put(_scopeFrame.resolve(pl), contexts);
+ }
+ if (contexts.contains("*")) {
+ continue;
+ }
+ for (String context : p.getContexts()) {
+ if ("*".equals(context)) {
+ contexts.clear();
+ contexts.add("*");
+ break;
+ } else {
+ contexts.add(context);
+ }
+ }
+ }
+ }
+
+ Set<PropagationRule> ruleset = new LinkedHashSet<PropagationRule>();
+ for (PartnerLink pl : contextsByPL.keySet()) {
+ PropagationRule pr = new PropagationRule();
+ pr.setFromPL(pl);
+ pr.setContexts(contextsByPL.get(pl));
+ ruleset.add(pr);
+ }
+ return ruleset;
+ }
+
public static final class Key implements Serializable {
private static final long serialVersionUID = 1L;