Author: jeff.yuchang Date: 2010-06-21 01:01:48 -0400 (Mon, 21 Jun 2010) New Revision: 764 Added: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/files/hibernate.cfg/sqlserver.properties branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-sqlserver.sql Removed: branches/RiftSaw-ODE-2.1.x/BUILDING branches/RiftSaw-ODE-2.1.x/Rakefile branches/RiftSaw-ODE-2.1.x/Rakefile-riftsaw branches/RiftSaw-ODE-2.1.x/clean.sh branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-derby.sql branches/RiftSaw-ODE-2.1.x/dependencies.rb branches/RiftSaw-ODE-2.1.x/publish.sh branches/RiftSaw-ODE-2.1.x/rebuild.sh branches/RiftSaw-ODE-2.1.x/repositories.rb branches/RiftSaw-ODE-2.1.x/scripts/ branches/RiftSaw-ODE-2.1.x/settings.rb.example branches/RiftSaw-ODE-2.1.x/tasks/ Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ActivityRecoveryDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrSetProperty.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelationSetDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/EventDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/FaultDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MexProperty.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/PartnerLinkDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ScopeDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataProperty.java Log: * RIFTSAW-204, remove the buildr tools. * renaming the JPA's table name from ODE_ to BPEL_ as the table name's prefix. * Adding sqlserver properties and scripts. Deleted: branches/RiftSaw-ODE-2.1.x/BUILDING =================================================================== --- branches/RiftSaw-ODE-2.1.x/BUILDING 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/BUILDING 2010-06-21 05:01:48 UTC (rev 764) @@ -1,75 +0,0 @@ -================================ -Building Apache ODE from Sources -================================ - -If you downloaded the source distribution of ODE you can safely ignore the first paragraph. It's only useful if you want the bleeding edge of ODE. - -Getting the source code ------------------------ - -First you will have to make sure that you have [Subversion|http://svn.tigris.org]. If you don't know what Subversion is or don't have it installed, check [here|http://svnbook.red-bean.com]. Once installed run: - -svn checkout http://svn.apache.org/repos/asf/ode/trunk ode - -For more information or if you have any problem with Subversion (like being behind a proxy or a firewall) check our Source Code documentation (http://ode.apache.org/source-code.html). - -Building With Buildr --------------------- - -Buildr requires a Ruby interpreter. If you're running Linux or Mac OS you most probably already have Ruby installed on your machine. For Winows user Ruby installation is very simple. You will need the following: - - * 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.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: - -buildr _1.3.5_ package - -To try the test cases bundled with ODE: - -buildr _1.3.5_ test - -It just works! For more information about buildr see http://buildr.apache.org/. - -Running in Tomcat (WAR deployment) ----------------------------------- - -You should find the full distribution in the distro-axis2/target directory. Unzip it somewhere on your disk, everything needed is inside. - -Get the WAR file in the distribution root directory (should be named apache-ode-war-x.x.zip), rename it to *ode.war* and copy this file to Tomcat's webapp directory. You should get a blank page under http://localhost:8080/ode. The Ode WAR includes its own embedded database (Derby - http://db.apache.org/derby) so you don't have to worry about configuring any external database for now. - -Testing a Tomcat Deployment ---------------------------- - -Copy the content of examples directory in the distribution (the 3 sub-directories) to _tomcat/webapps/ode/WEB-INF/processes_, this will automatically deploy the 3 example processes. Use the sendsoap command located in the distribution _bin_ directory to send test messages. The messages to run each of the 3 examples are provided in their respective directory (testRequest.soap). For each example type: - -bin/sendsoap http://localhost:8080/ode/processes/helloWorld examples/HelloWorld2/testRequest.soap - -or - -bin/sendsoap.sh http://localhost:8080/ode/processes/helloWorld examples/HelloWorld2/testRequest.soap - -The URLs should be updated according to the address defined in the WSDL file for the process service. - -If you want to use an IDE to explore the PXE sources or debug PXE executables, Eclipse .project and .classpath files are present in all the modules; simply choose File|Import from the Eclipse menu, and select the root ODE directory. You may also use Maven to generate project files for other IDEs. See the Maven documentation for details. - -Running in ServiceMix (JBI deployment) --------------------------------------- - -You should find the full distribution in the distro-jbi/target directory. Unzip it somewhere on your disk, everything needed is inside. - -Get the zip containing ODE's service engine in the distribution root directory (should be named apache-ode-jbi-x.x.zip) and copy it in the install directory of ServiceMix 3.1. Most process deployments will also require HTTP binding so you should also copy the servicemix-shared and servicemix-http zip files from its components directory to its install directory. Start ServiceMix by going into its root directory and type: - -bin/servicemix - -The server should start properly. - -Testing a ServiceMix Deployment -------------------------------- - -JBI examples come with ant scripts to build the service assemblies and test them. It's just a 3 step process: - -1. Go to the example directory and run ant (no need to specify a task, the default one will work). -2. Copy the zip service assembly created in the build subdirectory to the deploy directory of ServiceMix. -3. Run 'ant test' from the example directory. Deleted: branches/RiftSaw-ODE-2.1.x/Rakefile =================================================================== --- branches/RiftSaw-ODE-2.1.x/Rakefile 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/Rakefile 2010-06-21 05:01:48 UTC (rev 764) @@ -1,610 +0,0 @@ -# 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. -# - -gem "buildr", "~>1.3" -require "buildr" -require "buildr/xmlbeans.rb" -require "buildr/openjpa" -require "buildr/javacc" -require "buildr/jetty" -require "buildr/hibernate" - -require File.join(File.dirname(__FILE__), 'repositories.rb') -require File.join(File.dirname(__FILE__), 'dependencies.rb') - -# Keep this structure to allow the build system to update version numbers. -VERSION_NUMBER = "1.3.4" - -BUNDLE_VERSIONS = { - "ode.version" => VERSION_NUMBER, - "commons.collections.version" => artifact(COMMONS.collections).version, - "commons.httpclient.bundle.version" => "3.1_1", - "commons.lang.version" => artifact(COMMONS.lang).version, - "commons.pool.version" => artifact(COMMONS.pool).version, - "derby.version" => artifact(DERBY).version, - "geronimo.specs.version" => "1.1.1", - "servicemix.nmr.version" => "1.1.0-SNAPSHOT", - "servicemix.shared.version" => "2009.02-SNAPSHOT", - "servicemix.specs.version" => "1.4-SNAPSHOT", -} -Release.find.tag_name = lambda { |version| "APACHE_ODE_#{version.upcase}" } if Release.find - -desc "Apache ODE" -define "ode" do - project.version = VERSION_NUMBER - project.group = "org.apache.ode" - - compile.options.source = "1.5" - compile.options.target = "1.5" - manifest["Implementation-Vendor"] = "Apache Software Foundation" - meta_inf << file("NOTICE") - - desc "ODE Axis Integration Layer" - define "axis2" do - compile.with projects("bpel-api", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-runtime", - "scheduler-simple", "bpel-schemas", "bpel-store", "utils", "agents"), - AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.logging, COMMONS.collections, COMMONS.httpclient, COMMONS.lang, - DERBY, GERONIMO.kernel, GERONIMO.transaction, JAVAX.activation, JAVAX.servlet, JAVAX.stream, - JAVAX.transaction, JENCKS, WSDL4J, WS_COMMONS, XMLBEANS, AXIS2_MODULES.libs - - test.exclude 'org.apache.ode.axis2.management.*' - test.with project("tools"), AXIOM, JAVAX.javamail, COMMONS.codec, COMMONS.httpclient, XERCES, WOODSTOX - - package :jar - end - - desc "ODE Axis2 Based Web Application" - define "axis2-war" do - libs = projects("axis2", "bpel-api", "bpel-compiler", "bpel-connector", "bpel-dao", - "bpel-epr", "bpel-obj", "bpel-ql", "bpel-runtime", "scheduler-simple", - "bpel-schemas", "bpel-store", "dao-hibernate", "jacob", "jca-ra", "jca-server", - "utils", "dao-jpa", "agents"), - AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.fileupload, COMMONS.io, COMMONS.httpclient, COMMONS.beanutils, - COMMONS.lang, COMMONS.logging, COMMONS.pool, DERBY, DERBY_TOOLS, JAXEN, JAVAX.activation, JAVAX.ejb, JAVAX.javamail, - JAVAX.connector, JAVAX.jms, JAVAX.persistence, JAVAX.transaction, JAVAX.stream, JIBX, - GERONIMO.connector, GERONIMO.kernel, GERONIMO.transaction, LOG4J, OPENJPA, SAXON, TRANQL, - WOODSTOX, WSDL4J, WS_COMMONS, XALAN, XERCES, XMLBEANS, SPRING, - AXIS2_MODULES.libs - - package(:war).with(:libs=>libs).path("WEB-INF").tap do |web_inf| - web_inf.merge project("dao-jpa-ojpa-derby").package(:zip) - web_inf.merge project("dao-hibernate-db").package(:zip) - web_inf.include project("axis2").path_to("src/main/wsdl/*") - web_inf.include project("bpel-schemas").path_to("src/main/xsd/pmapi.xsd") - end - package(:war).path("WEB-INF/modules").include(artifacts(AXIS2_MODULES.mods)) - package(:war).tap do |root| - root.merge(artifact(AXIS2_WAR)).exclude("WEB-INF/*").exclude("META-INF/*") - end - - task("start"=>[package(:war), jetty.use]) do |task| - class << task ; attr_accessor :url, :path ; end - task.url = "http://localhost:8080/ode" - task.path = jetty.deploy(task.url, task.prerequisites.first) - jetty.teardown task("stop") - end - - task("stop") do |task| - if url = task("start").url rescue nil - jetty.undeploy url - end - end - - test.using :testng, :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'] }, :java_args=>['-Xmx1024M', '-XX:MaxPermSize=1024m'] - test.with projects("tools"), libs, AXIS2_TEST, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, SLF4J, LOG4J - webapp_dir = "#{test.compile.target}/webapp" - test.setup task(:prepare_webapp) do |task| - cp_r _("src/main/webapp"), test.compile.target.to_s - rm_rf Dir[_(webapp_dir) + "/**/.svn"] - cp_r _("src/test/webapp"), test.compile.target.to_s - rm_rf Dir[_(webapp_dir) + "/**/.svn"] - cp_r Dir[_("src/main/webapp/WEB-INF/classes/*")], test.compile.target.to_s - rm_rf Dir[_(webapp_dir) + "/**/.svn"] - cp Dir[project("axis2").path_to("src/main/wsdl/*")], "#{webapp_dir}/WEB-INF" - cp project("bpel-schemas").path_to("src/main/xsd/pmapi.xsd"), "#{webapp_dir}/WEB-INF" - rm_rf Dir[_(webapp_dir) + "/**/.svn"] - mkdir "#{webapp_dir}/WEB-INF/processes" unless File.exist?("#{webapp_dir}/WEB-INF/processes") - mkdir "#{webapp_dir}/WEB-INF/modules" unless File.exist?("#{webapp_dir}/WEB-INF/modules") - # move around some property files for test purposes - mv Dir["#{test.compile.target}/TestEndpointProperties/*_global_conf*.endpoint"], "#{webapp_dir}/WEB-INF/conf" - Dir["#{webapp_dir}/WEB-INF/conf.*"].each {|d| cp "#{webapp_dir}/WEB-INF/conf/global-config.endpoint",d} - artifacts(AXIS2_MODULES.mods).each(&:invoke) - cp AXIS2_MODULES.mods.map {|a| repositories.locate(a)} , "#{webapp_dir}/WEB-INF/modules" - 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' || ENV["notestng"] - - NativeDB.prepare_configs test, _(".") - - test.setup WSSecurity.prepare_secure_services_tests("#{test.resources.target}/TestRampartBasic/secured-services", "sample*.axis2", AXIS2_MODULES.mods) - test.setup WSSecurity.prepare_secure_services_tests("#{test.resources.target}/TestRampartPolicy/secured-services", "sample*-policy.xml", AXIS2_MODULES.mods) - - test.setup WSSecurity.prepare_secure_processes_tests("#{test.resources.target}/TestRampartBasic/secured-processes", AXIS2_MODULES.mods) - test.setup WSSecurity.prepare_secure_processes_tests("#{test.resources.target}/TestRampartPolicy/secured-processes", AXIS2_MODULES.mods) - end - - desc "ODE APIs" - define "bpel-api" do - compile.with projects("utils", "bpel-obj", "bpel-schemas"), WSDL4J, COMMONS.logging - package :jar - end - - desc "ODE JCA connector" - define "bpel-api-jca" do - compile.with project("bpel-api"), JAVAX.connector - package :jar - end - - desc "ODE BPEL Compiler" - define "bpel-compiler" do - compile.with projects("bpel-api", "bpel-obj", "bpel-schemas", "utils"), - COMMONS.logging, JAVAX.stream, JAXEN, SAXON, WSDL4J, XALAN, XERCES, COMMONS.collections - test.resources { filter(project("bpel-scripts").path_to("src/main/resources")).into(test.resources.target).run } - package :jar - test.with SLF4J, LOG4J - end - - desc "ODE JCA Connector Implementation" - define "bpel-connector" do - compile.with projects("bpel-api", "bpel-api-jca", "bpel-runtime", "jca-ra", "jca-server") - package :jar - end - - desc "ODE DAO Interfaces" - define "bpel-dao" do - compile.with project("bpel-api") - package :jar - end - - desc "ODE Interface Layers Common" - define "bpel-epr" do - compile.with projects("utils", "bpel-dao", "bpel-api"), - AXIOM, COMMONS.lang, COMMONS.logging, COMMONS.beanutils, DERBY, JAVAX.connector, JAVAX.stream, JAVAX.transaction, GERONIMO.transaction, GERONIMO.connector, TRANQL, XMLBEANS - package :jar - end - - desc "ODE BPEL Object Model" - define "bpel-obj" do - compile.with project("utils"), SAXON, WSDL4J, COMMONS.collections - package :jar - end - - desc "ODE BPEL Query Language" - define "bpel-ql" do - pkg_name = "org.apache.ode.ql.jcc" - jjtree = jjtree(_("src/main/jjtree"), :in_package=>pkg_name) - compile.from javacc(jjtree, :in_package=>pkg_name), jjtree - compile.with projects("bpel-api", "bpel-compiler", "bpel-obj", "jacob", "utils") - - package :jar - end - - desc "ODE Runtime Engine" - define "bpel-runtime" do - compile.from apt - compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-epr", "bpel-obj", "bpel-schemas", - "bpel-store", "jacob", "jacob-ap", "utils", "agents"), - COMMONS.logging, COMMONS.collections, COMMONS.httpclient, JAXEN, JAVAX.persistence, JAVAX.stream, SAXON, WSDL4J, XMLBEANS, - SPRING - - - test.with projects("scheduler-simple", "dao-jpa", "dao-hibernate", "bpel-epr"), - BACKPORT, COMMONS.pool, COMMONS.lang, DERBY, JAVAX.connector, JAVAX.transaction, - GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, TRANQL, HSQLDB, JAVAX.ejb, - OPENJPA, XERCES, XALAN, LOG4J, SLF4J, - DOM4J, HIBERNATE, - "tranql:tranql-connector-derby-common:jar:1.1" - - package :jar - end - - desc "ODE Simple Scheduler" - define "scheduler-simple" do - compile.with projects("bpel-api", "utils"), COMMONS.collections, COMMONS.logging, JAVAX.transaction, LOG4J - test.compile.with HSQLDB, GERONIMO.kernel, GERONIMO.transaction - test.with HSQLDB, JAVAX.transaction, JAVAX.resource, JAVAX.connector, LOG4J, - GERONIMO.kernel, GERONIMO.transaction, GERONIMO.connector, TRANQL, BACKPORT, JAVAX.ejb - package :jar - end - - desc "ODE Schemas" - define "bpel-schemas" do - compile_xml_beans _("src/main/xsd/*.xsdconfig"), _("src/main/xsd") - package :jar - end - - desc "ODE BPEL Test Script Files" - define "bpel-scripts" do - package :jar - end - - desc "ODE Process Store" - define "bpel-store" do - compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-obj", "bpel-schemas", "bpel-epr", - "dao-hibernate", "dao-jpa", "utils"), - COMMONS.logging, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, HIBERNATE, HSQLDB, XMLBEANS, XERCES, WSDL4J, OPENJPA, SPRING - compile { open_jpa_enhance } - resources hibernate_doclet(:package=>"org.apache.ode.store.hib", :excludedtags=>"@version,@author,@todo") - - test.with COMMONS.collections, COMMONS.lang, JAVAX.connector, JAVAX.transaction, DOM4J, LOG4J, - XERCES, XALAN, JAXEN, SAXON, OPENJPA, GERONIMO.transaction - package :jar - end - - desc "ODE BPEL Tests" - define "bpel-test" do - compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-runtime", - "bpel-store", "utils", "bpel-epr", "dao-hibernate", "agents"), - DERBY, JUnit.dependencies, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient, - COMMONS.codec - - test.with projects("bpel-obj", "jacob", "bpel-schemas", - "bpel-scripts", "scheduler-simple"), - COMMONS.collections, COMMONS.lang, COMMONS.logging, DERBY, JAVAX.connector, - JAVAX.stream, JAVAX.transaction, JAXEN, HSQLDB, LOG4J, SAXON, XERCES, XMLBEANS, XALAN, GERONIMO.transaction, SPRING, HIBERNATE, SLF4J, DOM4J - - package :jar - end - - desc "ODE Hibernate DAO Implementation" - define "dao-hibernate" do - compile.with projects("bpel-api", "bpel-dao", "bpel-ql", "utils"), - COMMONS.lang, COMMONS.logging, JAVAX.transaction, HIBERNATE, DOM4J - resources hibernate_doclet(:package=>"org.apache.ode.daohib.bpel.hobj", :excludedtags=>"@version,@author,@todo") - - # doclet does not support not-found="ignore" - task "hbm-hack" do |task| - process_instance_hbm_file = project.path_to("target/classes/org/apache/ode/daohib/bpel/hobj/HProcessInstance.hbm.xml") - process_instance_hbm = File.read(process_instance_hbm_file) - if !process_instance_hbm.include? "not-found=\"ignore\"" - process_instance_hbm.insert(process_instance_hbm.index("class=\"org.apache.ode.daohib.bpel.hobj.HProcess\"") - 1, "not-found=\"ignore\" ") - File.open(process_instance_hbm_file, "w") { |f| f << process_instance_hbm } - end - end - task "compile" => "hbm-hack" - - test.with project("bpel-epr"), BACKPORT, COMMONS.collections, COMMONS.lang, DERBY, COMMONS.logging, LOG4J, SLF4J, - GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, JAVAX.connector, JAVAX.ejb, SPRING - - package :jar - end - - desc "ODE Hibernate Compatible Databases" - define "dao-hibernate-db" do - predefined_for = lambda { |name| _("src/main/sql/simplesched-#{name}.sql") } - properties_for = lambda { |name| _("src/main/sql/ode.#{name}.properties") } - - dao_hibernate = project("dao-hibernate").compile.target - bpel_store = project("bpel-store").compile.target - - Buildr::Hibernate::REQUIRES[:xdoclet] = Buildr.group("xdoclet", "xdoclet-xdoclet-module", "xdoclet-hibernate-module", - :under=>"xdoclet", :version=>"1.2.3") + ["xdoclet:xjavadoc:jar:1.1-j5"] + projects("dao-hibernate") - - export = lambda do |properties, source, target| - file(target=>[properties, source]) do |task| - mkpath File.dirname(target), :verbose=>false - # Protection against a buildr bug until the fix is released, avoids build failure - - class << task ; attr_accessor :ant ; end - task.enhance { |task| task.ant = Buildr::Hibernate.schemaexport } - - hibernate_schemaexport target do |task, ant| - ant.schemaexport(:properties=>properties.to_s, :quiet=>"yes", :text=>"yes", :delimiter=>";", - :drop=>"no", :create=>"yes", :output=>target) do - ant.fileset(:dir=>source.to_s) { - ant.include :name=>"**/*.hbm.xml" - ant.exclude :name=>"**/HMessageExchangeProperty.hbm.xml"} - end - end - end - end - - runtime_sql = export[ properties_for[:derby], dao_hibernate, _("target/runtime.sql") ] - store_sql = export[ properties_for[:derby], bpel_store, _("target/store.sql") ] - common_sql = _("src/main/sql/common.sql") - derby_sql = concat(_("target/derby.sql")=>[ predefined_for[:derby], common_sql, runtime_sql, store_sql ]) - derby_db = Derby.create(_("target/derby/hibdb")=>derby_sql) - build derby_db - - %w{ mysql firebird hsql postgres sqlserver oracle }.each do |db| - partial = export[ properties_for[db], dao_hibernate, _("target/partial.#{db}.sql") ] - build concat(_("target/#{db}.sql")=>[ common_sql, predefined_for[db], partial ]) - end - - NativeDB.create_dbs self, _("."), :hib - - package(:zip).include(derby_db) - end - - desc "ODE OpenJPA DAO Implementation" - define "dao-jpa" do - compile.with projects("bpel-api", "bpel-dao", "utils"), - COMMONS.collections, COMMONS.logging, JAVAX.connector, JAVAX.persistence, JAVAX.transaction, - OPENJPA, XERCES - compile { open_jpa_enhance } - package :jar - end - - desc "ODE OpenJPA Derby Database" - define "dao-jpa-ojpa-derby" do - %w{ derby mysql oracle }.each do |db| - db_xml = _("src/main/descriptors/persistence.#{db}.xml") - scheduler_sql = _("src/main/scripts/simplesched-#{db}.sql") - common_sql = _("src/main/scripts/common.sql") - partial_sql = file("target/partial.#{db}.sql"=>db_xml) do |task| - mkpath _("target"), :verbose=>false - Buildr::OpenJPA.mapping_tool :properties=>db_xml, :action=>"build", :sql=>task.name, - :classpath=>projects("bpel-store", "dao-jpa", "bpel-api", "bpel-dao", "utils" ) - end - sql = concat(_("target/#{db}.sql")=>[_("src/main/scripts/license-header.sql"), common_sql, partial_sql, scheduler_sql]) - build sql - end - derby_db = Derby.create(_("target/derby/jpadb")=>_("target/derby.sql")) - - test.with projects("bpel-api", "bpel-dao", "bpel-obj", "bpel-epr", "dao-jpa", "utils"), - BACKPORT, COMMONS.collections, COMMONS.lang, COMMONS.logging, GERONIMO.transaction, - GERONIMO.kernel, GERONIMO.connector, HSQLDB, JAVAX.connector, JAVAX.ejb, JAVAX.persistence, - JAVAX.transaction, LOG4J, OPENJPA, XERCES, WSDL4J - - build derby_db - - NativeDB.create_dbs self, _("."), :jpa - - package(:zip).include(derby_db) - end - - desc "ODE JAva Concurrent OBjects" - define "jacob" do - compile.with projects("utils", "jacob-ap"), COMMONS.logging - compile.from apt - - package :jar - end - - desc "ODE Jacob APR Code Generation" - define "jacob-ap" do - package :jar - end - - desc "ODE JBI Integration Layer" - define "jbi" do - compile.with projects("bpel-api", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-obj", - "bpel-runtime", "scheduler-simple", "bpel-schemas", "bpel-store", "utils", "agents"), - AXIOM, COMMONS.logging, COMMONS.pool, JAVAX.transaction, JBI, LOG4J, WSDL4J, XERCES - - package(:jar) - package(:jbi).tap do |jbi| - libs = artifacts(package(:jar), - projects("bpel-api", "bpel-api-jca", "bpel-compiler", "bpel-connector", "bpel-dao", - "bpel-epr", "jca-ra", "jca-server", "bpel-obj", "bpel-ql", "bpel-runtime", - "scheduler-simple", "bpel-schemas", "bpel-store", "dao-hibernate", "dao-jpa", - "jacob", "jacob-ap", "utils", "agents"), - ANT, AXIOM, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.dbcp, COMMONS.lang, COMMONS.pool, - COMMONS.primitives, DERBY, GERONIMO.connector, GERONIMO.transaction, JAXEN, JAVAX.connector, - JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, LOG4J, OPENJPA, - SAXON, TRANQL, XALAN, XERCES, XMLBEANS, WSDL4J) - - jbi.component :type=>:service_engine, :name=>"OdeBpelEngine", :description=>self.comment - jbi.component :class_name=>"org.apache.ode.jbi.OdeComponent", :libs=>libs - jbi.bootstrap :class_name=>"org.apache.ode.jbi.OdeBootstrap", :libs=>libs - jbi.merge project("dao-hibernate-db").package(:zip) - jbi.merge project("dao-jpa-ojpa-derby").package(:zip) - jbi.include path_to("src/main/jbi/ode-jbi.properties") - end - - test.using :properties=>{ "java.naming.factory.initial" => "org.apache.xbean.spring.jndi.SpringInitialContextFactory"}, :java_args=>ENV['TEST_JVM_ARGS'] - test.with projects("dao-jpa", "dao-hibernate", "bpel-compiler", "bpel-api-jca", "jca-ra", - "jca-server", "jacob"), - BACKPORT, COMMONS.lang, COMMONS.io, COMMONS.collections, DERBY, GERONIMO.connector, GERONIMO.kernel, - GERONIMO.transaction, JAVAX.connector, JAVAX.ejb, JAVAX.persistence, JAVAX.stream, - JAVAX.transaction, JAXEN, JBI, OPENJPA, SAXON, SERVICEMIX, SPRING, TRANQL, - XALAN, XBEAN, XMLBEANS, - SLF4J, - LOG4J, - DOM4J, - HIBERNATE - - test.setup unzip(_("target/test/smx/ode")=>project("dao-jpa-ojpa-derby").package(:zip)) - test.setup unzip(_("target/test/smx/ode")=>project("dao-hibernate-db").package(:zip)) - test.setup task(:prepare_jbi_tests) do |task| - cp _("src/test/jbi/ode-jbi.properties"), _("target/test/smx/ode") - cp _("src/main/jbi/hibernate.properties"), _("target/test/smx/ode") - rm_rf Dir["target/test/resources"] - cp_r _("src/test/resources"), _("target/test/resources") - end - end - -# desc "ODE Commmands for Karaf" -# define "jbi-karaf-commands" do -# compile.with projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, COMMONS.logging -# libs = artifacts(projects("bpel-schemas", "jbi"), JBI, KARAF, XMLBEANS, COMMONS.logging) -# package(:bundle).tap do |bnd| -# bnd.bnd_file = _("org.apache.ode.commands.bnd") -# bnd.sourcepath = _("src/main/java") -# bnd.classpath = _("target/classes") + File::PATH_SEPARATOR + libs.join(File::PATH_SEPARATOR) -# bnd.properties.update(BUNDLE_VERSIONS) -# end -# end -# -# desc "ODE JBI Packaging for Karaf" -# define "jbi-karaf" do -# ode_libs = artifacts(projects("bpel-api", "bpel-api-jca", "bpel-compiler", "bpel-connector", "bpel-dao", -# "bpel-epr", "jca-ra", "jca-server", "bpel-obj", "bpel-ql", "bpel-runtime", -# "scheduler-simple", "bpel-schemas", "bpel-store", "dao-hibernate", "dao-jpa", -# "jacob", "jacob-ap", "utils", "agents")) -# libs = artifacts(ANT, AXIOM, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.dbcp, COMMONS.lang, COMMONS.pool, -# COMMONS.primitives, DERBY, GERONIMO.connector, GERONIMO.transaction, JAXEN, JAVAX.connector, -# JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, LOG4J, OPENJPA, -# SAXON, TRANQL, XALAN, XERCES, XMLBEANS, WSDL4J) -# package(:bundle).tap do |bnd| -# bnd.bnd_file = _("bnd.bnd") -# bnd.classpath = (ode_libs + artifacts(project("jbi").package(:jar)) + libs).join(File::PATH_SEPARATOR) -# bnd.properties.update(BUNDLE_VERSIONS) -# -# # inline log4j helper classes -# bnd.properties["log4j.jar"] = artifact(LOG4J).to_s -# -# # inline dao zip files -# zips = artifacts(project("dao-hibernate-db").package(:zip), project("dao-jpa-ojpa-derby").package(:zip)) -# inlines = zips.map{|item| "@" + item.to_s} -# bnd.properties["inlines"] = inlines.join(', ') -# -# # embed jars -# bnd_libs = ode_libs + artifacts(AXIOM, BACKPORT, GERONIMO.connector, JAXEN, -# JAVAX.connector, JAVAX.persistence, JAVAX.ejb, -# OPENJPA, SAXON, TRANQL, -# XALAN, XERCES, XMLBEANS, WSDL4J) -# includes = bnd_libs.map{|item| File.basename(item.to_s)} -# bnd.properties["includes"] = includes.join(', ') -# end -# -# # Generate features.xml -# def package_as_feature(file_name) -# file file_name => [_("src/main/filtered-resources/features.xml")] do -# filter(_("src/main/filtered-resources")).include("features.xml").into(_("target")).using(BUNDLE_VERSIONS).run -# mv _("target/features.xml"), file_name -# end -# end -# def package_as_feature_spec(spec) -# spec.merge({ :type=>:xml, :classifier=>'features' }) -# end -# package(:feature) -# -# end - - desc "ODE JCA Resource Archive" - define "jca-ra" do - compile.with project("utils"), JAVAX.connector - package :jar - end - - desc "ODE JCA Server" - define "jca-server" do - compile.with projects("jca-ra", "utils"), COMMONS.logging - package :jar - end - - desc "ODE Tools" - define "tools" do - compile.with projects("bpel-compiler", "utils"), ANT, COMMONS.httpclient, COMMONS.logging - package :jar - end - - desc "ODE Utils" - define "utils" do - compile.with AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.collections, COMMONS.logging, COMMONS.pool, COMMONS.httpclient, COMMONS.codec, LOG4J, XERCES, JAVAX.stream, WSDL4J, SAXON - # env variable required by HierarchicalPropertiesTest - test.using :environment=>{ 'TEST_DUMMY_ENV_VAR'=>42} - test.exclude "*TestResources" - package :jar - end - - desc "ODE Agents" - define "agents" do - compile - package(:jar).with :manifest=>_("src/main/resources/META-INF/MANIFEST.MF") - end - -end - -define "apache-ode" do - [:version, :group, :manifest, :meta_inf].each { |prop| send "#{prop}=", project("ode").send(prop) } - - def distro(project, postfix) - id = project.parent.id + postfix - # distros require all packages in project("ode") to be built first - project.package(:zip, :id=>id).enhance(project("ode").projects.map(&:packages).flatten) do |pkg| - pkg.path("#{id}-#{version}").tap do |zip| - zip.include meta_inf + ["RELEASE_NOTES", "README"].map { |f| path_to(f) } - zip.path("examples").include project.path_to("src/examples"+postfix), :as=>"." - - # Libraries - zip.path("lib").include artifacts(COMMONS.logging, COMMONS.codec, COMMONS.httpclient, - COMMONS.pool, COMMONS.collections, JAXEN, SAXON, LOG4J, WSDL4J, XALAN, XERCES) - project("ode").projects("utils", "tools", "bpel-compiler", "bpel-api", "bpel-obj", "bpel-schemas"). - map(&:packages).flatten.each do |pkg| - zip.include(pkg.to_s, :as=>"#{pkg.id}.#{pkg.type}", :path=>"lib") - end - - # Including third party licenses - Dir["#{project.path_to("license")}/*LICENSE"].each { |l| zip.include(l, :path=>"lib") } - zip.include(project.path_to("target/LICENSE")) - - # Include supported database schemas - Dir["#{project("ode:dao-jpa-ojpa-derby").path_to("target")}/*.sql"].each do |f| - zip.include(f, :path=>"sql") unless f =~ /partial/ - end - - # Tools scripts (like bpelc and sendsoap) - bins = file(project.path_to("target/bin")=>FileList[project.path_to("src/bin/*")]) do |task| - mkdir_p project.path_to("target/bin") - mkpath task.name - cp task.prerequisites, task.name - chmod 0755, FileList[task.name + "/*"], :verbose=>false - end - bins.invoke - zip.include bins - - yield zip - project.check zip, "should contain mysql.sql" do - it.should contain("sql/mysql.sql") - end - project.check zip, "should contain sendsoap.bat" do - it.should contain("bin/sendsoap.bat") - end - end - end - end - - desc "ODE Axis2 Based Distribution" - define "distro" do - parent.distro(self, "-war") { |zip| zip.include project("ode:axis2-war").package(:war), :as=>"ode.war" } - parent.distro(self, "-jbi") { |zip| zip.include project("ode:jbi").package(:zip) } - - # Preparing third party licenses - build do - Dir.mkdir(project.path_to("target")) unless File.exist?(project.path_to("target")) - cp parent.path_to("LICENSE"), project.path_to("target/LICENSE") - File.open(project.path_to("target/LICENSE"), "a+") do |l| - l << Dir["#{project.path_to("license")}/*LICENSE"].map { |f| "lib/"+f[/[^\/]*$/] }.join("\n") - end - end - - project("ode:axis2-war").task("start").enhance do |task| - target = "#{task.path}/webapp/WEB-INF/processes" - puts "Deploying processes to #{target}" if verbose - verbose(false) do - mkpath target - cp_r FileList[_("src/examples/*")].to_a, target - rm Dir.glob("#{target}/*.deployed") - end - end - end - - package(:zip, :id=>"#{id}-sources").path("#{id}-sources-#{version}").tap do |zip| - if File.exist?(".svn") - `svn status -v`.reject { |l| l[0] == ?? || l[0] == ?D || l.strip.empty? || l[0...3] == "---"}. - map { |l| l.split.last }.reject { |f| File.directory?(f) }. - each { |f| zip.include f, :as=>f } - else - zip.include Dir.pwd, :as=>"." - end - end - - package(:zip, :id=>"#{id}-docs").include(javadoc(project("ode").projects).target) unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i -end - Deleted: branches/RiftSaw-ODE-2.1.x/Rakefile-riftsaw =================================================================== --- branches/RiftSaw-ODE-2.1.x/Rakefile-riftsaw 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/Rakefile-riftsaw 2010-06-21 05:01:48 UTC (rev 764) @@ -1,655 +0,0 @@ -# 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. -# - -gem "buildr", "~>1.2.4" -require "buildr" -require "buildr/xmlbeans.rb" -require "buildr/openjpa" -require "buildr/javacc" -require "buildr/jetty" -require "buildr/hibernate" - -# Keep this structure to allow the build system to update version numbers. -VERSION_NUMBER = "2.0.0.Final" -NEXT_VERSION = "2.0.1" - -ANNONGEN = "annogen:annogen:jar:0.1.0" -ANT = "ant:ant:jar:1.6.5" -AXIOM = [ group("axiom-api", "axiom-impl", "axiom-dom", - :under=>"org.apache.ws.commons.axiom", :version=>"1.2.5") ] -AXIS2_ALL = group("axis2-adb", "axis2-codegen", "axis2-kernel", - "axis2-java2wsdl", "axis2-jibx", "axis2-saaj", "axis2-xmlbeans", - :under=>"org.apache.axis2", :version=>"1.3") -AXIS2_TEST = group("httpcore", "httpcore-nio", "httpcore-niossl", - :under=>"org.apache.httpcomponents", :version=>"4.0-alpha5") -AXIS2_MODULES = struct( - :mods => ["org.apache.rampart:rampart:mar:1.3", - "org.apache.rampart:rahas:mar:1.3", - "org.apache.axis2:addressing:mar:1.3"], - :libs => [group("rampart-core", "rampart-policy", "rampart-trust", - :under=>"org.apache.rampart", - :version=>"1.3"), - "org.apache.ws.security:wss4j:jar:1.5.3", - "org.apache.santuario:xmlsec:jar:1.4.0", - "opensaml:opensaml:jar:1.1b", - "bouncycastle:bcprov-jdk15:jar:140"] -) -AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.3" -BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.0" -COMMONS = struct( - :codec =>"commons-codec:commons-codec:jar:1.3", - :collections =>"commons-collections:commons-collections:jar:3.1", - :dbcp =>"commons-dbcp:commons-dbcp:jar:1.2.1", - :fileupload =>"commons-fileupload:commons-fileupload:jar:1.1.1", - :httpclient =>"commons-httpclient:commons-httpclient:jar:3.0", - :lang =>"commons-lang:commons-lang:jar:2.3", - :logging =>"commons-logging:commons-logging:jar:1.1", - :io =>"commons-io:commons-io:jar:1.4", - :pool =>"commons-pool:commons-pool:jar:1.2", - :primitives =>"commons-primitives:commons-primitives:jar:1.0" -) -DERBY = "org.apache.derby:derby:jar:10.4.1.3" -DERBY_TOOLS = "org.apache.derby:derbytools:jar:10.4.1.3" -DOM4J = "dom4j:dom4j:jar:1.6.1" -GERONIMO = struct( - :kernel =>"org.apache.geronimo.modules:geronimo-kernel:jar:2.0.1", - :transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:2.0.1", - :connector =>"org.apache.geronimo.components:geronimo-connector:jar:2.0.1" -) -HIBERNATE = [ "org.hibernate:hibernate-core:jar:3.3.2.GA", "asm:asm:jar:1.5.3", - "antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.2", "net.sf.ehcache:ehcache:jar:1.2.3" ] -HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7" -JAVAX = struct( - :activation =>"javax.activation:activation:jar:1.1", - #:activation =>"geronimo-spec:geronimo-spec-activation:jar:1.0.2-rc4", - :connector =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0", - :ejb =>"org.apache.geronimo.specs:geronimo-ejb_2.1_spec:jar:1.1", - :javamail =>"geronimo-spec:geronimo-spec-javamail:jar:1.3.1-rc5", - :jms =>"geronimo-spec:geronimo-spec-jms:jar:1.1-rc4", - :persistence =>"javax.persistence:persistence-api:jar:1.0", - :servlet =>"org.apache.geronimo.specs:geronimo-servlet_2.4_spec:jar:1.0", - :stream =>"stax:stax-api:jar:1.0.1", - :transaction =>"org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1", - :resource =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0" -) -JAXEN = "jaxen:jaxen:jar:1.1.1" -JBI = group("org.apache.servicemix.specs.jbi-api-1.0", :under=>"org.apache.servicemix.specs", :version=>"1.1.0") -JENCKS = "org.jencks:jencks:jar:all:1.3" -JIBX = "jibx:jibx-run:jar:1.1-beta3" -LOG4J = "log4j:log4j:jar:1.2.13" -OPENJPA = ["org.apache.openjpa:openjpa:jar:1.3.0-SNAPSHOT", - "net.sourceforge.serp:serp:jar:1.13.1"] - -SAXON = group("saxon", "saxon-xpath", "saxon-dom", "saxon-xqj", :under=>"net.sf.saxon", :version=>"9.x") -SERVICEMIX = [ - group("servicemix-core", - :under=>"org.apache.servicemix", :version=>"3.3"), - group("servicemix-soap", "servicemix-common", "servicemix-shared", "servicemix-http", "servicemix-eip", - :under=>"org.apache.servicemix", :version=>"2008.01"), - group("servicemix-utils", - :under=>"org.apache.servicemix", :version=>"1.0.0"), - "commons-httpclient:commons-httpclient:jar:3.0", - "org.mortbay.jetty:jetty:jar:6.1.12rc1", - "org.mortbay.jetty:jetty-client:jar:6.1.12rc1", - "org.mortbay.jetty:jetty-sslengine:jar:6.1.12rc1", - "org.mortbay.jetty:servlet-api-2.5:jar:6.1.12rc1", - "org.mortbay.jetty:jetty-util:jar:6.1.12rc1", - "org.codehaus.woodstox:wstx-asl:jar:3.2.2", - "org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0.1", - "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1", - "org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.2", - "org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:jar:1.0.1", - "org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1", - "org.jencks:jencks:jar:2.1", - "org.objectweb.howl:howl:jar:1.0.1-1", - "org.apache.activemq:activemq-core:jar:4.1.1", - "org.apache.activemq:activemq-ra:jar:4.1.1", - "commons-beanutils:commons-beanutils:jar:1.7.0", - "tranql:tranql-connector-derby-common:jar:1.1" - ] -SPRING = ["org.springframework:spring:jar:2.5.6"] -TRANQL = [ "tranql:tranql-connector:jar:1.1", "axion:axion:jar:1.0-M3-dev", COMMONS.primitives ] -WOODSTOX = "woodstox:wstx-asl:jar:3.2.1" -WSDL4J = "wsdl4j:wsdl4j:jar:1.6.1" -XALAN = "org.apache.ode:xalan:jar:2.7.0-2" -XERCES = "xerces:xercesImpl:jar:2.9.0" -XSTREAM = "xstream:xstream:jar:1.2" -WS_COMMONS = struct( - :axiom =>AXIOM, - :neethi =>"org.apache.neethi:neethi:jar:2.0.2", - :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.3.2" -) -XBEAN = [ - "org.apache.xbean:xbean-kernel:jar:3.3", - "org.apache.xbean:xbean-server:jar:3.3", - "org.apache.xbean:xbean-spring:jar:3.4.3", - "org.apache.xbean:xbean-classloader:jar:3.4.3" -] -XMLBEANS = "org.apache.xmlbeans:xmlbeans:jar:2.2.0" - -repositories.remote << "http://www.intalio.org/public/maven2" -repositories.remote << "http://people.apache.org/repo/m2-incubating-repository" -repositories.remote << "http://repo1.maven.org/maven2" -repositories.remote << "http://people.apache.org/repo/m2-snapshot-repository" -repositories.remote << "http://download.java.net/maven/2" -repositories.remote << "http://ws.zones.apache.org/repository2" -repositories.release_to[:url] ||= "file:///local/works/repo" - -# Changing releases tag names -class Release - class << self - def tag_with_apache_ode(version) - tag_without_apache_ode("APACHE_ODE_#{version.upcase}") - end - alias_method_chain :tag, :apache_ode - end -end - - -desc "Apache ODE" -#define "ode", :group=>"org.apache.ode", :version=>VERSION_NUMBER do -define "riftsaw" do - project.version = VERSION_NUMBER - project.group = "org.jboss.soa.bpel" - - compile.options.source = "1.5" - compile.options.target = "1.5" - manifest["Implementation-Vendor"] = "JBoss by Red Hat" - meta_inf << file("NOTICE") - - desc "ODE Axis Integration Layer" - define "axis2" do - compile.with projects("bpel-api", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-runtime", - "scheduler-simple", "bpel-schemas", "bpel-store", "utils", "agents"), - AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.logging, COMMONS.collections, COMMONS.httpclient, COMMONS.lang, - DERBY, GERONIMO.kernel, GERONIMO.transaction, JAVAX.activation, JAVAX.servlet, JAVAX.stream, - JAVAX.transaction, JENCKS, WSDL4J, WS_COMMONS, XMLBEANS, AXIS2_MODULES.libs - - test.exclude 'org.apache.ode.axis2.management.*' - test.with project("tools"), AXIOM, JAVAX.javamail, COMMONS.codec, COMMONS.httpclient, XERCES, WOODSTOX - - package :jar - end - - desc "ODE Axis2 Based Web Application" - define "axis2-war" do - libs = projects("axis2", "bpel-api", "bpel-compiler", "bpel-connector", "bpel-dao", - "bpel-epr", "bpel-obj", "bpel-ql", "bpel-runtime", "scheduler-simple", - "bpel-schemas", "bpel-store", "dao-hibernate", "jacob", "jca-ra", "jca-server", - "utils", "dao-jpa", "agents"), - AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.fileupload, COMMONS.io, COMMONS.httpclient, - COMMONS.lang, COMMONS.logging, COMMONS.pool, DERBY, DERBY_TOOLS, JAXEN, JAVAX.activation, JAVAX.ejb, JAVAX.javamail, - JAVAX.connector, JAVAX.jms, JAVAX.persistence, JAVAX.transaction, JAVAX.stream, JIBX, - GERONIMO.connector, GERONIMO.kernel, GERONIMO.transaction, LOG4J, OPENJPA, SAXON, TRANQL, - WOODSTOX, WSDL4J, WS_COMMONS, XALAN, XERCES, XMLBEANS, - AXIS2_MODULES.libs - - package(:war).with(:libs=>libs).path("WEB-INF").tap do |web_inf| - web_inf.merge project("dao-jpa-ojpa-derby").package(:zip) - web_inf.merge project("dao-hibernate-db").package(:zip) - web_inf.include project("axis2").path_to("src/main/wsdl/*") - web_inf.include project("bpel-schemas").path_to("src/main/xsd/pmapi.xsd") - end - package(:war).path("WEB-INF/modules").include(artifacts(AXIS2_MODULES.mods)) - package(:war).tap do |root| - root.merge(artifact(AXIS2_WAR)).exclude("WEB-INF/*").exclude("META-INF/*") - end - - task("start"=>[package(:war), jetty.use]) do |task| - class << task ; attr_accessor :url, :path ; end - task.url = "http://localhost:8080/ode" - task.path = jetty.deploy(task.url, task.prerequisites.first) - jetty.teardown task("stop") - end - - task("stop") do |task| - if url = task("start").url rescue nil - jetty.undeploy url - end - end - - test.using :testng, :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'] } - test.with projects("tools"), libs, AXIS2_TEST, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J - webapp_dir = "#{test.compile.target}/webapp" - test.setup task(:prepare_webapp) do |task| - cp_r _("src/main/webapp"), test.compile.target.to_s - rm_rf Dir[_(webapp_dir) + "/**/.svn"] - cp_r _("src/test/webapp"), test.compile.target.to_s - rm_rf Dir[_(webapp_dir) + "/**/.svn"] - cp Dir[_("src/main/webapp/WEB-INF/classes/*")], test.compile.target.to_s - cp Dir[project("axis2").path_to("src/main/wsdl/*")], "#{webapp_dir}/WEB-INF" - cp project("bpel-schemas").path_to("src/main/xsd/pmapi.xsd"), "#{webapp_dir}/WEB-INF" - rm_rf Dir[_(webapp_dir) + "/**/.svn"] - mkdir "#{webapp_dir}/WEB-INF/processes" unless File.exist?("#{webapp_dir}/WEB-INF/processes") - mkdir "#{webapp_dir}/WEB-INF/modules" unless File.exist?("#{webapp_dir}/WEB-INF/modules") - # move around some property files for test purposes - mv Dir["#{test.compile.target}/TestEndpointProperties/*_global_conf*.endpoint"], "#{webapp_dir}/WEB-INF/conf" - Dir["#{webapp_dir}/WEB-INF/conf.*"].each {|d| cp "#{webapp_dir}/WEB-INF/conf/global-config.endpoint",d} - artifacts(AXIS2_MODULES.mods).each(&:invoke) - cp AXIS2_MODULES.mods.map {|a| repositories.locate(a)} , "#{webapp_dir}/WEB-INF/modules" - 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)) - - NativeDB.prepare_configs test, _(".") - - test.setup WSSecurity.prepare_secure_services_tests("#{test.resources.target}/TestRampartBasic/secured-services", "sample*.axis2", AXIS2_MODULES.mods) - test.setup WSSecurity.prepare_secure_services_tests("#{test.resources.target}/TestRampartPolicy/secured-services", "sample*-policy.xml", AXIS2_MODULES.mods) - - test.setup WSSecurity.prepare_secure_processes_tests("#{test.resources.target}/TestRampartBasic/secured-processes", AXIS2_MODULES.mods) - test.setup WSSecurity.prepare_secure_processes_tests("#{test.resources.target}/TestRampartPolicy/secured-processes", AXIS2_MODULES.mods) - end - - desc "ODE APIs" - define "bpel-api" do - compile.with projects("utils", "bpel-obj", "bpel-schemas"), WSDL4J, COMMONS.logging - package :jar - end - - desc "ODE JCA connector" - define "bpel-api-jca" do - compile.with project("bpel-api"), JAVAX.connector - package :jar - end - - desc "ODE BPEL Compiler" - define "bpel-compiler" do - compile.with projects("bpel-api", "bpel-obj", "bpel-schemas", "utils"), - COMMONS.logging, JAVAX.stream, JAXEN, SAXON, WSDL4J, XALAN, XERCES, COMMONS.collections - test.resources { filter(project("bpel-scripts").path_to("src/main/resources")).into(test.resources.target).run } - package :jar - end - - desc "ODE JCA Connector Implementation" - define "bpel-connector" do - compile.with projects("bpel-api", "bpel-api-jca", "bpel-runtime", "jca-ra", "jca-server") - package :jar - end - - desc "ODE DAO Interfaces" - define "bpel-dao" do - compile.with project("bpel-api") - package :jar - end - - desc "ODE Interface Layers Common" - define "bpel-epr" do - compile.with projects("utils", "bpel-dao", "bpel-api"), - AXIOM, COMMONS.lang, COMMONS.logging, DERBY, JAVAX.connector, JAVAX.stream, JAVAX.transaction, GERONIMO.transaction, GERONIMO.connector, TRANQL, XMLBEANS - package :jar - end - - desc "ODE BPEL Object Model" - define "bpel-obj" do - compile.with project("utils"), SAXON, WSDL4J, COMMONS.collections - package :jar - end - - desc "ODE BPEL Query Language" - define "bpel-ql" do - pkg_name = "org.apache.ode.ql.jcc" - jjtree = jjtree(_("src/main/jjtree"), :in_package=>pkg_name) - compile.from javacc(jjtree, :in_package=>pkg_name), jjtree - compile.with projects("bpel-api", "bpel-compiler", "bpel-obj", "jacob", "utils") - - package :jar - end - - desc "ODE Runtime Engine" - define "bpel-runtime" do - compile.from apt - compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-epr", "bpel-obj", "bpel-schemas", - "bpel-store", "jacob", "jacob-ap", "utils", "agents"), - COMMONS.logging, COMMONS.collections, COMMONS.httpclient, JAXEN, JAVAX.persistence, JAVAX.stream, SAXON, WSDL4J, XMLBEANS - - test.with projects("scheduler-simple", "dao-jpa", "dao-hibernate", "bpel-epr"), - BACKPORT, COMMONS.pool, COMMONS.lang, DERBY, JAVAX.connector, JAVAX.transaction, - GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, TRANQL, HSQLDB, JAVAX.ejb, - LOG4J, XERCES, Buildr::OpenJPA::REQUIRES, XALAN - - package :jar - end - - desc "ODE Simple Scheduler" - define "scheduler-simple" do - compile.with projects("bpel-api", "utils"), COMMONS.collections, COMMONS.logging, JAVAX.transaction - test.compile.with HSQLDB, GERONIMO.kernel, GERONIMO.transaction - test.with HSQLDB, JAVAX.transaction, JAVAX.resource, JAVAX.connector, LOG4J, - GERONIMO.kernel, GERONIMO.transaction, BACKPORT, JAVAX.ejb - package :jar - end - - desc "ODE Schemas" - define "bpel-schemas" do - compile_xml_beans _("src/main/xsd/*.xsdconfig"), _("src/main/xsd") - package :jar - end - - desc "ODE BPEL Test Script Files" - define "bpel-scripts" do - package :jar - end - - desc "ODE Process Store" - define "bpel-store" do - compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-obj", "bpel-schemas", "bpel-epr", - "dao-hibernate", "dao-jpa", "utils"), - COMMONS.logging, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, HIBERNATE, HSQLDB, XMLBEANS, XERCES, WSDL4J, OPENJPA - compile { open_jpa_enhance } - resources hibernate_doclet(:package=>"org.apache.ode.store.hib", :excludedtags=>"@version,@author,@todo") - - test.with COMMONS.collections, COMMONS.lang, JAVAX.connector, JAVAX.transaction, DOM4J, LOG4J, - XERCES, XALAN, JAXEN, SAXON, OPENJPA, GERONIMO.transaction - package :jar - end - - desc "ODE BPEL Tests" - define "bpel-test" do - compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-runtime", - "bpel-store", "utils", "bpel-epr", "dao-jpa", "agents"), - DERBY, Java::JUnit::JUNIT_REQUIRES, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient, - COMMONS.codec - - test.with projects("bpel-obj", "jacob", "bpel-schemas", - "bpel-scripts", "scheduler-simple"), - COMMONS.collections, COMMONS.lang, COMMONS.logging, DERBY, JAVAX.connector, - JAVAX.stream, JAVAX.transaction, JAXEN, HSQLDB, LOG4J, SAXON, XERCES, XMLBEANS, XALAN, GERONIMO.transaction - - package :jar - end - - desc "ODE Hibernate DAO Implementation" - define "dao-hibernate" do - compile.with projects("bpel-api", "bpel-dao", "bpel-ql", "utils"), - COMMONS.lang, COMMONS.logging, JAVAX.transaction, HIBERNATE, DOM4J - resources hibernate_doclet(:package=>"org.apache.ode.daohib.bpel.hobj", :excludedtags=>"@version,@author,@todo") - - # doclet does not support not-found="ignore" - build { - process_instance_hbm_file = project.path_to("target/classes/org/apache/ode/daohib/bpel/hobj/HProcessInstance.hbm.xml") - process_instance_hbm = File.read(process_instance_hbm_file) - if !process_instance_hbm.include? "not-found=\"ignore\"" - process_instance_hbm.insert(process_instance_hbm.index("class=\"org.apache.ode.daohib.bpel.hobj.HProcess\"") - 1, "not-found=\"ignore\" ") - File.open(process_instance_hbm_file, "w") { |f| f << process_instance_hbm } - end - } - - test.with project("bpel-epr"), BACKPORT, COMMONS.collections, COMMONS.lang, HSQLDB, - GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, JAVAX.connector, JAVAX.ejb, SPRING - - package :jar - end - - desc "ODE Hibernate Compatible Databases" - define "dao-hibernate-db" do - predefined_for = lambda { |name| _("src/main/sql/simplesched-#{name}.sql") } - properties_for = lambda { |name| _("src/main/sql/ode.#{name}.properties") } - - dao_hibernate = project("dao-hibernate").compile.target - bpel_store = project("bpel-store").compile.target - - Buildr::Hibernate::REQUIRES[:xdoclet] = Buildr.group("xdoclet", "xdoclet-xdoclet-module", "xdoclet-hibernate-module", - :under=>"xdoclet", :version=>"1.2.3") + ["xdoclet:xjavadoc:jar:1.1-j5"] - - export = lambda do |properties, source, target| - file(target=>[properties, source]) do |task| - mkpath File.dirname(target), :verbose=>false - # Protection against a buildr bug until the fix is released, avoids build failure - - class << task ; attr_accessor :ant ; end - task.enhance { |task| task.ant = Buildr::Hibernate.schemaexport } - - hibernate_schemaexport target do |task, ant| - ant.schemaexport(:properties=>properties.to_s, :quiet=>"yes", :text=>"yes", :delimiter=>";", - :drop=>"no", :create=>"yes", :output=>target) do - ant.fileset(:dir=>source.to_s) { - ant.include :name=>"**/*.hbm.xml" - ant.exclude :name=>"**/HMessageExchangeProperty.hbm.xml"} - end - end - end - end - - runtime_sql = export[ properties_for[:derby], dao_hibernate, _("target/runtime.sql") ] - store_sql = export[ properties_for[:derby], bpel_store, _("target/store.sql") ] - common_sql = _("src/main/sql/common.sql") - derby_sql = concat(_("target/derby.sql")=>[ predefined_for[:derby], common_sql, runtime_sql, store_sql ]) - derby_db = Derby.create(_("target/derby/hibdb")=>derby_sql) - build derby_db - - %w{ mysql firebird hsql postgres sqlserver oracle }.each do |db| - partial = export[ properties_for[db], dao_hibernate, _("target/partial.#{db}.sql") ] - build concat(_("target/#{db}.sql")=>[ common_sql, predefined_for[db], partial ]) - end - - NativeDB.create_dbs self, _("."), :hib - - package(:zip).include(derby_db) - end - - desc "ODE OpenJPA DAO Implementation" - define "dao-jpa" do - compile.with projects("bpel-api", "bpel-dao", "utils"), - COMMONS.collections, COMMONS.logging, JAVAX.connector, JAVAX.persistence, JAVAX.transaction, - OPENJPA, XERCES - compile { open_jpa_enhance } - package :jar - end - - desc "ODE OpenJPA Derby Database" - define "dao-jpa-ojpa-derby" do - %w{ derby mysql oracle }.each do |db| - db_xml = _("src/main/descriptors/persistence.#{db}.xml") - scheduler_sql = _("src/main/scripts/simplesched-#{db}.sql") - common_sql = _("src/main/scripts/common.sql") - partial_sql = file("target/partial.#{db}.sql"=>db_xml) do |task| - mkpath _("target"), :verbose=>false - Buildr::OpenJPA.mapping_tool :properties=>db_xml, :action=>"build", :sql=>task.name, - :classpath=>projects("bpel-store", "dao-jpa", "bpel-api", "bpel-dao", "utils" ) - end - sql = concat(_("target/#{db}.sql")=>[_("src/main/scripts/license-header.sql"), common_sql, partial_sql, scheduler_sql]) - build sql - end - derby_db = Derby.create(_("target/derby/jpadb")=>_("target/derby.sql")) - - test.with projects("bpel-api", "bpel-dao", "bpel-obj", "bpel-epr", "dao-jpa", "utils"), - BACKPORT, COMMONS.collections, COMMONS.lang, COMMONS.logging, GERONIMO.transaction, - GERONIMO.kernel, GERONIMO.connector, HSQLDB, JAVAX.connector, JAVAX.ejb, JAVAX.persistence, - JAVAX.transaction, LOG4J, OPENJPA, XERCES, WSDL4J - - build derby_db - - NativeDB.create_dbs self, _("."), :jpa - - package(:zip).include(derby_db) - end - - desc "ODE JAva Concurrent OBjects" - define "jacob" do - compile.with projects("utils", "jacob-ap"), COMMONS.logging - compile.from apt - - package :jar - end - - desc "ODE Jacob APR Code Generation" - define "jacob-ap" do - compile.with Java.tools_jar - package :jar - end - - desc "ODE JBI Integration Layer" - define "jbi" do - compile.with projects("bpel-api", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-obj", - "bpel-runtime", "scheduler-simple", "bpel-schemas", "bpel-store", "utils", "agents"), - AXIOM, COMMONS.logging, COMMONS.pool, JAVAX.transaction, JBI, LOG4J, WSDL4J, XERCES - - package(:jar) - package(:jbi).tap do |jbi| - libs = artifacts(package(:jar), - projects("bpel-api", "bpel-api-jca", "bpel-compiler", "bpel-connector", "bpel-dao", - "bpel-epr", "jca-ra", "jca-server", "bpel-obj", "bpel-ql", "bpel-runtime", - "scheduler-simple", "bpel-schemas", "bpel-store", "dao-hibernate", "dao-jpa", - "jacob", "jacob-ap", "utils", "agents"), - ANT, AXIOM, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.dbcp, COMMONS.lang, COMMONS.pool, - COMMONS.primitives, DERBY, GERONIMO.connector, GERONIMO.transaction, JAXEN, JAVAX.connector, - JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream, JAVAX.transaction, LOG4J, OPENJPA, - SAXON, TRANQL, XALAN, XERCES, XMLBEANS, XSTREAM, WSDL4J) - - jbi.component :type=>:service_engine, :name=>"OdeBpelEngine", :description=>self.comment - jbi.component :class_name=>"org.apache.ode.jbi.OdeComponent", :libs=>libs - jbi.bootstrap :class_name=>"org.apache.ode.jbi.OdeBootstrap", :libs=>libs - jbi.merge project("dao-hibernate-db").package(:zip) - jbi.merge project("dao-jpa-ojpa-derby").package(:zip) - jbi.include path_to("src/main/jbi/ode-jbi.properties") - end - - test.using :properties=>{ "java.naming.factory.initial" => "org.apache.xbean.spring.jndi.SpringInitialContextFactory"} - test.with projects("dao-jpa", "dao-hibernate", "bpel-compiler", "bpel-api-jca", "jca-ra", - "jca-server", "jacob"), - BACKPORT, COMMONS.lang, COMMONS.collections, DERBY, GERONIMO.connector, GERONIMO.kernel, - GERONIMO.transaction, JAVAX.connector, JAVAX.ejb, JAVAX.persistence, JAVAX.stream, - JAVAX.transaction, JAXEN, JBI, OPENJPA, SAXON, SERVICEMIX, SPRING, TRANQL, - XALAN, XBEAN, XMLBEANS, XSTREAM, - LOG4J - - test.setup unzip(_("target/test/smx/ode")=>project("dao-jpa-ojpa-derby").package(:zip)) - test.setup unzip(_("target/test/smx/ode")=>project("dao-hibernate-db").package(:zip)) - test.setup task(:prepare_jbi_tests) do |task| - cp _("src/main/jbi/ode-jbi.properties"), _("target/test/smx/ode") - cp _("src/main/jbi/hibernate.properties"), _("target/test/smx/ode") - rm_rf Dir["target/test/resources"] - cp_r _("src/test/resources"), _("target/test/resources") - end - end - - desc "ODE JCA Resource Archive" - define "jca-ra" do - compile.with project("utils"), JAVAX.connector - package :jar - end - - desc "ODE JCA Server" - define "jca-server" do - compile.with projects("jca-ra", "utils"), COMMONS.logging - package :jar - end - - desc "ODE Tools" - define "tools" do - compile.with projects("bpel-compiler", "utils"), ANT, COMMONS.httpclient, COMMONS.logging - package :jar - end - - desc "ODE Utils" - define "utils" do - compile.with AXIOM, AXIS2_ALL, COMMONS.lang, COMMONS.collections, COMMONS.logging, COMMONS.pool, COMMONS.httpclient, COMMONS.codec, LOG4J, XERCES, JAVAX.stream, WSDL4J, SAXON - # env variable requires by HierarchicalPropertiesTest - ENV['TEST_DUMMY_ENV_VAR'] = "42" - test.exclude "*TestResources" - package :jar - end - - desc "ODE Agents" - define "agents" do - compile - package(:jar, :manifest=>_("target/classes/META-INF/MANIFEST.MF")) - end - -end - -define "jboss-riftsaw" do - [:version, :group, :manifest, :meta_inf].each { |prop| send "#{prop}=", project("riftsaw").send(prop) } - - def distro(project, postfix) - id = project.parent.id + postfix - # distros require all packages in project("riftsaw") to be built first - project.package(:zip, :id=>id).enhance(project("riftsaw").projects.map(&:packages).flatten) do |pkg| - pkg.path("#{id}-#{version}").tap do |zip| - zip.include meta_inf + ["RELEASE_NOTES", "README"].map { |f| path_to(f) } - zip.path("examples").include project.path_to("src/examples"+postfix), :as=>"." - - # Libraries - zip.path("lib").include artifacts(COMMONS.logging, COMMONS.codec, COMMONS.httpclient, - COMMONS.pool, COMMONS.collections, JAXEN, SAXON, LOG4J, WSDL4J, XALAN, XERCES) - project("riftsaw").projects("utils", "tools", "bpel-compiler", "bpel-api", "bpel-obj", "bpel-schemas"). - map(&:packages).flatten.each do |pkg| - zip.include(pkg.to_s, :as=>"#{pkg.id}.#{pkg.type}", :path=>"lib") - end - - # Including third party licenses - Dir["#{project.path_to("license")}/*LICENSE"].each { |l| zip.include(l, :path=>"lib") } - zip.include(project.path_to("target/LICENSE")) - - # Include supported database schemas - Dir["#{project("riftsaw:dao-jpa-ojpa-derby").path_to("target")}/*.sql"].each do |f| - zip.include(f, :path=>"sql") unless f =~ /partial/ - end - - # Tools scripts (like bpelc and sendsoap) - mkdir_p project.path_to("target/bin") - mkpath _("target/bin") - cp Dir[project.path_to("src/bin/*")], project.path_to("target/bin") - chmod 0755, FileList[project.path_to("target/bin") + "/*"], :verbose=>false - zip.include(project.path_to("target/bin")) - - yield zip - project.check zip, "should contain mysql.sql" do - it.should contain("sql/mysql.sql") - end - end - end - end - - desc "ODE Axis2 Based Distribution" - define "distro" do - parent.distro(self, "-war") { |zip| zip.include project("riftsaw:axis2-war").package(:war), :as=>"bpel.war" } - parent.distro(self, "-jbi") { |zip| zip.include project("riftsaw:jbi").package(:zip) } - - # Preparing third party licenses - build do - Dir.mkdir(project.path_to("target")) unless File.exist?(project.path_to("target")) - cp parent.path_to("LICENSE"), project.path_to("target/LICENSE") - File.open(project.path_to("target/LICENSE"), "a+") do |l| - l << Dir["#{project.path_to("license")}/*LICENSE"].map { |f| "lib/"+f[/[^\/]*$/] }.join("\n") - end - end - - project("riftsaw:axis2-war").task("start").enhance do |task| - target = "#{task.path}/webapp/WEB-INF/processes" - puts "Deploying processes to #{target}" if verbose - verbose(false) do - mkpath target - puts "#{target}" - cp_r FileList[_("src/examples/*")].to_a, target - rm Dir.glob("#{target}/*.deployed") - end - end - end - - package(:zip, :id=>"#{id}-sources").path("#{id}-sources-#{version}").tap do |zip| - if File.exist?(".svn") - `svn status -v`.reject { |l| l[0] == ?? || l[0] == ?D || l.strip.empty? || l[0...3] == "---"}. - map { |l| l.split.last }.reject { |f| File.directory?(f) }. - each { |f| zip.include f, :as=>f } - else - zip.include Dir.pwd, :as=>"." - end - end - - package(:zip, :id=>"#{id}-docs").include(javadoc(project("riftsaw").projects).target) unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i -end - Deleted: branches/RiftSaw-ODE-2.1.x/clean.sh =================================================================== --- branches/RiftSaw-ODE-2.1.x/clean.sh 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/clean.sh 2010-06-21 05:01:48 UTC (rev 764) @@ -1,2 +0,0 @@ -#!/bin/sh -buildr _1.2.4_ -f Rakefile-riftsaw TEST=no clean Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ActivityRecoveryDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ActivityRecoveryDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ActivityRecoveryDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -41,7 +41,7 @@ @Entity -@Table(name="ODE_ACTIVITY_RECOVERY") +@Table(name="BPEL_ACTIVITY_RECOVERY") @NamedQueries({ @NamedQuery(name=ActivityRecoveryDAOImpl.DELETE_ACTIVITY_RECOVERIES_BY_IDS, query="delete from ActivityRecoveryDAOImpl as a where a._instanceId in(:ids)"), @NamedQuery(name=ActivityRecoveryDAOImpl.COUNT_ACTIVITY_RECOVERIES_BY_INSTANCES, Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrSetProperty.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrSetProperty.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrSetProperty.java 2010-06-21 05:01:48 UTC (rev 764) @@ -36,7 +36,7 @@ * @author Matthieu Riou <mriou at apache dot org> */ @Entity -@Table(name="ODE_CORSET_PROP") +@Table(name="BPEL_CORSET_PROP") @NamedQueries({ @NamedQuery(name=CorrSetProperty.DELETE_CORSET_PROPERTIES_BY_PROPERTY_IDS, query="delete from CorrSetProperty as p where p.corrSetId in(:corrSetIds)") }) Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelationSetDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelationSetDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelationSetDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -46,7 +46,7 @@ import java.util.Map; @Entity -@Table(name="ODE_CORRELATION_SET") +@Table(name="BPEL_CORRELATION_SET") @NamedQueries({ @NamedQuery(name=CorrelationSetDAOImpl.DELETE_CORRELATION_SETS_BY_IDS, query="delete from CorrelationSetDAOImpl as c where c._correlationSetId in (:ids)"), @NamedQuery(name=CorrelationSetDAOImpl.SELECT_CORRELATION_SETS_BY_INSTANCES, query="select c from CorrelationSetDAOImpl as c left join fetch c._scope left join fetch c._props where c._scope._processInstance._instanceId in (:instances)"), Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -32,7 +32,7 @@ import java.util.List; @Entity -@Table(name = "ODE_CORRELATOR") +@Table(name = "BPEL_CORRELATOR") @NamedQueries( { @NamedQuery(name = CorrelatorDAOImpl.DELETE_CORRELATORS_BY_PROCESS, query = "delete from CorrelatorDAOImpl as c where c._process = :process") }) public class CorrelatorDAOImpl extends BpelDAO implements CorrelatorDAO { private static Log __log = LogFactory.getLog(CorrelatorDAOImpl.class); Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/EventDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/EventDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/EventDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -41,7 +41,7 @@ * @author Matthieu Riou <mriou at apache dot org> */ @Entity -@Table(name="ODE_EVENT") +@Table(name="BPEL_EVENT") @NamedQueries({ @NamedQuery(name=EventDAOImpl.SELECT_EVENT_IDS_BY_PROCESS, query="select e._id from EventDAOImpl as e where e._instance._process = :process"), @NamedQuery(name=EventDAOImpl.DELETE_EVENTS_BY_IDS, query="delete from EventDAOImpl as e where e._id in (:ids)"), Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/FaultDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/FaultDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/FaultDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -37,7 +37,7 @@ @Entity -@Table(name="ODE_FAULT") +@Table(name="BPEL_FAULT") @NamedQueries({ @NamedQuery(name=FaultDAOImpl.DELETE_FAULTS_BY_IDS, query="delete from FaultDAOImpl as f where f._id in(:ids)") }) Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -44,7 +44,7 @@ import javax.xml.namespace.QName; @Entity -@Table(name = "ODE_MESSAGE") +@Table(name = "BPEL_MESSAGE") @NamedQueries( { @NamedQuery(name = MessageDAOImpl.DELETE_MESSAGES_BY_MEXIDS, query = "delete from MessageDAOImpl as m where m._messageExchange._id in (:mexIds)") }) public class MessageDAOImpl implements MessageDAO { private static Log __log = LogFactory.getLog(MessageDAOImpl.class); Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -51,7 +51,7 @@ import java.util.Set; @Entity -@Table(name="ODE_MESSAGE_EXCHANGE") +@Table(name="BPEL_MESSAGE_EXCHANGE") @NamedQueries({ @NamedQuery(name=MessageExchangeDAOImpl.DELETE_MEXS_BY_PROCESS, query="delete from MessageExchangeDAOImpl as m where m._process = :process"), @NamedQuery(name=MessageExchangeDAOImpl.SELECT_MEX_IDS_BY_PROCESS, query="select m._id from MessageExchangeDAOImpl as m where m._process = :process") Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -39,7 +39,7 @@ import javax.persistence.Table; @Entity -@Table(name="ODE_MESSAGE_ROUTE") +@Table(name="BPEL_MESSAGE_ROUTE") @NamedQueries ({ @NamedQuery(name=MessageRouteDAOImpl.DELETE_MESSAGE_ROUTES_BY_INSTANCE_IDS, query="delete from MessageRouteDAOImpl as r where r._instanceId in(:instanceIds)"), @NamedQuery(name=MessageRouteDAOImpl.DELETE_MESSAGE_ROUTES_BY_INSTANCE, query="delete from MessageRouteDAOImpl as r where r._processInst = :instance") Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MexProperty.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MexProperty.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MexProperty.java 2010-06-21 05:01:48 UTC (rev 764) @@ -37,7 +37,7 @@ * @author Matthieu Riou <mriou at apache dot org> */ @Entity -@Table(name="ODE_MEX_PROP") +@Table(name="BPEL_MEX_PROP") @NamedQueries({ @NamedQuery(name=MexProperty.DELETE_MEX_PROPERTIES_BY_MEX_IDS, query="delete from MexProperty as p where p._mexId in (:mexIds)") }) Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/PartnerLinkDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/PartnerLinkDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/PartnerLinkDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -42,7 +42,7 @@ import javax.xml.namespace.QName; @Entity -@Table(name="ODE_PARTNER_LINK") +@Table(name="BPEL_PARTNER_LINK") @NamedQueries({ @NamedQuery(name=PartnerLinkDAOImpl.DELETE_PARTNER_LINKS_BY_SCOPE_IDS, query="delete from PartnerLinkDAOImpl as l where l._scopeId in (:scopeIds)") }) Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -40,7 +40,7 @@ * @author Matthieu Riou <mriou at apache dot org> */ @Entity -@Table(name="ODE_PROCESS") +@Table(name="BPEL_PROCESS") @NamedQueries({ @NamedQuery(name="ActiveInstances", query="select i from ProcessInstanceDAOImpl as i where i._process = :process and i._state = :state"), @NamedQuery(name="InstanceByCKey", query="select cs._scope._processInstance from CorrelationSetDAOImpl as cs where cs._correlationKey = :ckey"), Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -62,7 +62,7 @@ import java.util.Set; @Entity -@Table(name="ODE_PROCESS_INSTANCE") +@Table(name="BPEL_PROCESS_INSTANCE") @NamedQueries({ @NamedQuery(name=ProcessInstanceDAOImpl.DELETE_INSTANCES_BY_PROCESS, query="delete from ProcessInstanceDAOImpl as i where i._process = :process"), @NamedQuery(name=ProcessInstanceDAOImpl.SELECT_INSTANCE_IDS_BY_PROCESS, query="select i._instanceId from ProcessInstanceDAOImpl as i where i._process = :process"), Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ScopeDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ScopeDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ScopeDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -47,7 +47,7 @@ import java.util.List; @Entity -@Table(name="ODE_SCOPE") +@Table(name="BPEL_SCOPE") @NamedQueries({ @NamedQuery(name="ScopeEvents", query="SELECT se FROM EventDAOImpl as se WHERE se._scopeId = :sid"), @NamedQuery(name=ScopeDAOImpl.SELECT_SCOPE_IDS_BY_PROCESS, query="select s._scopeInstanceId from ScopeDAOImpl as s where s._processInstance._process = :process"), Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataDAOImpl.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataDAOImpl.java 2010-06-21 05:01:48 UTC (rev 764) @@ -50,7 +50,7 @@ * @author Matthieu Riou <mriou at apache dot org> */ @Entity -@Table(name="ODE_XML_DATA") +@Table(name="BPEL_XML_DATA") @NamedQueries({ @NamedQuery(name=XmlDataDAOImpl.SELECT_XMLDATA_IDS_BY_PROCESS, query="select distinct x._id from XmlDataDAOImpl as x where x._scope._processInstance._process = :process"), @NamedQuery(name=XmlDataDAOImpl.SELECT_XMLDATA_IDS_BY_INSTANCE, query="select distinct x._id from XmlDataDAOImpl as x where x._scope._processInstance = :instance"), Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataProperty.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataProperty.java 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataProperty.java 2010-06-21 05:01:48 UTC (rev 764) @@ -37,7 +37,7 @@ * @author Matthieu Riou <mriou at apache dot org> */ @Entity -@Table(name="ODE_XML_DATA_PROP") +@Table(name="BPEL_XML_DATA_PROP") @NamedQueries({ @NamedQuery(name=XmlDataProperty.DELETE_XML_DATA_PROPERTIES_BY_XML_DATA_IDS, query="delete from XmlDataProperty as p where p._xmlDataId in (:xmlDataIds)") }) Added: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/files/hibernate.cfg/sqlserver.properties =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/files/hibernate.cfg/sqlserver.properties (rev 0) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/files/hibernate.cfg/sqlserver.properties 2010-06-21 05:01:48 UTC (rev 764) @@ -0,0 +1 @@ +dialect=org.hibernate.dialect.SQLServerDialect Deleted: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-derby.sql =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-derby.sql 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-derby.sql 2010-06-21 05:01:48 UTC (rev 764) @@ -1,30 +0,0 @@ --- Apache ODE - SimpleScheduler Database Schema --- --- Apache Derby scripts by Maciej Szefler. --- --- - -CREATE TABLE ode_job ( - jobid CHAR(64) NOT NULL DEFAULT '', - ts BIGINT NOT NULL DEFAULT 0, - nodeid char(64), - scheduled int NOT NULL DEFAULT 0, - transacted int NOT NULL DEFAULT 0, - - instanceId BIGINT, - mexId varchar(255), - processId varchar(255), - type varchar(255), - channel varchar(255), - correlatorId varchar(255), - correlationKey varchar(255), - retryCount int, - inMem int, - detailsExt blob(4096), - - PRIMARY KEY(jobid)); - -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); - - Added: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-sqlserver.sql =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-sqlserver.sql (rev 0) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/scripts/simplesched-sqlserver.sql 2010-06-21 05:01:48 UTC (rev 764) @@ -0,0 +1,30 @@ +-- Apache ODE - SimpleScheduler Database Schema +-- +-- Apache Derby scripts by Maciej Szefler. +-- +-- + +CREATE TABLE ODE_JOB ( + jobid CHAR(64) NOT NULL DEFAULT '', + ts BIGINT NOT NULL DEFAULT 0, + nodeid char(64), + scheduled int NOT NULL DEFAULT 0, + transacted int NOT NULL DEFAULT 0, + + instanceId BIGINT, + mexId varchar(255), + processId varchar(255), + type varchar(255), + channel varchar(255), + correlatorId varchar(255), + correlationKeySet varchar(255), + retryCount int, + inMem int, + detailsExt blob(4096), + + PRIMARY KEY(jobid)); + +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); + + Deleted: branches/RiftSaw-ODE-2.1.x/dependencies.rb =================================================================== --- branches/RiftSaw-ODE-2.1.x/dependencies.rb 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/dependencies.rb 2010-06-21 05:01:48 UTC (rev 764) @@ -1,136 +0,0 @@ -# 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. - -ANNONGEN = "annogen:annogen:jar:0.1.0" -ANT = "ant:ant:jar:1.6.5" -AXIOM = [ group("axiom-api", "axiom-impl", "axiom-dom", - :under=>"org.apache.ws.commons.axiom", :version=>"1.2.5") ] -AXIS2_ALL = group("axis2-adb", "axis2-codegen", "axis2-kernel", - "axis2-java2wsdl", "axis2-jibx", "axis2-saaj", "axis2-xmlbeans", - :under=>"org.apache.axis2", :version=>"1.3") -AXIS2_TEST = group("httpcore", "httpcore-nio", "httpcore-niossl", - :under=>"org.apache.httpcomponents", :version=>"4.0-alpha5") -AXIS2_MODULES = struct( - :mods => ["org.apache.rampart:rampart:mar:1.3", - "org.apache.rampart:rahas:mar:1.3", - "org.apache.axis2:addressing:mar:1.3"], - :libs => [group("rampart-core", "rampart-policy", "rampart-trust", - :under=>"org.apache.rampart", - :version=>"1.3"), - "org.apache.ws.security:wss4j:jar:1.5.3", - "org.apache.santuario:xmlsec:jar:1.4.0", - "org.opensaml:opensaml:jar:1.1", - "bouncycastle:bcprov-jdk15:jar:140"] -) -AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.3" -BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.0" -COMMONS = struct( - :codec =>"commons-codec:commons-codec:jar:1.3", - :collections =>"commons-collections:commons-collections:jar:3.2.1", - :dbcp =>"commons-dbcp:commons-dbcp:jar:1.2.2", - :fileupload =>"commons-fileupload:commons-fileupload:jar:1.1.1", - :httpclient =>"commons-httpclient:commons-httpclient:jar:3.1", - :lang =>"commons-lang:commons-lang:jar:2.4", - :logging =>"commons-logging:commons-logging:jar:1.1", - :io =>"commons-io:commons-io:jar:1.4", - :pool =>"commons-pool:commons-pool:jar:1.4", - :primitives =>"commons-primitives:commons-primitives:jar:1.0", - :beanutils =>"commons-beanutils:commons-beanutils:jar:1.8.2" -) -DERBY = "org.apache.derby:derby:jar:10.5.3.0_1" -DERBY_TOOLS = "org.apache.derby:derbytools:jar:10.5.3.0_1" -DOM4J = "dom4j:dom4j:jar:1.6.1" -GERONIMO = struct( - :kernel =>"org.apache.geronimo.modules:geronimo-kernel:jar:2.0.1", - :transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:2.0.1", - :connector =>"org.apache.geronimo.components:geronimo-connector:jar:2.0.1" -) -HIBERNATE = [ "org.hibernate:hibernate:jar:3.2.5.ga", "asm:asm:jar:1.5.3", - "antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.1_3", "net.sf.ehcache:ehcache:jar:1.2.3" ] -HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7" -JAVAX = struct( - :activation =>"javax.activation:activation:jar:1.1", - #:activation =>"geronimo-spec:geronimo-spec-activation:jar:1.0.2-rc4", - :connector =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0", - :ejb =>"org.apache.geronimo.specs:geronimo-ejb_2.1_spec:jar:1.1", - :javamail =>"geronimo-spec:geronimo-spec-javamail:jar:1.3.1-rc5", - :jms =>"geronimo-spec:geronimo-spec-jms:jar:1.1-rc4", - :persistence =>"javax.persistence:persistence-api:jar:1.0", - :servlet =>"org.apache.geronimo.specs:geronimo-servlet_2.4_spec:jar:1.0", - :stream =>"stax:stax-api:jar:1.0.1", - :transaction =>"org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1", - :resource =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0" -) -JAXEN = "jaxen:jaxen:jar:1.1.1" -JBI = group("org.apache.servicemix.specs.jbi-api-1.0", :under=>"org.apache.servicemix.specs", :version=>"1.1.0") -JENCKS = "org.jencks:jencks:jar:all:1.3" -JIBX = "jibx:jibx-run:jar:1.1-beta3" -KARAF = [ - "org.apache.felix:org.osgi.core:jar:1.4.0", - "org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.console:jar:1.0.0", - group("org.apache.felix.gogo.commands","org.apache.felix.gogo.runtime", - :under=>"org.apache.felix.gogo", :version=>"0.2.0") - ] -LOG4J = "log4j:log4j:jar:1.2.13" -OPENJPA = ["org.apache.openjpa:openjpa:jar:1.2.1", - "net.sourceforge.serp:serp:jar:1.13.1"] - -SAXON = group("saxon", "saxon-xpath", "saxon-dom", "saxon-xqj", :under=>"net.sf.saxon", :version=>"9.1.0.8") -SERVICEMIX = [ - group("servicemix-core", - :under=>"org.apache.servicemix", :version=>"3.3"), - group("servicemix-soap", "servicemix-common", "servicemix-shared", "servicemix-http", "servicemix-eip", - :under=>"org.apache.servicemix", :version=>"2008.01"), - group("servicemix-utils", - :under=>"org.apache.servicemix", :version=>"1.0.0"), - "commons-httpclient:commons-httpclient:jar:3.0", - "commons-codec:commons-codec:jar:1.2", - "org.mortbay.jetty:jetty:jar:6.1.12rc1", - "org.mortbay.jetty:jetty-client:jar:6.1.12rc1", - "org.mortbay.jetty:jetty-sslengine:jar:6.1.12rc1", - "org.mortbay.jetty:servlet-api-2.5:jar:6.1.12rc1", - "org.mortbay.jetty:jetty-util:jar:6.1.12rc1", - "org.codehaus.woodstox:wstx-asl:jar:3.2.2", - "org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0.1", - "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1", - "org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.2", - "org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:jar:1.0.1", - "org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1", - "org.jencks:jencks:jar:2.1", - "org.objectweb.howl:howl:jar:1.0.1-1", - "org.apache.activemq:activemq-core:jar:4.1.1", - "org.apache.activemq:activemq-ra:jar:4.1.1", - "commons-beanutils:commons-beanutils:jar:1.7.0", - "tranql:tranql-connector-derby-common:jar:1.1" - ] -SLF4J = group(%w{ slf4j-api slf4j-log4j12 jcl104-over-slf4j }, :under=>"org.slf4j", :version=>"1.4.3") -SPRING = ["org.springframework:spring:jar:2.5.6"] -TRANQL = [ "tranql:tranql-connector:jar:1.1", COMMONS.primitives ] -WOODSTOX = "woodstox:wstx-asl:jar:3.2.1" -WSDL4J = "wsdl4j:wsdl4j:jar:1.6.1" -XALAN = "xalan:xalan:jar:2.7.1" -XERCES = "xerces:xercesImpl:jar:2.9.0" -WS_COMMONS = struct( - :axiom =>AXIOM, - :neethi =>"org.apache.neethi:neethi:jar:2.0.2", - :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.3.2" -) -XBEAN = [ - "org.apache.xbean:xbean-kernel:jar:3.3", - "org.apache.xbean:xbean-server:jar:3.3", - "org.apache.xbean:xbean-spring:jar:3.4.3", - "org.apache.xbean:xbean-classloader:jar:3.4.3" -] -XMLBEANS = "org.apache.xmlbeans:xmlbeans:jar:2.3.0" Deleted: branches/RiftSaw-ODE-2.1.x/publish.sh =================================================================== --- branches/RiftSaw-ODE-2.1.x/publish.sh 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/publish.sh 2010-06-21 05:01:48 UTC (rev 764) @@ -1,2 +0,0 @@ -#!/bin/sh -buildr _1.2.10_ -f Rakefile-riftsaw TEST=no upload Deleted: branches/RiftSaw-ODE-2.1.x/rebuild.sh =================================================================== --- branches/RiftSaw-ODE-2.1.x/rebuild.sh 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/rebuild.sh 2010-06-21 05:01:48 UTC (rev 764) @@ -1,2 +0,0 @@ -#!/bin/sh -buildr _1.2.10_ -f Rakefile-riftsaw TEST=no clean jboss-riftsaw:distro:package Deleted: branches/RiftSaw-ODE-2.1.x/repositories.rb =================================================================== --- branches/RiftSaw-ODE-2.1.x/repositories.rb 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/repositories.rb 2010-06-21 05:01:48 UTC (rev 764) @@ -1,23 +0,0 @@ -# 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. - -repositories.remote << "http://www.intalio.org/public/maven2" -repositories.remote << "http://people.apache.org/repo/m2-incubating-repository" -repositories.remote << "http://repo1.maven.org/maven2" -repositories.remote << "http://people.apache.org/repo/m2-snapshot-repository" -repositories.remote << "http://download.java.net/maven/2" -repositories.remote << "http://svn.apache.org/repos/asf/servicemix/m2-repo" -repositories.remote << "http://www.aqute.biz/repo" -repositories.release_to[:url] ||= "sftp://guest@localhost/home/guest" Deleted: branches/RiftSaw-ODE-2.1.x/settings.rb.example =================================================================== --- branches/RiftSaw-ODE-2.1.x/settings.rb.example 2010-06-18 15:46:00 UTC (rev 763) +++ branches/RiftSaw-ODE-2.1.x/settings.rb.example 2010-06-21 05:01:48 UTC (rev 764) @@ -1,82 +0,0 @@ -MYSQL = "mysql:mysql-connector-java:jar:5.0.4", -SYBASE = "sybase:jconnect:jar:4.3", -DB2 = "db2:jcc:jar:9.5" -SQLSERVER2008 = "microsoft:sqljdbc:jar:2008" - -REQUIRES = [MYSQL, SYBASE, DB2, SQLSERVER2008] - -def settings - jpa_derby = { - :db=>"derby", - :dao=>"org.apache.ode.axis2.instancecleanup.JpaDaoConnectionFactoryImpl" - } - - hib_derby = { - :db=>"derby", - :dao=>"org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl" - } - - local_hib_mysql = { - :integr_branch=>"5.2.x", - :db=>"mysql", - :driver=>"com.mysql.jdbc.Driver", - :url=>"jdbc:mysql://localhost:3306/bpms?autoReconnect=true", - :userid=>"root", - :password=>"mysql", - :autocommit=>"on", - :dao=>"org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl" - } - - local_jpa_mysql = { - :integr_branch=>"5.2.x", - :db=>"mysql", - :driver=>"com.mysql.jdbc.Driver", - :url=>"jdbc:mysql://localhost:3306/jpa?autoReconnect=true", - :userid=>"root", - :password=>"mysql", - :autocommit=>"on", - :dao=>"org.apache.ode.axis2.instancecleanup.JpaDaoConnectionFactoryImpl" - } - - hib_db2_95 = { - :integr_branch=>"5.2.x", - :db=>"db2", - :driver=>"com.ibm.db2.jcc.DB2Driver", - :url=>"jdbc:db2://<host>:50000/<instance>", - :userid=>"<userid>", - :password=>"<password>", - :autocommit=>"on", - :dao=>"org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl" - } - - hib_sybase_12 = { - :integr_branch=>"5.2.x", - :db=>"sybase", - :driver=>"com.sybase.jdbc3.jdbc.SybDriver", - :url=>"jdbc:sybase:Tds:<host>:6000/<instance>?SELECT_OPENS_CURSOR=true", - :userid=>"<userid>", - :password=>"<password>", - :autocommit=>"on", - :dao=>"org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl" - } - - hib_sqlserver = { - :integr_branch=>"5.2.x", - :db=>"sqlserver", - :driver=>"com.microsoft.sqlserver.jdbc.SQLServerDriver", - :url=>"jdbc:sqlserver://<host>:1433;database=<instance>", - :userid=>"sa", - :password=>"sa", - :autocommit=>"on", - :dao=>"org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl" - } - - { - "jpa-derby"=>jpa_derby, - "hib-derby"=>hib_derby -# "jpa-mysql"=>local_jpa_mysql, -# "hib-mysql"=>local_hib_mysql -# "hib-db2"=>pxetest_hib_db2_95, -# "hib-sybase"=>pxetest_hib_sybase_12 - } -end