You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2010/04/21 14:01:28 UTC
svn commit: r936273 - in /ode/branches/APACHE_ODE_1.X: ./ bpel-store/
bpel-store/src/main/java/org/apache/ode/store/
jbi/src/test/java/org/apache/ode/jbi/
jbi/src/test/resources/SpringPropertiesJbiTest/
Author: rr
Date: Wed Apr 21 12:01:27 2010
New Revision: 936273
URL: http://svn.apache.org/viewvc?rev=936273&view=rev
Log:
ODE-814: Add spring confgurable process properties + test case
Added:
ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/SpringPropertiesJbiTest.java (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/beans.xml (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml (with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/test.properties (with props)
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=936273&r1=936272&r2=936273&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Wed Apr 21 12:01:27 2010
@@ -198,7 +198,9 @@ define "ode" do
compile.from apt
compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-epr", "bpel-obj", "bpel-schemas",
"bpel-store", "jacob", "jacob-ap", "utils", "agents"),
- COMMONS.logging, COMMONS.collections, COMMONS.httpclient, JAXEN, JAVAX.persistence, JAVAX.stream, SAXON, WSDL4J, XMLBEANS
+ COMMONS.logging, COMMONS.collections, COMMONS.httpclient, JAXEN, JAVAX.persistence, JAVAX.stream, SAXON, WSDL4J, XMLBEANS,
+ SPRING
+
test.with projects("scheduler-simple", "dao-jpa", "dao-hibernate", "bpel-epr"),
BACKPORT, COMMONS.pool, COMMONS.lang, DERBY, JAVAX.connector, JAVAX.transaction,
@@ -234,7 +236,7 @@ define "ode" do
define "bpel-store" do
compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-obj", "bpel-schemas", "bpel-epr",
"dao-hibernate", "dao-jpa", "utils"),
- COMMONS.logging, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, HIBERNATE, HSQLDB, XMLBEANS, XERCES, WSDL4J, OPENJPA
+ COMMONS.logging, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, HIBERNATE, HSQLDB, XMLBEANS, XERCES, WSDL4J, OPENJPA, SPRING
compile { open_jpa_enhance }
resources hibernate_doclet(:package=>"org.apache.ode.store.hib", :excludedtags=>"@version,@author,@todo")
@@ -253,7 +255,7 @@ define "ode" do
test.with projects("bpel-obj", "jacob", "bpel-schemas",
"bpel-scripts", "scheduler-simple"),
COMMONS.collections, COMMONS.lang, COMMONS.logging, DERBY, JAVAX.connector,
- JAVAX.stream, JAVAX.transaction, JAXEN, HSQLDB, LOG4J, SAXON, XERCES, XMLBEANS, XALAN, GERONIMO.transaction
+ JAVAX.stream, JAVAX.transaction, JAXEN, HSQLDB, LOG4J, SAXON, XERCES, XMLBEANS, XALAN, GERONIMO.transaction, SPRING
package :jar
end
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml?rev=936273&r1=936272&r2=936273&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/pom.xml Wed Apr 21 12:01:27 2010
@@ -96,6 +96,11 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java?rev=936273&r1=936272&r2=936273&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java Wed Apr 21 12:01:27 2010
@@ -29,6 +29,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import javax.wsdl.Definition;
@@ -54,6 +55,17 @@ import org.apache.ode.utils.InternPool;
import org.apache.ode.utils.InternPool.InternableBlock;
import org.apache.ode.utils.fs.FileUtils;
import org.apache.xmlbeans.XmlOptions;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.MessageSourceResolvable;
+import org.springframework.context.NoSuchMessageException;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
+import org.springframework.core.io.Resource;
import org.w3c.dom.Node;
/**
@@ -70,6 +82,7 @@ class DeploymentUnitDir {
private String _name;
private File _duDirectory;
private File _descriptorFile;
+ private Properties _properties = new Properties();
private HashMap<QName, CBPInfo> _processes = new HashMap<QName, CBPInfo>();
private HashMap<QName, TDeployment.Process> _processInfo = new HashMap<QName, TDeployment.Process>();
@@ -114,6 +127,17 @@ class DeploymentUnitDir {
if (!_descriptorFile.exists())
throw new IllegalArgumentException("Directory " + dir + " does not contain a deploy.xml file!");
+
+ try {
+ ApplicationContext ctx = new ClassPathXmlApplicationContext("beans.xml");
+ _properties = (java.util.Properties) ctx.getBean("properties");
+ if (__log.isDebugEnabled()) {
+ __log.debug("Loaded spring properties from file beans.xml:" + _properties + " for " + _name);
+ }
+ } catch (Exception e) {
+ __log.info("Can't initialize beans.xml application context " + e + " for " + _name);
+ }
+
}
@@ -350,7 +374,7 @@ class DeploymentUnitDir {
continue;
if (bpelFile.getName().equals(process.getFileName())) {
- Map<QName, Node> props = ProcessStoreImpl.calcInitialProperties(process);
+ Map<QName, Node> props = ProcessStoreImpl.calcInitialProperties(_properties, process);
Map<String, Object> result = new HashMap<String, Object>();
result.put(BpelC.PROCESS_CUSTOM_PROPERTIES, props);
return result;
@@ -396,4 +420,7 @@ class DeploymentUnitDir {
_version = version;
}
+ public Properties getProperties() {
+ return _properties;
+ }
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=936273&r1=936272&r2=936273&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Wed Apr 21 12:01:27 2010
@@ -239,7 +239,7 @@ public class ProcessStoreImpl implements
}
ProcessConfImpl pconf = new ProcessConfImpl(pid, processDD.getName(), version, du, processDD, deployDate,
- calcInitialProperties(processDD), calcInitialState(processDD), eprContext, _configDir, generateProcessEventsAll);
+ calcInitialProperties(du.getProperties(), processDD), calcInitialState(processDD), eprContext, _configDir, generateProcessEventsAll);
processes.add(pconf);
}
@@ -625,8 +625,18 @@ public class ProcessStoreImpl implements
* @param dd
* @return
*/
- public static Map<QName, Node> calcInitialProperties(TDeployment.Process dd) {
+ public static Map<QName, Node> calcInitialProperties(Properties properties, TDeployment.Process dd) {
HashMap<QName, Node> ret = new HashMap<QName, Node>();
+
+ for (Object key1 : properties.keySet()) {
+ String key = (String) key1;
+ Document doc = DOMUtils.newDocument();
+ doc.appendChild(doc.createElementNS(null, "temporary-simple-type-wrapper"));
+ doc.getDocumentElement().appendChild(doc.createTextNode(properties.getProperty(key)));
+
+ ret.put(new QName(key), doc.getDocumentElement());
+ }
+
if (dd.getPropertyList().size() > 0) {
for (TDeployment.Process.Property property : dd.getPropertyList()) {
Element elmtContent = DOMUtils.getElementContent(property.getDomNode());
@@ -692,7 +702,7 @@ public class ProcessStoreImpl implements
continue;
}
- Map<QName, Node> props = calcInitialProperties(pinfo);
+ Map<QName, Node> props = calcInitialProperties(dud.getProperties(), pinfo);
// TODO: update the props based on the values in the DB.
ProcessConfImpl pconf = new ProcessConfImpl(p.getPID(), p.getType(), p.getVersion(), dud, pinfo, dudao
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/SpringPropertiesJbiTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/SpringPropertiesJbiTest.java?rev=936273&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/SpringPropertiesJbiTest.java (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/SpringPropertiesJbiTest.java Wed Apr 21 12:01:27 2010
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ode.jbi;
+
+public class SpringPropertiesJbiTest extends JbiTestBase {
+ public void test() throws Exception {
+ go();
+ }
+}
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/java/org/apache/ode/jbi/SpringPropertiesJbiTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel?rev=936273&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel Wed Apr 21 12:01:27 2010
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpws:process xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://sample.bpel.org/bpel/sampleArtifacts" xmlns:tns="http://sample.bpel.org/bpel/sample" exitOnStandardFault="yes" name="OnEventCorrelation" suppressJoinFailure="yes" targetNamespace="http://sample.bpel.org/bpel/sample" expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ xmlns:ode="http://www.apache.org/ode/type/extension"
+ >
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/" location="OnEventCorrelation.wsdl" namespace="http://sample.bpel.org/bpel/sample"/>
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/" location="OnEventCorrelationArtifacts.wsdl" namespace="http://sample.bpel.org/bpel/sampleArtifacts"/>
+ <bpws:partnerLinks>
+ <bpws:partnerLink myRole="OnEventCorrelationProvider" name="client" partnerLinkType="tns:OnEventCorrelation"/>
+ </bpws:partnerLinks>
+ <bpws:variables>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="input"/>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="output"/>
+ <bpws:variable type="xsd:int" name="i"/>
+ </bpws:variables>
+ <bpws:correlationSets>
+ <bpws:correlationSet name="CorrelationSet" properties="ns:input"/>
+ </bpws:correlationSets>
+ <bpws:sequence name="main">
+ <bpws:scope name="Initialize">
+ <bpws:sequence>
+ <bpws:receive createInstance="yes" operation="initiate" partnerLink="client" portType="tns:OnEventCorrelation" variable="input">
+ <bpws:correlations>
+ <bpws:correlation initiate="yes" set="CorrelationSet"/>
+ </bpws:correlations>
+ </bpws:receive>
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>ode:process-property('weirdProp')</bpws:from>
+ <bpws:to>$output.payload</bpws:to>
+ </bpws:copy>
+ </bpws:assign>
+ <bpws:reply operation="initiate" partnerLink="client" variable="output"/>
+ </bpws:sequence>
+ </bpws:scope>
+ </bpws:sequence>
+</bpws:process>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl?rev=936273&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl Wed Apr 21 12:01:27 2010
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:tns="http://sample.bpel.org/bpel/sample" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" name="OnEventCorrelation" targetNamespace="http://sample.bpel.org/bpel/sample"
+xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+>
+ <message name="OnEventCorrelationMessage">
+ <part type="xsd:string" name="payload"/>
+ <part type="xsd:string" name="payload2"/>
+ </message>
+ <portType name="OnEventCorrelation">
+ <operation name="initiate">
+ <input message="tns:OnEventCorrelationMessage"/>
+ <output message="tns:OnEventCorrelationMessage"/>
+ </operation>
+ <operation name="complete">
+ <input message="tns:OnEventCorrelationMessage"/>
+ <output message="tns:OnEventCorrelationMessage"/>
+ </operation>
+ </portType>
+ <binding name="OnEventCorrelationBinding" type="tns:OnEventCorrelation">
+ <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="initiate">
+ <wsdlsoap:operation soapAction="initiate"/>
+ <input>
+ <wsdlsoap:body use="literal"/>
+ </input>
+ <output>
+ <wsdlsoap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="complete">
+ <wsdlsoap:operation soapAction="complete"/>
+ <input>
+ <wsdlsoap:body use="literal"/>
+ </input>
+ <output>
+ <wsdlsoap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="OnEventCorrelation">
+ <port binding="tns:OnEventCorrelationBinding" name="OnEventCorrelation">
+ <wsdlsoap:address location="http://localhost:8835/ode/processes/OnEventCorrelation/"/>
+ </port>
+ </service>
+ <plnk:partnerLinkType name="OnEventCorrelation">
+ <plnk:role name="OnEventCorrelationProvider" portType="tns:OnEventCorrelation"/>
+ </plnk:partnerLinkType>
+</definitions>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl?rev=936273&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl Wed Apr 21 12:01:27 2010
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:tns="http://sample.bpel.org/bpel/sampleArtifacts"
+ xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:bpel="http://sample.bpel.org/bpel/sample"
+ name="OnEventCorrelationArtifacts"
+ targetNamespace="http://sample.bpel.org/bpel/sampleArtifacts"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ >
+<vprop:property name="input" type="xs:string"/>
+<vprop:propertyAlias messageType="bpel:OnEventCorrelationMessage" part="payload" propertyName="tns:input">
+<!--vprop:query><![CDATA[bpel:input]]></vprop:query-->
+</vprop:propertyAlias>
+<import location="OnEventCorrelation.wsdl" namespace="http://sample.bpel.org/bpel/sample"/>
+</definitions>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/beans.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/beans.xml?rev=936273&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/beans.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/beans.xml Wed Apr 21 12:01:27 2010
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+xmlns:ctx="http://www.springframework.org/schema/context"
+
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+ ">
+
+ <!--
+ <util:properties id="properties" location="/myProcess.properties"/>
+ -->
+ <util:properties id="properties">
+ <prop key="weirdProp">myWeirdPropValue2</prop>
+ </util:properties>
+
+</beans>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/beans.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml?rev=936273&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml Wed Apr 21 12:01:27 2010
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<dd:deploy xmlns:dd="http://www.apache.org/ode/schemas/dd/2007/03"
+ xmlns:bpel="http://sample.bpel.org/bpel/sample"
+ >
+
+ <dd:process
+ name="bpel:OnEventCorrelation" fileName="OnEventCorrelation.bpel">
+ <!--dd:process-events generate="none"/-->
+ <dd:provide partnerLink="client">
+ <dd:service name="bpel:OnEventCorrelation" port="OnEventCorrelation" />
+ </dd:provide>
+ </dd:process>
+</dd:deploy>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml?rev=936273&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml Wed Apr 21 12:01:27 2010
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+ xmlns:http="http://servicemix.apache.org/http/1.0"
+ xmlns:eip="http://servicemix.apache.org/eip/1.0"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:jencks="http://jencks.org/2.0"
+ xmlns:mws="http://ode/bpel/unit-test.wsdl"
+ xmlns:bpel="http://sample.bpel.org/bpel/sample"
+ >
+
+ <util:map id="jndiEntries">
+ <entry key="java:comp/env/jdbc/ode" value-ref="odeDS"/>
+ </util:map>
+
+ <sm:container
+ id="jbi"
+ embedded="true"
+ rootDir="target/test/smx"
+ transactionManager="#transactionManager"
+ depends-on="jndi"
+ >
+ <sm:activationSpecs>
+ <sm:activationSpec id="ms-eip">
+ <sm:component>
+ <eip:component>
+ <eip:endpoints>
+ <eip:content-based-router service="bpel:OnEventCorrelation2Fwd" endpoint="OnEventCorrelation2" forwardOperation="true">
+ <eip:rules>
+ <eip:routing-rule>
+ <eip:target>
+ <eip:exchange-target service="bpel:OnEventCorrelation2"/>
+ </eip:target>
+ </eip:routing-rule>
+ </eip:rules>
+ </eip:content-based-router>
+ </eip:endpoints>
+ </eip:component>
+ </sm:component>
+ </sm:activationSpec>
+ </sm:activationSpecs>
+ </sm:container>
+</beans>
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/test.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/test.properties?rev=936273&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/test.properties (added)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/test.properties Wed Apr 21 12:01:27 2010
@@ -0,0 +1,21 @@
+#
+# 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.
+#
+
+1nmr.service={http://sample.bpel.org/bpel/sample}OnEventCorrelation
+1nmr.operation=initiate
+1request=<message><payload>1000</payload><payload2>t</payload2></message>
+1response=.*myWeirdPropValue2.*
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/SpringPropertiesJbiTest/test.properties
------------------------------------------------------------------------------
svn:eol-style = native