merging 1.3.4 release tweaks back to trunk

git-svn-id: https://svn.apache.org/repos/asf/ode/trunk@948860 13f79535-47bb-0310-9956-ffa450edef68

BUILDING

@@ -20,17 +20,17 @@ Buildr requires a Ruby interpreter. If you're running Linux or Mac OS you most p
 
  * 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)
 ----------------------------------

NOTICE

@@ -19,6 +19,19 @@ Copyright 2006 Sybase
 This product includes software developed by Sybase.
 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                                                       ==
 =========================================================================
@@ -138,6 +151,16 @@ software also includes:
    Copyright 2002 Yuval Oren under the terms of the Apache Software 
    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                                                       ==
 =========================================================================

RELEASE_NOTES

@@ -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. 
 
-Changes:
--------
+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
 
-See our Jira for more information:
+Changes:
+------- 
 
-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

axis2-war/src/main/webapp/deployment.html

@@ -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">

axis2-war/src/main/webapp/processes.html

@@ -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">

axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java

@@ -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;

axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java

@@ -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;

axis2-war/src/test/resources/TestSoapHeader2/HelloWorld2.wsdl

@@ -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"

axis2-war/src/test/resources/TestSoapHeader2/deploy.xml

@@ -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>
+</dd:process></dd:deploy>