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 2010/05/27 17:27:25 UTC
svn commit: r948860 - in /ode/trunk: ./ axis2-war/src/main/webapp/
axis2-war/src/main/webapp/css/
axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/
axis2-war/src/test/resources/TestSoapHeader2/
bpel-api/src/main/java/org/apache/ode/bpel/iap...
Author: vanto
Date: Thu May 27 15:27:24 2010
New Revision: 948860
URL: http://svn.apache.org/viewvc?rev=948860&view=rev
Log:
merging 1.3.4 release tweaks back to trunk
Removed:
ode/trunk/axis2-war/src/main/webapp/css/SyntaxHighlighter.css
Modified:
ode/trunk/BUILDING
ode/trunk/NOTICE
ode/trunk/RELEASE_NOTES
ode/trunk/axis2-war/src/main/webapp/deployment.html
ode/trunk/axis2-war/src/main/webapp/processes.html
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/HelloWorld2.wsdl
ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.bpel
ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.wsdl
ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.wsdl
ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.xsd
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ClusterAware.java
ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImplTest.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/DeferredProcessInstanceCleanable.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/FilteredInstanceDeletable.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java
ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference.bpel
ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference1.wsdl
ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference2.wsdl
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.xsl
ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
ode/trunk/jbi/src/test/java/org/apache/ode/jbi/RetireJbiTest.java
ode/trunk/jbi/src/test/resources/ReplayerJbiTest/initiateRequest.xml
ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRequest.xml
ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayXQueryRequest.xml
ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel
ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl
ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl
ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml
ode/trunk/jbi/src/test/resources/test.wsdl
ode/trunk/pom.xml
ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java
ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java
ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java
ode/trunk/utils/src/main/java/org/apache/ode/utils/RelativeDateParser.java
Modified: ode/trunk/BUILDING
URL: http://svn.apache.org/viewvc/ode/trunk/BUILDING?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/BUILDING (original)
+++ ode/trunk/BUILDING Thu May 27 15:27:24 2010
@@ -20,17 +20,17 @@ Buildr requires a Ruby interpreter. If y
* Ruby 1.8.x with RubyGems 0.9 or later. For Windows users using the Ruby One-Click Installer is the easiest (http://rubyforge.org/projects/rubyinstaller/). For Linux or Mac OS users, a Ruby interpreter is usually preinstalled. Just make sure to have the ruby-dev package (mkmf is needed for RJB).
- * Buildr. Install it by running 'gem install buildr -v 1.2.10'. A proper JAVA_HOME environment variable must be set. Make sure to choose either win32 or ruby platforms (don't choose java for Antwrap, that's JRuby).
+ * Buildr. Install it by running 'gem install buildr -v 1.3.5'. A proper JAVA_HOME environment variable must be set. Make sure to choose either win32 or ruby platforms (don't choose java for Antwrap, that's JRuby).
Building is then pretty simple. Open a command in the source root directory and run:
-rake package
+buildr _1.3.5_ package
To try the test cases bundled with ODE:
-rake test
+buildr _1.3.5_ test
-It just works! For more information about buildr see http://buildr.rubyforge.org/.
+It just works! For more information about buildr see http://buildr.apache.org/.
Running in Tomcat (WAR deployment)
----------------------------------
Modified: ode/trunk/NOTICE
URL: http://svn.apache.org/viewvc/ode/trunk/NOTICE?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/NOTICE (original)
+++ ode/trunk/NOTICE Thu May 27 15:27:24 2010
@@ -20,6 +20,19 @@ This product includes software developed
http://www.sybase.com
=========================================================================
+== Bubbling Notice ==
+=========================================================================
+
+This product includes software (Javascript Bubbling Library) under a
+BSD license.
+
+Copyright (c) 2007, Caridy Patiño. All rights reserved.
+Portions Copyright (c) 2007, Yahoo!, Inc. All rights reserved.
+Code licensed under the BSD License:
+http://www.bubbling-library.com/eng/licence
+version: 1.5.0
+
+=========================================================================
== Derby Notice ==
=========================================================================
@@ -139,6 +152,16 @@ software also includes:
License 2.0
=========================================================================
+== YUI Notice ==
+=========================================================================
+
+This product includes software developed by the Yahoo! Inc.
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.5.2
+
+=========================================================================
== OASIS Notice ==
=========================================================================
Modified: ode/trunk/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/ode/trunk/RELEASE_NOTES?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/RELEASE_NOTES (original)
+++ ode/trunk/RELEASE_NOTES Thu May 27 15:27:24 2010
@@ -2,19 +2,25 @@
Apache ODE Release Notes
========================
-Apache ODE 1.3.2 includes about 130 bug fixes and new features.
-It's also the most stable version of ODE released so far.
+Apache ODE 1.3.4 includes about 100 bug fixes and new features. It's
+also the most stable version of ODE released so far.
-Apache ODE 1.3.2 requires Java 1.5.x. The WAR distribution can run in
-most J2EE servlet container. The JBI distribution should be able to
-run in any JBI container but has only been tested with ServiceMix
-3.1 so far. See the BUILDING file if you want to build your own
-distribution from the source release.
+Apache ODE 1.3.4 requires Java 1.5.x or higher. The WAR distribution can
+run in most J2EE servlet container. The JBI distribution should be able
+to run in any JBI container but has only been tested with ServiceMix 3.2.1
+and latest ServiceMix 4 (OSGi bundle) so far. See the BUILDING file if you
+want to build your own distribution from the source release.
+
+New Features:
+------------
+ * [ODE-483] - Instance replayer
+ * [ODE-776] - Build support for both Buildr and Maven 2/3
+ * [ODE-778] - Add a possibility to deploy processes as OSGi bundles
+ * [ODE-814] - Add spring confgurable process properties
Changes:
--------
+-------
-See our Jira for more information:
-
-https://issues.apache.org/jira/browse/ODE/fixforversion/12313906
+See our Jira for more information:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310270&styleName=Html&version=12314168
Modified: ode/trunk/axis2-war/src/main/webapp/deployment.html
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/deployment.html?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/deployment.html (original)
+++ ode/trunk/axis2-war/src/main/webapp/deployment.html Thu May 27 15:27:24 2010
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="js/yui/css/button.css" media="screen, projection"/>
<link rel="stylesheet" href="js/bubbling/assets/accordion.css" media="screen, projection"/>
<link rel="stylesheet" type="text/css" href="js/yui/tab/skins/sam/tabview.css"/>
- <link rel="stylesheet" type=="text/css" href="js/codepress/codepress.css"/>
+
<script type="text/javascript" src="js/WSRequest.js">
</script>
<script type="text/javascript" src="js/codepress/codepress.js">
Modified: ode/trunk/axis2-war/src/main/webapp/processes.html
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/processes.html?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/processes.html (original)
+++ ode/trunk/axis2-war/src/main/webapp/processes.html Thu May 27 15:27:24 2010
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="js/yui/css/button.css" media="screen, projection"/>
<link rel="stylesheet" href="js/bubbling/assets/accordion.css" media="screen, projection"/>
<link rel="stylesheet" type="text/css" href="js/yui/tab/skins/sam/tabview.css">
- <link type="text/css" rel="stylesheet" href="css/SyntaxHighlighter.css"></link>
+
<script type="text/javascript" src="js/WSRequest.js">
</script>
<script type="text/javascript" src="js/ProcessManagementAPI.js">
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.axis2.instancecleanup;
import org.apache.ode.bpel.dao.ProcessDAO;
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.axis2.instancecleanup;
import org.apache.commons.logging.LogFactory;
Modified: ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/HelloWorld2.wsdl?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/HelloWorld2.wsdl (original)
+++ ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/HelloWorld2.wsdl Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<wsdl:definitions
targetNamespace="http://ode/bpel/unit-test.wsdl"
Modified: ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/deploy.xml?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/deploy.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/deploy.xml Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<dd:deploy xmlns:dd="http://www.apache.org/ode/schemas/dd/2007/03"><dd:process xmlns:dd="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:tns="http://ode/bpel/unit-test.wsdl" xmlns:service="http://example.com/hello/service" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diag="http://example.com/hello" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:client="http://example.com/hello/client" xmlns:this="http://example.com/hello/process" name="this:process" fileName="hello-process.bpel">
<dd:property name="PATH">hello</dd:property>
<dd:property name="SVG">hello.svg</dd:property>
@@ -8,4 +26,4 @@
<dd:invoke partnerLink="serviceAndProcessForHelloPortPlkVar">
<dd:service name="tns:HelloService" port="HelloPort"></dd:service>
</dd:invoke>
-</dd:process></dd:deploy>
\ No newline at end of file
+</dd:process></dd:deploy>
Modified: ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.bpel?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.bpel (original)
+++ ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.bpel Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<bpel:process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" xmlns:pnlk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ode="http://www.apache.org/ode/type/extension" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:this="http://example.com/hello/process" xmlns:client="http://example.com/hello/client" xmlns:tns="http://ode/bpel/unit-test.wsdl" xmlns:diag="http://example.com/hello" xmlns:service="http://example.com/hello/service" xmlns:bpmn="http://www.intalio.com/bpms" xmlns:atomic="http://ode.apache.org/atomicScope" queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" bpmn:label="process" name="process" bpmn:id="_Ue3NkBenEd6EIOjxNvjNWw" targetNamespace="http://e
xample.com/hello/process">
<bpel:import namespace="http://ode/bpel/unit-test.wsdl" location="HelloWorld2.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
<bpel:import namespace="http://example.com/hello" location="hello.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
@@ -78,4 +96,4 @@
</bpel:assign>
<bpel:reply partnerLink="processAndClientPlkVar" portType="this:Forclient" operation="EventStartMessage" variable="thisEventStartMessageResponse" bpmn:label="Message_End_Event" name="Message_End_Event-1" bpmn:id="_cYnYEBenEd6EIOjxNvjNWw"></bpel:reply>
</bpel:sequence>
-</bpel:process>
\ No newline at end of file
+</bpel:process>
Modified: ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.wsdl?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.wsdl (original)
+++ ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello-process.wsdl Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<wsdl:definitions xmlns:tns="http://ode/bpel/unit-test.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hello="http://ode/bpel/unit-test.wsdl" xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:client="http://example.com/hello/client" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:service="http://example.com/hello/service" xmlns:diag="http://example.com/hello" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pnlk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:this="http://example.com/hello/process" targetNamespace="http://example.com/hello/process">
<wsdl:types>
<xs:schema targetNamespace="http://ode/bpel/unit-test.wsdl">
@@ -37,4 +55,4 @@
<soap:address location="http://localhost:8080/ode/processes/hello/hello/process/client"/>
</wsdl:port>
</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified: ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.wsdl?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.wsdl (original)
+++ ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.wsdl Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<wsdl:definitions xmlns:process="http://example.com/hello/process" xmlns:tns="http://ode/bpel/unit-test.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:diag="http://example.com/hello" xmlns:client="http://example.com/hello/client" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:pnlk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" xmlns:bpdm="http://www.intalio/designer/business-process-data-modeling" targetNamespace="http://example.com/hello">
<wsdl:import namespace="http://ode/bpel/unit-test.wsdl" location="HelloWorld2.wsdl"/>
<wsdl:import namespace="http://example.com/hello/process" location="hello-process.wsdl"/>
@@ -8,4 +26,4 @@
<pnlk:partnerLinkType name="processAndClient">
<pnlk:role name="process_for_client" portType="process:Forclient"/>
</pnlk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified: ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.xsd?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.xsd (original)
+++ ode/trunk/axis2-war/src/test/resources/TestSoapHeader2/hello.xsd Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<xsd:schema targetNamespace="http://ode/bpel/unit-test.wsdl"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
attributeFormDefault="qualified" elementFormDefault="qualified">
Modified: ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ClusterAware.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ClusterAware.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ClusterAware.java (original)
+++ ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ClusterAware.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.iapi;
/**
Modified: ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImplTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImplTest.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImplTest.java (original)
+++ ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImplTest.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.elang.xquery10.compiler;
import java.util.Arrays;
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/DeferredProcessInstanceCleanable.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/DeferredProcessInstanceCleanable.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/DeferredProcessInstanceCleanable.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/DeferredProcessInstanceCleanable.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.dao;
import java.io.Serializable;
Modified: ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/FilteredInstanceDeletable.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/FilteredInstanceDeletable.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/FilteredInstanceDeletable.java (original)
+++ ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/FilteredInstanceDeletable.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.dao;
import java.util.Set;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.engine;
import java.io.Serializable;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/CronScheduler.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.engine.cron;
import java.util.ArrayList;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.engine.cron;
import java.io.Serializable;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.engine.cron;
import java.io.File;
Modified: ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java (original)
+++ ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.engine;
import java.util.Map;
Modified: ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java (original)
+++ ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.bpel.engine.cron;
import java.util.HashMap;
@@ -90,4 +108,4 @@ public class CronSchedulerTest extends M
}
}
}
-}
\ No newline at end of file
+}
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference.bpel?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference.bpel Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<bpel:process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
xmlns:pnlk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
@@ -26,4 +44,4 @@
operation="EventStartMessage" variable="start"
createInstance="yes" name="start" partnerLink="pnlk" />
</bpel:sequence>
-</bpel:process>
\ No newline at end of file
+</bpel:process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference1.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference1.wsdl?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference1.wsdl (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference1.wsdl Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
@@ -47,4 +65,4 @@ targetNamespace="http://example.com/Circ
<soap:address location="http://example.com/hello"/>
</wsdl:port>
</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference2.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference2.wsdl?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference2.wsdl (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/circularReference/CircularReference2.wsdl Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
@@ -44,4 +62,4 @@ targetNamespace="http://example.com/Circ
<soap:address location="http://example.com/hello"/>
</wsdl:port>
</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.xsl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.xsl?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.xsl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.xsl Thu May 27 15:27:24 2010
@@ -1,13 +1,13 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns="http://www.example.org/ProcessData"
- xmlns:tns="http://www.example.org/ProcessData"
- version="1.0">
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:template match="/">
- <root>
- <xsl:text>Hello World</xsl:text>
- </root>
- </xsl:template>
-
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns="http://www.example.org/ProcessData"
+ xmlns:tns="http://www.example.org/ProcessData"
+ version="1.0">
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <root>
+ <xsl:text>Hello World</xsl:text>
+ </root>
+ </xsl:template>
+
</xsl:stylesheet>
\ No newline at end of file
Modified: ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml (original)
+++ ode/trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml Thu May 27 15:27:24 2010
@@ -1,9 +1,28 @@
<?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.
+ -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ode.examples</groupId>
<artifactId>ping-pong-bundle</artifactId>
+ <name>ODE :: Examples :: Ping Pong OSGi</name>
<version>1.3.5-SNAPSHOT</version>
<packaging>bundle</packaging>
Modified: ode/trunk/jbi/src/test/java/org/apache/ode/jbi/RetireJbiTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/java/org/apache/ode/jbi/RetireJbiTest.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/java/org/apache/ode/jbi/RetireJbiTest.java (original)
+++ ode/trunk/jbi/src/test/java/org/apache/ode/jbi/RetireJbiTest.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.jbi;
public class RetireJbiTest extends JbiTestBase {
Modified: ode/trunk/jbi/src/test/resources/ReplayerJbiTest/initiateRequest.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ReplayerJbiTest/initiateRequest.xml?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ReplayerJbiTest/initiateRequest.xml (original)
+++ ode/trunk/jbi/src/test/resources/ReplayerJbiTest/initiateRequest.xml Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<initiate>
<payload>abc7</payload>
<payload2>abc8</payload2>
Modified: ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRequest.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRequest.xml?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRequest.xml (original)
+++ ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayRequest.xml Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<pmap:replay xmlns:ns="http://www.apache.org/ode/pmapi/types/2006/08/02/" xmlns:pmap="http://www.apache.org/ode/pmapi">
<replay>
<!--
Modified: ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayXQueryRequest.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayXQueryRequest.xml?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayXQueryRequest.xml (original)
+++ ode/trunk/jbi/src/test/resources/ReplayerJbiTest/replayXQueryRequest.xml Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<pmap:replay xmlns:ns="http://www.apache.org/ode/pmapi/types/2006/08/02/" xmlns:pmap="http://www.apache.org/ode/pmapi">
<replay>
<!--
Modified: ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel (original)
+++ ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.bpel Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<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"
>
Modified: ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl (original)
+++ ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelation.wsdl Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<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"
>
Modified: ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl (original)
+++ ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/OnEventCorrelationArtifacts.wsdl Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<definitions
xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
xmlns:tns="http://sample.bpel.org/bpel/sampleArtifacts"
Modified: ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml (original)
+++ ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/deploy.xml Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<dd:deploy xmlns:dd="http://www.apache.org/ode/schemas/dd/2007/03"
xmlns:bpel="http://sample.bpel.org/bpel/sample"
>
Modified: ode/trunk/jbi/src/test/resources/test.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/test.wsdl?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/jbi/src/test/resources/test.wsdl (original)
+++ ode/trunk/jbi/src/test/resources/test.wsdl Thu May 27 15:27:24 2010
@@ -1,4 +1,22 @@
<?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.
+ -->
<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/test/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="test" targetNamespace="http://www.example.org/test/">
<wsdl:types>
<xsd:schema targetNamespace="http://www.example.org/test/">
Modified: ode/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/pom.xml?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/pom.xml (original)
+++ ode/trunk/pom.xml Thu May 27 15:27:24 2010
@@ -41,8 +41,8 @@
<annogen.version>0.1.0</annogen.version>
<antlr.version>2.7.7</antlr.version>
<axiom.version>1.2.7</axiom.version>
- <axis2.version>1.3</axis2.version>
- <rampart.version>1.3</rampart.version>
+ <axis2.version>1.5</axis2.version>
+ <rampart.version>1.4</rampart.version>
<commons.codec.version>1.3</commons.codec.version>
<backport.concurrent.version>3.1</backport.concurrent.version>
<commons.fileupload.version>1.2</commons.fileupload.version>
Modified: ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java (original)
+++ ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java Thu May 27 15:27:24 2010
@@ -116,7 +116,7 @@ public class JdbcDelegate implements Dat
+ "inMem,"
+ "detailsExt"
+ " from ODE_JOB "
- + "where nodeid = ? and scheduled = 0 and ts < ? order by ts";
+ + "where nodeid = ? and ts < ? order by ts";
// public Long instanceId;
// public String mexId;
Modified: ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java (original)
+++ ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.scheduler.simple;
import javax.sql.DataSource;
Modified: ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java (original)
+++ ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/RetriesTest.java Thu May 27 15:27:24 2010
@@ -70,7 +70,7 @@ public class RetriesTest extends TestCas
}
Thread.sleep(10000);
- assertEquals(4, _tried);
+ assertEquals(6, _tried);
}
public void testExecTransaction() throws Exception {
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/CronExpression.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.utils;
import java.io.Serializable;
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/RelativeDateParser.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/RelativeDateParser.java?rev=948860&r1=948859&r2=948860&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/RelativeDateParser.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/RelativeDateParser.java Thu May 27 15:27:24 2010
@@ -1,3 +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.
+ */
package org.apache.ode.utils;
import java.text.ParseException;