Author: jeff.yuchang Date: 2010-06-02 23:56:31 -0400 (Wed, 02 Jun 2010) New Revision: 695 Modified: branches/ODE/ODE-1.x-fixes/BUILDING branches/ODE/ODE-1.x-fixes/NOTICE branches/ODE/ODE-1.x-fixes/RELEASE_NOTES branches/ODE/ODE-1.x-fixes/Rakefile branches/ODE/ODE-1.x-fixes/axis2-war/src/main/assembly/bin.xml branches/ODE/ODE-1.x-fixes/axis2-war/src/main/webapp/deployment.html branches/ODE/ODE-1.x-fixes/axis2-war/src/main/webapp/processes.html branches/ODE/ODE-1.x-fixes/distro/src/main/assembly/jbi.xml branches/ODE/ODE-1.x-fixes/distro/src/main/assembly/war.xml Log: * upgraded to the released 1.3.4 code base. Modified: branches/ODE/ODE-1.x-fixes/BUILDING =================================================================== --- branches/ODE/ODE-1.x-fixes/BUILDING 2010-06-03 02:22:28 UTC (rev 694) +++ branches/ODE/ODE-1.x-fixes/BUILDING 2010-06-03 03:56:31 UTC (rev 695) @@ -20,17 +20,17 @@ * 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: branches/ODE/ODE-1.x-fixes/NOTICE =================================================================== --- branches/ODE/ODE-1.x-fixes/NOTICE 2010-06-03 02:22:28 UTC (rev 694) +++ branches/ODE/ODE-1.x-fixes/NOTICE 2010-06-03 03:56:31 UTC (rev 695) @@ -20,6 +20,19 @@ 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 @@ 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: branches/ODE/ODE-1.x-fixes/RELEASE_NOTES =================================================================== --- branches/ODE/ODE-1.x-fixes/RELEASE_NOTES 2010-06-03 02:22:28 UTC (rev 694) +++ branches/ODE/ODE-1.x-fixes/RELEASE_NOTES 2010-06-03 03:56:31 UTC (rev 695) @@ -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: +See our Jira for more information: -https://issues.apache.org/jira/browse/ODE/fixforversion/12313906 - +https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310270&styleName=Html&version=12314168 Modified: branches/ODE/ODE-1.x-fixes/Rakefile =================================================================== --- branches/ODE/ODE-1.x-fixes/Rakefile 2010-06-03 02:22:28 UTC (rev 694) +++ branches/ODE/ODE-1.x-fixes/Rakefile 2010-06-03 03:56:31 UTC (rev 695) @@ -126,7 +126,7 @@ end test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-jpa-ojpa-derby").package(:zip)) test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-hibernate-db").package(:zip)) - test.exclude('*') if Buildr.environment == 'hudson' + test.exclude('*') if Buildr.environment == 'hudson' || ENV["notestng"] NativeDB.prepare_configs test, _(".") Modified: branches/ODE/ODE-1.x-fixes/axis2-war/src/main/assembly/bin.xml =================================================================== --- branches/ODE/ODE-1.x-fixes/axis2-war/src/main/assembly/bin.xml 2010-06-03 02:22:28 UTC (rev 694) +++ branches/ODE/ODE-1.x-fixes/axis2-war/src/main/assembly/bin.xml 2010-06-03 03:56:31 UTC (rev 695) @@ -129,8 +129,7 @@ <include>org.apache.geronimo.modules:geronimo-kernel</include> <include>org.apache.geronimo.components:geronimo-transaction</include> <include>org.apache.geronimo.components:geronimo-connector</include> - <include>org.apache.woden:woden-api</include> - <include>org.apache.woden:woden-impl-dom</include> + <include>org.apache.woden:woden</include> <include>woodstox:wstx-asl</include> <include>org.apache.neethi:neethi</include> <include>org.apache.ws.commons.schema:XmlSchema</include> @@ -175,10 +174,7 @@ <dependencySet> <outputDirectory>/WEB-INF/modules</outputDirectory> <includes> - <include>org.apache.rampart:rampart:mar</include> - <include>org.apache.rampart:rahas:mar</include> - <include>org.apache.axis2:addressing:mar</include> - <include>org.apache.axis2:mex:mar</include> + <include>org.apache.axis2:addressing:mar</include> </includes> </dependencySet> Modified: branches/ODE/ODE-1.x-fixes/axis2-war/src/main/webapp/deployment.html =================================================================== --- branches/ODE/ODE-1.x-fixes/axis2-war/src/main/webapp/deployment.html 2010-06-03 02:22:28 UTC (rev 694) +++ branches/ODE/ODE-1.x-fixes/axis2-war/src/main/webapp/deployment.html 2010-06-03 03:56:31 UTC (rev 695) @@ -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: branches/ODE/ODE-1.x-fixes/axis2-war/src/main/webapp/processes.html =================================================================== --- branches/ODE/ODE-1.x-fixes/axis2-war/src/main/webapp/processes.html 2010-06-03 02:22:28 UTC (rev 694) +++ branches/ODE/ODE-1.x-fixes/axis2-war/src/main/webapp/processes.html 2010-06-03 03:56:31 UTC (rev 695) @@ -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: branches/ODE/ODE-1.x-fixes/distro/src/main/assembly/jbi.xml =================================================================== --- branches/ODE/ODE-1.x-fixes/distro/src/main/assembly/jbi.xml 2010-06-03 02:22:28 UTC (rev 694) +++ branches/ODE/ODE-1.x-fixes/distro/src/main/assembly/jbi.xml 2010-06-03 03:56:31 UTC (rev 695) @@ -45,10 +45,10 @@ <directory>${basedir}/../dao-jpa-ojpa-derby/target/</directory> <outputDirectory>/sql</outputDirectory> <includes> - <include>*.sql</include> + <include>*.sql</include> </includes> <excludes> - <exclude>*partial*.sql</exclude> + <exclude>*partial*.sql</exclude> </excludes> </fileSet> @@ -56,10 +56,10 @@ <directory>${basedir}/../</directory> <outputDirectory>/</outputDirectory> <includes> - <include>LICENSE</include> - <include>README</include> - <include>NOTICE</include> - <include>RELEASE_NOTES</include> + <include>LICENSE</include> + <include>README</include> + <include>NOTICE</include> + <include>RELEASE_NOTES</include> </includes> </fileSet> @@ -67,50 +67,9 @@ <directory>${basedir}/license</directory> <outputDirectory>/lib</outputDirectory> <includes> - <include>*LICENSE</include> + <include>*LICENSE</include> </includes> </fileSet> - - <fileSet> - <directory>${basedir}/../extensions/e4x</directory> - <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory> - <includes> - <include>README</include> - </includes> - </fileSet> - - <fileSet> - <directory>${basedir}/../extensions/e4x/target</directory> - <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory> - <includes> - <include>ode-extensions-e4x*.jar</include> - </includes> - </fileSet> - - <fileSet> - <directory>${basedir}/../extensions/jms-eventpublisher</directory> - <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory> - <includes> - <include>README</include> - </includes> - </fileSet> - - <fileSet> - <directory>${basedir}/../extensions/jms-eventpublisher/target</directory> - <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory> - <includes> - <include>ode-extensions-jms*.jar</include> - </includes> - </fileSet> - - <fileSet> - <directory>${basedir}/../extensions</directory> - <outputDirectory>/extensions</outputDirectory> - <includes> - <include>README.extensions</include> - </includes> - </fileSet> - </fileSets> <files> @@ -126,45 +85,29 @@ <dependencySet> <outputDirectory>/lib</outputDirectory> <includes> - <include>org.jboss.soa.bpel:riftsaw-utils</include> - <include>org.jboss.soa.bpel:riftsaw-tools</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-compiler</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-api</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> - <include>commons-logging:commons-logging</include> - <include>org.jboss.soa.bpel:riftsaw-utils</include> - <include>commons-codec:commons-codec</include> - <include>commons-collections:commons-collections</include> - <include>commons-httpclient:commons-httpclient</include> - <include>commons-pool:commons-pool</include> - <include>net.sf.saxon:saxon</include> - <include>net.sf.saxon:saxon-xpath</include> - <include>net.sf.saxon:saxon-dom</include> - <include>net.sf.saxon:saxon-xqj</include> - <include>jaxen:jaxen</include> - <include>log4j:log4j</include> - <include>wsdl4j:wsdl4j</include> - <include>xalan:xalan</include> - <include>xerces:xercesImpl</include> + <include>org.jboss.soa.bpel:riftsaw-utils</include> + <include>org.jboss.soa.bpel:riftsaw-tools</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-compiler</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-api</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-obj</include> + <include>commons-logging:commons-logging</include> + <include>commons-codec:commons-codec</include> + <include>commons-collections:commons-collections</include> + <include>commons-httpclient:commons-httpclient</include> + <include>commons-pool:commons-pool</include> + <include>net.sf.saxon:saxon</include> + <include>net.sf.saxon:saxon-xpath</include> + <include>net.sf.saxon:saxon-dom</include> + <include>net.sf.saxon:saxon-xqj</include> + <include>jaxen:jaxen</include> + <include>log4j:log4j</include> + <include>wsdl4j:wsdl4j</include> + <include>xalan:xalan</include> + <include>xerces:xercesImpl</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>/extensions/ode-extensions-e4x/lib</outputDirectory> - <includes> - <include>rhino:js</include> - <include>commons-logging:commons-logging</include> - </includes> - </dependencySet> - - <dependencySet> - <outputDirectory>/extensions/ode-extensions-jms-eventpublisher/lib</outputDirectory> - <includes> - <include>org.apache.activemq:apache-activemq</include> - <include>org.apache.xmlbeans:xmlbeans</include> - </includes> - </dependencySet> - </dependencySets> </assembly> Modified: branches/ODE/ODE-1.x-fixes/distro/src/main/assembly/war.xml =================================================================== --- branches/ODE/ODE-1.x-fixes/distro/src/main/assembly/war.xml 2010-06-03 02:22:28 UTC (rev 694) +++ branches/ODE/ODE-1.x-fixes/distro/src/main/assembly/war.xml 2010-06-03 03:56:31 UTC (rev 695) @@ -67,47 +67,6 @@ <include>*LICENSE</include> </includes> </fileSet> - - <fileSet> - <directory>${basedir}/../extensions/e4x</directory> - <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory> - <includes> - <include>README</include> - </includes> - </fileSet> - - <fileSet> - <directory>${basedir}/../extensions/e4x/target</directory> - <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory> - <includes> - <include>ode-extensions-e4x*.jar</include> - </includes> - </fileSet> - - <fileSet> - <directory>${basedir}/../extensions/jms-eventpublisher</directory> - <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory> - <includes> - <include>README</include> - </includes> - </fileSet> - - <fileSet> - <directory>${basedir}/../extensions/jms-eventpublisher/target</directory> - <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory> - <includes> - <include>ode-extensions-jms*.jar</include> - </includes> - </fileSet> - - <fileSet> - <directory>${basedir}/../extensions</directory> - <outputDirectory>/extensions</outputDirectory> - <includes> - <include>README.extensions</include> - </includes> - </fileSet> - </fileSets> <files> @@ -124,45 +83,30 @@ <dependencySet> <outputDirectory>/lib</outputDirectory> <includes> - <include>org.jboss.soa.bpel:riftsaw-utils</include> - <include>org.jboss.soa.bpel:riftsaw-tools</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-compiler</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-api</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> - <include>commons-logging:commons-logging</include> - <include>org.jboss.soa.bpel:riftsaw-utils</include> - <include>commons-codec:commons-codec</include> - <include>commons-collections:commons-collections</include> - <include>commons-httpclient:commons-httpclient</include> - <include>commons-pool:commons-pool</include> - <include>net.sf.saxon:saxon</include> - <include>net.sf.saxon:saxon-xpath</include> - <include>net.sf.saxon:saxon-dom</include> - <include>net.sf.saxon:saxon-xqj</include> - <include>jaxen:jaxen</include> - <include>log4j:log4j</include> - <include>wsdl4j:wsdl4j</include> - <include>xalan:xalan</include> - <include>xerces:xercesImpl</include> + <include>org.jboss.soa.bpel:riftsaw-utils</include> + <include>org.jboss.soa.bpel:riftsaw-tools</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-compiler</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-api</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-obj</include> + <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> + <include>commons-logging:commons-logging</include> + <include>commons-codec:commons-codec</include> + <include>commons-collections:commons-collections</include> + <include>commons-httpclient:commons-httpclient</include> + <include>commons-pool:commons-pool</include> + <include>net.sf.saxon:saxon</include> + <include>net.sf.saxon:saxon-xpath</include> + <include>net.sf.saxon:saxon-dom</include> + <include>net.sf.saxon:saxon-xqj</include> + <include>jaxen:jaxen</include> + <include>log4j:log4j</include> + <include>wsdl4j:wsdl4j</include> + <include>xalan:xalan</include> + <include>xerces:xercesImpl</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>/extensions/ode-extensions-e4x/lib</outputDirectory> - <includes> - <include>rhino:js</include> - <include>commons-logging:commons-logging</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>/extensions/ode-extensions-jms-eventpublisher/lib</outputDirectory> - <includes> - <include>org.apache.activemq:apache-activemq</include> - <include>org.apache.xmlbeans:xmlbeans</include> - </includes> - </dependencySet> - </dependencySets> </assembly>