riftsaw SVN: r700 - trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-06-03 06:11:45 -0400 (Thu, 03 Jun 2010)
New Revision: 700
Modified:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
Log:
Minor update to add debug.
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-03 09:24:30 UTC (rev 699)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-03 10:11:45 UTC (rev 700)
@@ -390,6 +390,8 @@
initializer = (JAXWSInitializer)cls.newInstance();
+ log.debug("JAXWS Client Initializer instantiated: "+initializer);
+
} catch(Exception e) {
log.error("Unable to obtain JAXWS Initializer class '"+impl+"'", e);
}
14 years, 6 months
- 1
- 0
riftsaw SVN: r699 - trunk/distribution/src/main/release.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-06-03 05:24:30 -0400 (Thu, 03 Jun 2010)
New Revision: 699
Modified:
trunk/distribution/src/main/release/ReleaseNotes.txt
Log:
Added release note info.
Modified: trunk/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- trunk/distribution/src/main/release/ReleaseNotes.txt 2010-06-03 04:35:07 UTC (rev 698)
+++ trunk/distribution/src/main/release/ReleaseNotes.txt 2010-06-03 09:24:30 UTC (rev 699)
@@ -1,3 +1,27 @@
+RiftSaw 2.1.0-CR1
+=================
+
+This is primarily a bug fix release, with additional support for configuring the
+Apache CXF web service endpoints used by a BPEL process.
+
+WS-Security features, supported by Apache CXF, can now be configured for RiftSaw when the
+jboss-cxf Web Service stack is installed. The User Guide provides information on how to
+include the CXF based configuration with the BPEL deployment, and there are some quickstarts
+available to demonstrate username and digital signature authentication.
+
+JAX-WS handlers can now be installed to intercept/observe messages sent and returned from
+the web service representing a BPEL process.
+
+The version of ODE used by RiftSaw has been updated to ODE 1.3.4.
+
+NOTE: Database schema changes occurred when moving to the ODE 1.3.4 release. If you have
+a previous version of RiftSaw installed, then you will need to drop the existing tables
+(or delete the database), before installing and running this version of RiftSaw.
+
+The detailed report for this release can be found at:
+https://jira.jboss.org/secure/ConfigureReport.jspa?atl_token=c7LTcc_4Ee&versions=12314753§ions=.1.7.2.4.10.9.8.3.12.11.5&style=none&selectedProjectId=12310843&reportKey=org.jboss.labs.jira.plugin.release-notes-report-plugin%3Areleasenotes&Next=Next
+
+
RiftSaw 2.0.0.Final
===================
14 years, 6 months
- 1
- 0
riftsaw SVN: r698 - branches.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-03 00:35:07 -0400 (Thu, 03 Jun 2010)
New Revision: 698
Added:
branches/riftsaw-jpa/
Log:
* make a branch for the jpa work, and then try to use the native hibernate for CR1 release.
Copied: branches/riftsaw-jpa (from rev 697, trunk)
14 years, 6 months
- 1
- 0
riftsaw SVN: r697 - in trunk: runtime/engine-assembly/src/main/resources/bpel-sql and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-03 00:19:52 -0400 (Thu, 03 Jun 2010)
New Revision: 697
Modified:
trunk/distribution/src/main/release/db/sql/mysql.drop.sql
trunk/distribution/src/main/release/db/sql/postgres.drop.sql
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql
Log:
* update drop sql for integration test. (db clean up etc)
Modified: trunk/distribution/src/main/release/db/sql/mysql.drop.sql
===================================================================
--- trunk/distribution/src/main/release/db/sql/mysql.drop.sql 2010-06-03 04:15:09 UTC (rev 696)
+++ trunk/distribution/src/main/release/db/sql/mysql.drop.sql 2010-06-03 04:19:52 UTC (rev 697)
@@ -1,28 +1,159 @@
drop table ODE_SCHEMA_VERSION;
drop table ODE_JOB;
-drop table ODE_ACTIVITY_RECOVERY;
-drop table ODE_CORRELATION_SET;
-drop table ODE_CORRELATOR;
-drop table ODE_CORSET_PROP;
-drop table ODE_EVENT;
-drop table ODE_FAULT;
-drop table ODE_MESSAGE;
-drop table ODE_MESSAGE_EXCHANGE;
-drop table ODE_MESSAGE_ROUTE;
-drop table ODE_MEX_PROP;
-drop table ODE_PARTNER_LINK;
-drop table ODE_PROCESS;
-drop table ODE_PROCESS_INSTANCE;
-drop table ODE_SCOPE;
-drop table ODE_XML_DATA;
-drop table ODE_XML_DATA_PROP;
-drop table STORE_DU;
-drop table STORE_PROCESS;
-drop table STORE_PROCESS_PROP;
-drop table STORE_PROC_TO_PROP;
-drop table STORE_VERSIONS;
+ alter table ODE_ACTIVITY_RECOVERY
+ drop
+ foreign key FK5274B556E38CB1C9;
+ alter table ODE_CORRELATION_SET
+ drop
+ foreign key FK399D7EB621712AFA;
+ alter table ODE_CORRELATOR
+ drop
+ foreign key FKC4413FB8748734BD;
+ alter table ODE_CORSET_PROP
+ drop
+ foreign key FK3B13A3F744AFA280;
+ alter table ODE_EVENT
+ drop
+ foreign key FK410D028BA0243704;
+
+ alter table ODE_EVENT
+ drop
+ foreign key FK410D028BE38CB1C9;
+
+ alter table ODE_MESSAGE
+ drop
+ foreign key FKBCCD53B81291B75D;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACA57B8F584;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACA8618FFF9;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACADB5AB781;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACA7B80504F;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACADC273092;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop
+ foreign key FK68EE0ACAA0243704;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop
+ foreign key FK8082C6E28618FFF9;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop
+ foreign key FK8082C6E2DB5AB781;
+
+ alter table ODE_MEX_PROP
+ drop
+ foreign key FKE61574D1AA079EB8;
+
+ alter table ODE_PARTNER_LINK
+ drop
+ foreign key FK7337940021712AFA;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D4F3A6B9B7;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D4F0BBEFCC;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D46C4AB4DE;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop
+ foreign key FK4E20A7D4A0243704;
+
+ alter table ODE_SCOPE
+ drop
+ foreign key FK41C9CE458618FFF9;
+
+ alter table ODE_SCOPE
+ drop
+ foreign key FK41C9CE45F6D972EF;
+
+ alter table ODE_XML_DATA
+ drop
+ foreign key FKEF74614121712AFA;
+
+ alter table ODE_XML_DATA_PROP
+ drop
+ foreign key FK936B93A181C9218F;
+
+ alter table STORE_PROCESS
+ drop
+ foreign key FKA83900D1BAFA89CA;
+
+ alter table STORE_PROC_TO_PROP
+ drop
+ foreign key FKB85D957C891ECF61;
+
+ alter table STORE_PROC_TO_PROP
+ drop
+ foreign key FKB85D957C3C8753EC;
+
+ drop table if exists ODE_ACTIVITY_RECOVERY;
+
+ drop table if exists ODE_CORRELATION_SET;
+
+ drop table if exists ODE_CORRELATOR;
+
+ drop table if exists ODE_CORSET_PROP;
+
+ drop table if exists ODE_EVENT;
+
+ drop table if exists ODE_FAULT;
+
+ drop table if exists ODE_MESSAGE;
+
+ drop table if exists ODE_MESSAGE_EXCHANGE;
+
+ drop table if exists ODE_MESSAGE_ROUTE;
+
+ drop table if exists ODE_MEX_PROP;
+
+ drop table if exists ODE_PARTNER_LINK;
+
+ drop table if exists ODE_PROCESS;
+
+ drop table if exists ODE_PROCESS_INSTANCE;
+
+ drop table if exists ODE_SCOPE;
+
+ drop table if exists ODE_XML_DATA;
+
+ drop table if exists ODE_XML_DATA_PROP;
+
+ drop table if exists STORE_DU;
+
+ drop table if exists STORE_PROCESS;
+
+ drop table if exists STORE_PROCESS_PROP;
+
+ drop table if exists STORE_PROC_TO_PROP;
+
+ drop table if exists STORE_VERSIONS;
+
+
+
Modified: trunk/distribution/src/main/release/db/sql/postgres.drop.sql
===================================================================
--- trunk/distribution/src/main/release/db/sql/postgres.drop.sql 2010-06-03 04:15:09 UTC (rev 696)
+++ trunk/distribution/src/main/release/db/sql/postgres.drop.sql 2010-06-03 04:19:52 UTC (rev 697)
@@ -1,27 +1,130 @@
drop table ODE_SCHEMA_VERSION;
drop table ODE_JOB;
-drop table ODE_ACTIVITY_RECOVERY;
-drop table ODE_CORRELATION_SET;
-drop table ODE_CORRELATOR;
-drop table ODE_CORSET_PROP;
-drop table ODE_EVENT;
-drop table ODE_FAULT;
-drop table ODE_MESSAGE;
-drop table ODE_MESSAGE_EXCHANGE;
-drop table ODE_MESSAGE_ROUTE;
-drop table ODE_MEX_PROP;
-drop table ODE_PARTNER_LINK;
-drop table ODE_PROCESS;
-drop table ODE_PROCESS_INSTANCE;
-drop table ODE_SCOPE;
-drop table ODE_XML_DATA;
-drop table ODE_XML_DATA_PROP;
-drop table STORE_DU;
-drop table STORE_PROCESS;
-drop table STORE_PROCESS_PROP;
-drop table STORE_PROC_TO_PROP;
-drop table STORE_VERSIONS;
+ alter table ODE_ACTIVITY_RECOVERY
+ drop constraint FK5274B556E38CB1C9;
-drop sequence hibernate_sequence;
+ alter table ODE_CORRELATION_SET
+ drop constraint FK399D7EB621712AFA;
+ alter table ODE_CORRELATOR
+ drop constraint FKC4413FB8748734BD;
+
+ alter table ODE_CORSET_PROP
+ drop constraint FK3B13A3F744AFA280;
+
+ alter table ODE_EVENT
+ drop constraint FK410D028BA0243704;
+
+ alter table ODE_EVENT
+ drop constraint FK410D028BE38CB1C9;
+
+ alter table ODE_MESSAGE
+ drop constraint FKBCCD53B81291B75D;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACA57B8F584;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACA8618FFF9;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACADB5AB781;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACA7B80504F;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACADC273092;
+
+ alter table ODE_MESSAGE_EXCHANGE
+ drop constraint FK68EE0ACAA0243704;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop constraint FK8082C6E28618FFF9;
+
+ alter table ODE_MESSAGE_ROUTE
+ drop constraint FK8082C6E2DB5AB781;
+
+ alter table ODE_MEX_PROP
+ drop constraint FKE61574D1AA079EB8;
+
+ alter table ODE_PARTNER_LINK
+ drop constraint FK7337940021712AFA;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D4F3A6B9B7;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D4F0BBEFCC;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D46C4AB4DE;
+
+ alter table ODE_PROCESS_INSTANCE
+ drop constraint FK4E20A7D4A0243704;
+
+ alter table ODE_SCOPE
+ drop constraint FK41C9CE458618FFF9;
+
+ alter table ODE_SCOPE
+ drop constraint FK41C9CE45F6D972EF;
+
+ alter table ODE_XML_DATA
+ drop constraint FKEF74614121712AFA;
+
+ alter table ODE_XML_DATA_PROP
+ drop constraint FK936B93A181C9218F;
+
+ alter table STORE_PROCESS
+ drop constraint FKA83900D1BAFA89CA;
+
+ alter table STORE_PROC_TO_PROP
+ drop constraint FKB85D957C891ECF61;
+
+ alter table STORE_PROC_TO_PROP
+ drop constraint FKB85D957C3C8753EC;
+
+ drop table ODE_ACTIVITY_RECOVERY;
+
+ drop table ODE_CORRELATION_SET;
+
+ drop table ODE_CORRELATOR;
+
+ drop table ODE_CORSET_PROP;
+
+ drop table ODE_EVENT;
+
+ drop table ODE_FAULT;
+
+ drop table ODE_MESSAGE;
+
+ drop table ODE_MESSAGE_EXCHANGE;
+
+ drop table ODE_MESSAGE_ROUTE;
+
+ drop table ODE_MEX_PROP;
+
+ drop table ODE_PARTNER_LINK;
+
+ drop table ODE_PROCESS;
+
+ drop table ODE_PROCESS_INSTANCE;
+
+ drop table ODE_SCOPE;
+
+ drop table ODE_XML_DATA;
+
+ drop table ODE_XML_DATA_PROP;
+
+ drop table STORE_DU;
+
+ drop table STORE_PROCESS;
+
+ drop table STORE_PROCESS_PROP;
+
+ drop table STORE_PROC_TO_PROP;
+
+ drop table STORE_VERSIONS;
+
+ drop sequence hibernate_sequence;
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-06-03 04:15:09 UTC (rev 696)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-06-03 04:19:52 UTC (rev 697)
@@ -26,7 +26,7 @@
--
--
-CREATE TABLE ode_job (
+CREATE TABLE ODE_JOB (
jobid CHAR(64) NOT NULL DEFAULT '',
ts BIGINT NOT NULL DEFAULT 0,
nodeid char(64),
@@ -46,8 +46,8 @@
PRIMARY KEY(jobid));
-CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts);
-CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid);
+CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts);
+CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid);
14 years, 6 months
- 1
- 0
riftsaw SVN: r696 - in branches/ODE/ODE-1.x-jpa: axis2-war/src/main/assembly and 2 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-03 00:15:09 -0400 (Thu, 03 Jun 2010)
New Revision: 696
Modified:
branches/ODE/ODE-1.x-jpa/BUILDING
branches/ODE/ODE-1.x-jpa/NOTICE
branches/ODE/ODE-1.x-jpa/RELEASE_NOTES
branches/ODE/ODE-1.x-jpa/Rakefile
branches/ODE/ODE-1.x-jpa/axis2-war/src/main/assembly/bin.xml
branches/ODE/ODE-1.x-jpa/axis2-war/src/main/webapp/deployment.html
branches/ODE/ODE-1.x-jpa/axis2-war/src/main/webapp/processes.html
branches/ODE/ODE-1.x-jpa/distro/src/main/assembly/jbi.xml
branches/ODE/ODE-1.x-jpa/distro/src/main/assembly/war.xml
Log:
* upgraded to 1.3.4 ode code base.
Modified: branches/ODE/ODE-1.x-jpa/BUILDING
===================================================================
--- branches/ODE/ODE-1.x-jpa/BUILDING 2010-06-03 03:56:31 UTC (rev 695)
+++ branches/ODE/ODE-1.x-jpa/BUILDING 2010-06-03 04:15:09 UTC (rev 696)
@@ -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-jpa/NOTICE
===================================================================
--- branches/ODE/ODE-1.x-jpa/NOTICE 2010-06-03 03:56:31 UTC (rev 695)
+++ branches/ODE/ODE-1.x-jpa/NOTICE 2010-06-03 04:15:09 UTC (rev 696)
@@ -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-jpa/RELEASE_NOTES
===================================================================
--- branches/ODE/ODE-1.x-jpa/RELEASE_NOTES 2010-06-03 03:56:31 UTC (rev 695)
+++ branches/ODE/ODE-1.x-jpa/RELEASE_NOTES 2010-06-03 04:15:09 UTC (rev 696)
@@ -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-jpa/Rakefile
===================================================================
--- branches/ODE/ODE-1.x-jpa/Rakefile 2010-06-03 03:56:31 UTC (rev 695)
+++ branches/ODE/ODE-1.x-jpa/Rakefile 2010-06-03 04:15:09 UTC (rev 696)
@@ -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-jpa/axis2-war/src/main/assembly/bin.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/main/assembly/bin.xml 2010-06-03 03:56:31 UTC (rev 695)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/main/assembly/bin.xml 2010-06-03 04:15:09 UTC (rev 696)
@@ -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-jpa/axis2-war/src/main/webapp/deployment.html
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/main/webapp/deployment.html 2010-06-03 03:56:31 UTC (rev 695)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/main/webapp/deployment.html 2010-06-03 04:15:09 UTC (rev 696)
@@ -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-jpa/axis2-war/src/main/webapp/processes.html
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/src/main/webapp/processes.html 2010-06-03 03:56:31 UTC (rev 695)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/src/main/webapp/processes.html 2010-06-03 04:15:09 UTC (rev 696)
@@ -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-jpa/distro/src/main/assembly/jbi.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/distro/src/main/assembly/jbi.xml 2010-06-03 03:56:31 UTC (rev 695)
+++ branches/ODE/ODE-1.x-jpa/distro/src/main/assembly/jbi.xml 2010-06-03 04:15:09 UTC (rev 696)
@@ -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-jpa/distro/src/main/assembly/war.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/distro/src/main/assembly/war.xml 2010-06-03 03:56:31 UTC (rev 695)
+++ branches/ODE/ODE-1.x-jpa/distro/src/main/assembly/war.xml 2010-06-03 04:15:09 UTC (rev 696)
@@ -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>
14 years, 6 months
- 1
- 0
riftsaw SVN: r695 - in branches/ODE/ODE-1.x-fixes: axis2-war/src/main/assembly and 2 other directories.
by riftsaw-commits＠lists.jboss.org
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>
14 years, 6 months
- 1
- 0
riftsaw SVN: r694 - in branches/ODE/ODE-1.x: axis2-war/src/main/assembly and 2 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-02 22:22:28 -0400 (Wed, 02 Jun 2010)
New Revision: 694
Modified:
branches/ODE/ODE-1.x/BUILDING
branches/ODE/ODE-1.x/NOTICE
branches/ODE/ODE-1.x/RELEASE_NOTES
branches/ODE/ODE-1.x/Rakefile
branches/ODE/ODE-1.x/axis2-war/src/main/assembly/bin.xml
branches/ODE/ODE-1.x/axis2-war/src/main/webapp/deployment.html
branches/ODE/ODE-1.x/axis2-war/src/main/webapp/processes.html
branches/ODE/ODE-1.x/distro/src/main/assembly/jbi.xml
branches/ODE/ODE-1.x/distro/src/main/assembly/war.xml
Log:
* upgraded to the latest 1.3.4 branch, which has been voted for release atm.
Modified: branches/ODE/ODE-1.x/BUILDING
===================================================================
--- branches/ODE/ODE-1.x/BUILDING 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/BUILDING 2010-06-03 02:22:28 UTC (rev 694)
@@ -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/NOTICE
===================================================================
--- branches/ODE/ODE-1.x/NOTICE 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/NOTICE 2010-06-03 02:22:28 UTC (rev 694)
@@ -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/RELEASE_NOTES
===================================================================
--- branches/ODE/ODE-1.x/RELEASE_NOTES 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/RELEASE_NOTES 2010-06-03 02:22:28 UTC (rev 694)
@@ -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/Rakefile
===================================================================
--- branches/ODE/ODE-1.x/Rakefile 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/Rakefile 2010-06-03 02:22:28 UTC (rev 694)
@@ -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/axis2-war/src/main/assembly/bin.xml
===================================================================
--- branches/ODE/ODE-1.x/axis2-war/src/main/assembly/bin.xml 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/axis2-war/src/main/assembly/bin.xml 2010-06-03 02:22:28 UTC (rev 694)
@@ -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/axis2-war/src/main/webapp/deployment.html
===================================================================
--- branches/ODE/ODE-1.x/axis2-war/src/main/webapp/deployment.html 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/axis2-war/src/main/webapp/deployment.html 2010-06-03 02:22:28 UTC (rev 694)
@@ -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/axis2-war/src/main/webapp/processes.html
===================================================================
--- branches/ODE/ODE-1.x/axis2-war/src/main/webapp/processes.html 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/axis2-war/src/main/webapp/processes.html 2010-06-03 02:22:28 UTC (rev 694)
@@ -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/distro/src/main/assembly/jbi.xml
===================================================================
--- branches/ODE/ODE-1.x/distro/src/main/assembly/jbi.xml 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/distro/src/main/assembly/jbi.xml 2010-06-03 02:22:28 UTC (rev 694)
@@ -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.apache.ode:ode-utils</include>
- <include>org.apache.ode:ode-tools</include>
- <include>org.apache.ode:ode-bpel-compiler</include>
- <include>org.apache.ode:ode-bpel-api</include>
- <include>org.apache.ode:ode-bpel-schemas</include>
- <include>commons-logging:commons-logging</include>
- <include>org.apache.ode:ode-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.apache.ode:ode-utils</include>
+ <include>org.apache.ode:ode-tools</include>
+ <include>org.apache.ode:ode-bpel-compiler</include>
+ <include>org.apache.ode:ode-bpel-api</include>
+ <include>org.apache.ode:ode-bpel-schemas</include>
+ <include>org.apache.ode:ode-bpel-obj</include>
+ <include>commons-logging:commons-logging</include>
+ <include>org.apache.ode:ode-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>
</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/distro/src/main/assembly/war.xml
===================================================================
--- branches/ODE/ODE-1.x/distro/src/main/assembly/war.xml 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/distro/src/main/assembly/war.xml 2010-06-03 02:22:28 UTC (rev 694)
@@ -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,29 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>org.apache.ode:ode-utils</include>
- <include>org.apache.ode:ode-tools</include>
- <include>org.apache.ode:ode-bpel-compiler</include>
- <include>org.apache.ode:ode-bpel-api</include>
- <include>org.apache.ode:ode-bpel-schemas</include>
- <include>commons-logging:commons-logging</include>
- <include>org.apache.ode:ode-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.apache.ode:ode-utils</include>
+ <include>org.apache.ode:ode-tools</include>
+ <include>org.apache.ode:ode-bpel-compiler</include>
+ <include>org.apache.ode:ode-bpel-api</include>
+ <include>org.apache.ode:ode-bpel-obj</include>
+ <include>org.apache.ode:ode-bpel-schemas</include>
+ <include>commons-logging:commons-logging</include>
+ <include>org.apache.ode:ode-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>
</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>
14 years, 6 months
- 1
- 0
riftsaw SVN: r693 - in trunk/stress-tests: src/test/java/org/jboss/soa/bpel/tests/performance and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-06-02 14:57:02 -0400 (Wed, 02 Jun 2010)
New Revision: 693
Modified:
trunk/stress-tests/pom.xml
trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/PerformanceTestCase.java
Log:
https://jira.jboss.org/browse/RIFTSAW-182
Message count is now passed in to PerformanceTestCase by maven -Dcount=<number>
Modified: trunk/stress-tests/pom.xml
===================================================================
--- trunk/stress-tests/pom.xml 2010-06-02 16:28:23 UTC (rev 692)
+++ trunk/stress-tests/pom.xml 2010-06-02 18:57:02 UTC (rev 693)
@@ -278,7 +278,6 @@
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/src/test/resources/conf</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/rosetta.aop</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/bin</additionalClasspathElement>
</additionalClasspathElements>
<systemProperties>
<property>
@@ -301,6 +300,10 @@
<name>java.rmi.server.ignoreStubClasses</name>
<value>true</value>
</property>
+ <property>
+ <name>count</name>
+ <value>${count}</value>
+ </property>
</systemProperties>
<testFailureIgnore>true</testFailureIgnore>
<includes>
Modified: trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/PerformanceTestCase.java
===================================================================
--- trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/PerformanceTestCase.java 2010-06-02 16:28:23 UTC (rev 692)
+++ trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/PerformanceTestCase.java 2010-06-02 18:57:02 UTC (rev 693)
@@ -25,11 +25,11 @@
resources = "src/test/resources/performance";
try
{
- System.out.println("System Property \"count\"=" + System.getenv("count"));
- count = Integer.parseInt(System.getenv("count"));
+ count = Integer.parseInt(System.getProperty("count"));
}
catch(Exception ex)
{
+ fail("No message count specified. Please run the build with \"-Dcount=<number>\"");
}
String[] args = new String[3];
14 years, 6 months
- 1
- 0
riftsaw SVN: r692 - in trunk: runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode and 3 other directories.
by riftsaw-commits＠lists.jboss.org
Author: kurt.stam(a)jboss.com
Date: 2010-06-02 12:28:23 -0400 (Wed, 02 Jun 2010)
New Revision: 692
Added:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java
Modified:
trunk/distribution/src/main/release/install/build.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java
Log:
RIFTSAW-188, moving looking up the partner channel WSDLs to the first time the service is invoked, rather then at deploy time. This removes the deployment locking issue. Now turned the UDDI lookup on by default.
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/distribution/src/main/release/install/build.xml 2010-06-02 16:28:23 UTC (rev 692)
@@ -277,11 +277,9 @@
<replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
token="bpel.uddi.registration=false"
value="bpel.uddi.registration=true"/>
- <!-- uncomment to set UDDI lookup default to true
<replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
token="bpel.uddi.lookup=false"
value="bpel.uddi.lookup=true"/>
- -->
<replace file="${deploy.dir}/jbossesb-registry.sar/esb.juddi.xml">
<replacetoken><![CDATA[juddi.seed.always">false]]></replacetoken>
<replacevalue><![CDATA[juddi.seed.always">true]]></replacevalue>
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -44,10 +44,6 @@
public class JAXWSBindingContext implements BindingContext
{
protected final Log log = LogFactory.getLog(getClass());
-//we should consider having our own OdeConfigProperties class if we need more properties
- public final static String BPEL_UDDI_LOOKUP = "uddi.lookup";
- public final static String BPEL_WEBSERVICE_SECURE = "webservice.secure";
- public final static String BPEL_WEBSERVICE_BASEURL = "webservice.baseurl";
private BPELEngineImpl engine;
private EndpointManager endpointManager;
@@ -56,25 +52,7 @@
public JAXWSBindingContext(BPELEngineImpl server) {
this.engine = server;
this.endpointManager = new EndpointManager(this.engine);
- if (isUDDILookup()) {
- try {
- String webServiceHost = ServerConfigFactory.getServerConfig().getWebServiceHost();
- int webServicePort = ServerConfigFactory.getServerConfig().getWebServicePort();
- URL url = new URL("http://" + webServiceHost + ":" + webServicePort);
- if (isWebserviceSecure()) {
- int secureWebServicePort = ServerConfigFactory.getServerConfig().getWebServicePort();
- url = new URL("https://" + webServiceHost + ":" + secureWebServicePort);
- }
- //give the user the option to override
- if (server.getOdeConfig().getProperty(BPEL_WEBSERVICE_BASEURL)==null) {
- server.getOdeConfig().getProperties().setProperty(BPEL_WEBSERVICE_BASEURL, url.toExternalForm());
- }
- uddiRegistration = UDDIClientFactory.newInstance(server.getOdeConfig().getProperties());
- } catch (Exception e) {
- log.error(e.getMessage());
- log.error("Continuing without UDDI integration.");
- }
- }
+
}
public org.apache.ode.bpel.iapi.EndpointReference getEndpoint(QName serviceName, String portName) {
@@ -98,7 +76,8 @@
}
else
{
- WSDLReference wsdlReference = createWSDLReference(processId, myRoleEndpoint);
+ WSDLReference wsdlReference = new WSDLHelper().createWSDLReference(engine, processId,
+ myRoleEndpoint.serviceName, myRoleEndpoint.portName);
try
{
@@ -122,48 +101,7 @@
return(ref);
}
- private WSDLReference createWSDLReference(QName processId, Endpoint myRoleEndpoint)
- {
- File targetWSDLFile = findWSDLFile(processId, myRoleEndpoint);
- Definition wsdlDefinition = getWSDLDefinition(processId, myRoleEndpoint.serviceName);
- return new WSDLReference(wsdlDefinition, targetWSDLFile.toURI());
- }
-
- private File findWSDLFile(QName processId, Endpoint myRoleEndpoint)
- {
- ProcessConf pconf = engine._store.getProcessConfiguration(processId);
- List<File> files = pconf.getFiles();
- File targetWsdlFile = null;
- for(File f : files)
- {
- if(f.getName().endsWith(".wsdl"))
- {
- try
- {
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def = wsdlReader.readWSDL(f.toURL().toExternalForm());
- URL url = new WSDLParser(def).getServiceLocationURL(myRoleEndpoint.serviceName, myRoleEndpoint.portName);
- if(url!=null)
- {
- targetWsdlFile = f;
- log.debug("Matching "+processId + " to WSDL file "+targetWsdlFile);
- break;
- }
-
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
- }
-
- if(null==targetWsdlFile)
- throw new ContextException("Unable to find target WSDL file for "+ myRoleEndpoint);
-
- return targetWsdlFile;
- }
-
+
public void deactivateMyRoleEndpoint(Endpoint myRoleEndpoint)
{
log.info("Deactivate my role endpoint: "+myRoleEndpoint);
@@ -195,22 +133,7 @@
Endpoint initialPartnerEndpoint) {
// NOTE: This implementation assumes that the initial value of the
// partner role determines the binding.
- Definition wsdlDefinition = null;
- URL wsdlUrl = null;
- if (isUDDILookup()) {
- WSDLReference wsdlReference = uddiRegistration.lookupWSDL(
- initialPartnerEndpoint.serviceName,
- initialPartnerEndpoint.portName);
- if (wsdlReference!=null) {
- wsdlDefinition = wsdlReference.getDefinition();
- wsdlUrl = wsdlReference.getWsdlURL();
- }
- }
- if (isUDDILookup()==false || wsdlUrl==null) {
- WSDLReference wsdlReference = createWSDLReference(processId, initialPartnerEndpoint);
- wsdlDefinition = wsdlReference.getDefinition();
- wsdlUrl = wsdlReference.getWsdlURL();
- }
+
// TODO: TEAM_ODE:
@@ -231,7 +154,7 @@
try
{
- PartnerChannel channel = endpointManager.createClient(endpointMD, wsdlDefinition, wsdlUrl, pconf);
+ PartnerChannel channel = endpointManager.createClient(endpointMD, engine , pconf);
return new PartnerRoleChannelImpl(channel);
}
@@ -241,29 +164,11 @@
}
}
- private Definition getWSDLDefinition(QName processId, QName serviceName)
- {
- ProcessConf pconf = engine._store.getProcessConfiguration(processId);
- Definition wsdl = pconf.getDefinitionForService(serviceName);
- if (wsdl == null)
- throw new ContextException("Unable to access WSDL definition to activate MyRole endpoint for service " + serviceName
- + " on process "+ processId);
-
- return wsdl;
- }
-
+
public long calculateSizeofService(
org.apache.ode.bpel.iapi.EndpointReference arg0) {
// TODO Auto-generated method stub
return 0;
}
-
- public boolean isUDDILookup() {
- return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_UDDI_LOOKUP, "false"));
- }
-
- public boolean isWebserviceSecure() {
- return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_WEBSERVICE_SECURE, "false"));
- }
}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -35,6 +35,7 @@
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.kernel.Kernel;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
@@ -302,13 +303,13 @@
}
public WebServiceClient createClient(
- EndpointMetaData metaData,Definition wsdlDefinition, URL wsdlUrl, ProcessConf pconf)
+ EndpointMetaData metaData, BPELEngineImpl server, ProcessConf pconf)
throws EndpointManagementException
{
try
{
WebServiceClient client =
- new WebServiceClient(metaData, wsdlDefinition, wsdlUrl, executionEnvironment, pconf);
+ new WebServiceClient(metaData, executionEnvironment, server, pconf);
return client;
Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java (rev 0)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -0,0 +1,75 @@
+package org.jboss.soa.bpel.runtime.ws;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.iapi.ProcessConf;
+import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
+
+public class WSDLHelper {
+
+ protected final Log log = LogFactory.getLog(getClass());
+
+
+ public WSDLReference createWSDLReference(BPELEngineImpl engine, QName processId, QName serviceName, String portName)
+ {
+ File targetWSDLFile = findWSDLFile(engine, processId, serviceName, portName);
+ Definition wsdlDefinition = getWSDLDefinition(engine, processId, serviceName);
+ return new WSDLReference(wsdlDefinition, targetWSDLFile.toURI());
+ }
+
+ private File findWSDLFile(BPELEngineImpl engine, QName processId, QName serviceName, String portName)
+ {
+ ProcessConf pconf = engine._store.getProcessConfiguration(processId);
+ List<File> files = pconf.getFiles();
+ File targetWsdlFile = null;
+ for(File f : files)
+ {
+ if(f.getName().endsWith(".wsdl"))
+ {
+ try
+ {
+ WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+ Definition def = wsdlReader.readWSDL(f.toURL().toExternalForm());
+ URL url = new WSDLParser(def).getServiceLocationURL(serviceName, portName);
+ if(url!=null)
+ {
+ targetWsdlFile = f;
+ log.debug("Matching "+processId + " to WSDL file "+targetWsdlFile);
+ break;
+ }
+
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ if(null==targetWsdlFile)
+ throw new ContextException("Unable to find target WSDL file for "+ serviceName);
+
+ return targetWsdlFile;
+ }
+
+ private Definition getWSDLDefinition(BPELEngineImpl engine, QName processId, QName serviceName)
+ {
+ ProcessConf pconf = engine._store.getProcessConfiguration(processId);
+ Definition wsdl = pconf.getDefinitionForService(serviceName);
+ if (wsdl == null)
+ throw new ContextException("Unable to access WSDL definition to activate MyRole endpoint for service " + serviceName
+ + " on process "+ processId);
+
+ return wsdl;
+ }
+}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -47,7 +47,11 @@
import org.apache.ode.utils.DOMUtils;
import org.jboss.soa.bpel.runtime.engine.EndpointReference;
import org.jboss.soa.bpel.runtime.engine.PartnerChannel;
+import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment;
+import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory;
+import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
+import org.jboss.soa.bpel.runtime.integration.ServerConfigFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -59,17 +63,23 @@
*/
public class WebServiceClient implements PartnerChannel
{
- private static final String JAXWS_CLIENT_INITIALIZER = "jaxws.client.initializer.impl";
+ private static final String JAXWS_CLIENT_INITIALIZER = "jaxws.client.initializer.impl";
+//we should consider having our own OdeConfigProperties class if we need more properties
+ public final static String BPEL_UDDI_LOOKUP = "uddi.lookup";
+ public final static String BPEL_WEBSERVICE_SECURE = "webservice.secure";
+ public final static String BPEL_WEBSERVICE_BASEURL = "webservice.baseurl";
protected final Log log = LogFactory.getLog(getClass());
-
+ private boolean isInitialized=false;
+ private BPELEngineImpl engine;
+ private UDDIRegistration uddiRegistration = null;
private URL wsdlUrl;
private String id;
private Dispatch<SOAPMessage> dispatcher = null;
private EndpointMetaData metaData = null;
- private Definition wsdlDefintion;
+ private Definition wsdlDefinition;
private final QName serviceName;
private final QName port;
@@ -79,24 +89,59 @@
private ExecutionEnvironment executionEnvironment;
private java.net.URI baseURI;
- public WebServiceClient(EndpointMetaData metaData, Definition wsdlDefintion, URL wsdlUrl , ExecutionEnvironment env,
- ProcessConf pconf)
+ public WebServiceClient(EndpointMetaData metaData, ExecutionEnvironment env,
+ BPELEngineImpl engine, ProcessConf pconf)
{
+ this.engine = engine;
this.executionEnvironment = env;
this.metaData = metaData;
- this.wsdlDefintion = wsdlDefintion;
- this.wsdlUrl = wsdlUrl;
this.id = metaData.getEndpointId();
this.serviceName = metaData.getServiceName();
this.port = new QName(serviceName.getNamespaceURI(), metaData.getPortName());
-
- this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefintion, serviceName, port.getLocalPart());
this.baseURI = pconf.getBaseURI();
log.debug("Web Service Client: Base URI="+pconf.getBaseURI());
- }
+ }
+
+ private synchronized void initialize() {
+ if (isUDDILookup()) {
+ try {
+ String webServiceHost = ServerConfigFactory.getServerConfig().getWebServiceHost();
+ int webServicePort = ServerConfigFactory.getServerConfig().getWebServicePort();
+ URL url = new URL("http://" + webServiceHost + ":" + webServicePort);
+ if (isWebserviceSecure()) {
+ int secureWebServicePort = ServerConfigFactory.getServerConfig().getWebServicePort();
+ url = new URL("https://" + webServiceHost + ":" + secureWebServicePort);
+ }
+ //give the user the option to override
+ if (engine.getOdeConfig().getProperty(BPEL_WEBSERVICE_BASEURL)==null) {
+ engine.getOdeConfig().getProperties().setProperty(BPEL_WEBSERVICE_BASEURL, url.toExternalForm());
+ }
+ uddiRegistration = UDDIClientFactory.newInstance(engine.getOdeConfig().getProperties());
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("Continuing without UDDI integration.");
+ }
+ }
+ if (isUDDILookup()) {
+ WSDLReference wsdlReference = uddiRegistration.lookupWSDL(
+ metaData.getServiceName(),
+ metaData.getPortName());
+ if (wsdlReference!=null) {
+ wsdlDefinition = wsdlReference.getDefinition();
+ wsdlUrl = wsdlReference.getWsdlURL();
+ }
+ }
+ if (isUDDILookup()==false || wsdlUrl==null) {
+ WSDLReference wsdlReference = new WSDLHelper().createWSDLReference(engine,
+ metaData.getProcessId(), metaData.getServiceName(), metaData.getPortName());
+ wsdlDefinition = wsdlReference.getDefinition();
+ wsdlUrl = wsdlReference.getWsdlURL();
+ }
+ isInitialized=true;
+ }
public EndpointReference getEndpointReference()
{
@@ -106,8 +151,10 @@
public void invoke(final PartnerRoleMessageExchange mex)
{
- log.debug("Invoking dispatcher "+this.id);
-
+ if (!isInitialized) initialize();
+ log.debug("Invoking dispatcher "+this.id);
+
+
boolean isTwoWay = mex.getMessageExchangePattern()
== org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern.REQUEST_RESPONSE;
@@ -284,7 +331,7 @@
+ "\n" + DOMWriter.printNode(odeMsgEl, true));
QName faultType = fault.getMessage().getQName();
- QName faultName = new QName(wsdlDefintion.getTargetNamespace(), fault.getName());
+ QName faultName = new QName(wsdlDefinition.getTargetNamespace(), fault.getName());
Message response = mex.createMessage(faultType);
response.setMessage(odeMsgEl);
@@ -312,12 +359,13 @@
throw new RuntimeException("Not implemented. Should be removed form interface");
}
- private Dispatch getDispatcher(QName portName)
+ private synchronized Dispatch getDispatcher(QName portName)
{
- if(null==dispatcher)
- {
+
+ if(null==dispatcher) {
+
log.debug("Creating Dispatcher ("+this.id+") on " + wsdlUrl + ": "+serviceName);
-
+ this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart());
initializeStack(portName);
Service service = Service.create(this.wsdlUrl, serviceName);
@@ -358,5 +406,16 @@
{
return "WebServiceClient {service="+serviceName+",port="+port+"}";
}
+
+ public boolean isUDDILookup() {
+ return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_UDDI_LOOKUP, "false"));
+ }
+
+ public boolean isWebserviceSecure() {
+ return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_WEBSERVICE_SECURE, "false"));
+ }
+
+
+
}
Modified: trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
===================================================================
--- trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -21,10 +21,6 @@
*/
package org.jboss.soa.bpel.uddi;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.URL;
import java.rmi.RemoteException;
import java.util.List;
@@ -47,9 +43,9 @@
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.TransportException;
-import org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
+import org.jboss.soa.bpel.runtime.ws.WebServiceClient;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
@@ -486,6 +482,6 @@
* @return
*/
private String getWebserviceBaseUrl() {
- return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080"));
+ return (properties.getProperty(WebServiceClient.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080"));
}
}
Modified: trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java
===================================================================
--- trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -21,10 +21,6 @@
*/
package org.jboss.soa.bpel.uddi300;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.URL;
import java.rmi.RemoteException;
import java.util.List;
@@ -46,9 +42,9 @@
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.TransportException;
-import org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
+import org.jboss.soa.bpel.runtime.ws.WebServiceClient;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
@@ -66,10 +62,13 @@
import org.uddi.v3_service.DispositionReportFaultMessage;
/**
+ * This implementation is to support jUDDI-client-3.0.0 which ships with
+ * JBESB-4.7, which will no longer be supported in the next release.
*
* * @author Kurt T Stam <kurt.stam(a)jboss.com>
*
*/
+@Deprecated()
public class UDDI300RegistrationImpl extends AnnotationProcessor implements UDDIRegistration {
protected static final Log log = LogFactory.getLog(UDDI300RegistrationImpl.class);
@@ -442,6 +441,6 @@
* @return
*/
private String getWebserviceBaseUrl() {
- return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080"));
+ return (properties.getProperty(WebServiceClient.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080"));
}
}
14 years, 6 months
- 1
- 0
riftsaw SVN: r691 - in branches/ODE/ODE-1.x-jpa: dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-02 09:31:07 -0400 (Wed, 02 Jun 2010)
New Revision: 691
Removed:
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/JpaTxMgrProvider.java
Modified:
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/ConfStoreDAOConnectionFactoryImpl.java
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/HibernateUtil.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java
Log:
* update the JpaConnection, remove the clearOnComplete hooks, as it is not working in Hibernate.
* refactored the Hibernate EntityManagerFactory initialization.
(with JpaConnection update, it now has the NullPointerException with regard to the simple_invoke example)
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java 2010-06-01 20:24:20 UTC (rev 690)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java 2010-06-02 13:31:07 UTC (rev 691)
@@ -108,7 +108,7 @@
try {
if (_mgr.getStatus() == Status.STATUS_ACTIVE) {
_em.joinTransaction();
- clearOnComplete();
+ //clearOnComplete();
}
} catch (SystemException se) {
__log.error(se);
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java 2010-06-01 20:24:20 UTC (rev 690)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java 2010-06-02 13:31:07 UTC (rev 691)
@@ -336,10 +336,14 @@
}
public MessageExchangeDAO getMessageExchange(String mexid) {
- _txCtx.begin();
- MessageExchangeDAO dao = _em.find(MessageExchangeDAOImpl.class, mexid);
+ _txCtx.begin();
+ List l = _em.createQuery("select x from MessageExchangeDAOImpl x where x._id = ?1").setParameter(1, mexid).getResultList();
_txCtx.commit();
- return dao;
+ if (l.size() == 0) {
+ return null;
+ }
+
+ return (MessageExchangeDAOImpl) l.get(0);
}
public void deleteMessageExchange(MessageExchangeDAO mexDao) {
Deleted: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/JpaTxMgrProvider.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/JpaTxMgrProvider.java 2010-06-01 20:24:20 UTC (rev 690)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/JpaTxMgrProvider.java 2010-06-02 13:31:07 UTC (rev 691)
@@ -1,86 +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.
- */
-
-package org.apache.ode.dao.jpa.bpel;
-
-import javax.transaction.NotSupportedException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.apache.openjpa.ee.ManagedRuntime;
-import org.apache.openjpa.util.GeneralException;
-
-public class JpaTxMgrProvider implements ManagedRuntime {
- private TransactionManager _txMgr;
-
- public JpaTxMgrProvider(TransactionManager txMgr) {
- _txMgr = txMgr;
- }
-
- public TransactionManager getTransactionManager() throws Exception {
- return _txMgr;
- }
-
- public void setRollbackOnly(Throwable cause) throws Exception {
- // there is no generic support for setting the rollback cause
- getTransactionManager().getTransaction().setRollbackOnly();
- }
-
- public Throwable getRollbackCause() throws Exception {
- // there is no generic support for setting the rollback cause
- return null;
- }
-
- public Object getTransactionKey() throws Exception, SystemException {
- return _txMgr.getTransaction();
- }
-
- public void doNonTransactionalWork(java.lang.Runnable runnable) throws NotSupportedException {
- TransactionManager tm = null;
- Transaction transaction = null;
-
- try {
- tm = getTransactionManager();
- transaction = tm.suspend();
- } catch (Exception e) {
- NotSupportedException nse =
- new NotSupportedException(e.getMessage());
- nse.initCause(e);
- throw nse;
- }
-
- runnable.run();
-
- try {
- tm.resume(transaction);
- } catch (Exception e) {
- try {
- transaction.setRollbackOnly();
- }
- catch(SystemException se2) {
- throw new GeneralException(se2);
- }
- NotSupportedException nse =
- new NotSupportedException(e.getMessage());
- nse.initCause(e);
- throw nse;
- }
- }
-}
\ No newline at end of file
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-06-01 20:24:20 UTC (rev 690)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-06-02 13:31:07 UTC (rev 691)
@@ -18,8 +18,6 @@
*/
package org.apache.ode.dao.jpa.hibernate;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
@@ -33,13 +31,9 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ode.dao.bpel.BpelDAOConnection;
import org.apache.ode.dao.bpel.BpelDAOConnectionFactory;
-import org.apache.ode.dao.jpa.JpaConnection;
import org.apache.ode.dao.jpa.JpaOperator;
import org.apache.ode.dao.jpa.bpel.BpelDAOConnectionImpl;
import org.apache.ode.il.config.OdeConfigProperties;
-import org.apache.ode.utils.GUID;
-import org.hibernate.cfg.Environment;
-import org.hibernate.ejb.EntityManagerImpl;
/**
@@ -47,20 +41,15 @@
public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactory {
static final Log __log = LogFactory.getLog(BpelDAOConnectionFactoryImpl.class);
- static Map _defaultProperties = new HashMap();
- static JpaOperator _operator = new JpaOperatorImpl();
+ JpaOperator _operator = new JpaOperatorImpl();
EntityManagerFactory _emf;
TransactionManager _txm;
DataSource _ds;
- static {
- _defaultProperties.put("javax.persistence.provider", "org.hibernate.ejb.HibernatePersistence");
- }
-
public void init(Properties odeConfig, TransactionManager txm, Object env) {
this._txm = txm;
this._ds = (DataSource) env;
- Map emfProperties = buildConfig(OdeConfigProperties.PROP_DAOCF + ".", odeConfig, _txm, _ds);
+ Map emfProperties = HibernateUtil.buildConfig(OdeConfigProperties.PROP_DAOCF + ".", odeConfig, _txm, _ds);
_emf = Persistence.createEntityManagerFactory("ode-bpel", emfProperties);
}
@@ -69,7 +58,7 @@
final ThreadLocal<BpelDAOConnectionImpl> currentConnection = BpelDAOConnectionImpl.getThreadLocal();
BpelDAOConnectionImpl conn = (BpelDAOConnectionImpl) currentConnection.get();
- if (conn != null && isOpen(conn)) {
+ if (conn != null && HibernateUtil.isOpen(conn)) {
return conn;
} else {
EntityManager em = _emf.createEntityManager();
@@ -83,89 +72,8 @@
_emf.close();
}
- static Map buildConfig(String prefix, Properties odeConfig, TransactionManager txm, DataSource ds) {
- Map props = new HashMap(_defaultProperties);
-
- addEntries(prefix, odeConfig, props);
- String guid = new GUID().toString();
- if (ds != null) {
- props.put(Environment.CONNECTION_PROVIDER, DataSourceConnectionProvider.class.getName());
- HibernateUtil.registerDatasource(guid, ds);
- //props.put(Environment.DIALECT, guessDialect(ds));
- }
- if (txm != null) {
- props.put(Environment.CURRENT_SESSION_CONTEXT_CLASS, "jta");
- props.put(Environment.TRANSACTION_MANAGER_STRATEGY, HibernateTransactionManagerLookup.class.getName());
- HibernateUtil.registerTransactionManager(guid, txm);
- props.put("javax.persistence.transactionType", "JTA");
- } else {
- props.put("javax.persistence.transactionType", "RESOURCE_LOCAL");
- }
-
-
- if (ds != null || txm != null) {
- props.put(HibernateUtil.PROP_GUID, guid);
- }
-
- if (Boolean.valueOf(odeConfig.getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE, "true"))) {
- props.put(Environment.HBM2DDL_AUTO, "create-drop");
- __log.debug("create-drop DDL by Hibernate automatically");
- }
-
- // Isolation levels override; when you use a ConnectionProvider, this has no effect
- //String level = System.getProperty("ode.connection.isolation", "2");
- //props.put(Environment.ISOLATION, level);
-
-
- if (__log.isDebugEnabled()) {
- __log.debug("========= Hibernate properties ==============");
- for (Iterator it = props.keySet().iterator(); it.hasNext(); ) {
- Object key = it.next();
- __log.debug("key : " + key + ", value : " + props.get(key));
- }
- __log.debug("==============================================");
- }
-
- return props;
- }
-
- public static void addEntries(String prefix, Properties odeConfig, Map props) {
- if (odeConfig != null) {
- for (Map.Entry me : odeConfig.entrySet()) {
- String key = (String) me.getKey();
- if (key.startsWith(prefix)) {
- String jpaKey = key.substring(prefix.length() - 1);
- String val = (String) me.getValue();
- if (val == null || val.trim().length() == 0) {
- props.remove(jpaKey);
- } else {
- props.put(jpaKey, me.getValue());
- }
- } else if (key.startsWith("hibernate")) {
- props.put(key, me.getValue());
- }
- }
- }
- }
-
- /*
- * For some reason Hibernate does not mark an EntityManager as being closed when
- * the EntityManagerFactory that created it is closed. This method performs a
- * deep introspection to determine if the EntityManager is still viable.
- */
- public static boolean isOpen(JpaConnection conn) {
- EntityManager mgr = conn.getEntityManager();
- if (mgr == null) {
- return false;
- } else if (mgr instanceof EntityManagerImpl) {
- EntityManagerImpl mgrImpl = (EntityManagerImpl) mgr;
- return !mgrImpl.getSession().getSessionFactory().isClosed();
- } else {
- return !conn.isClosed();
- }
- }
- private static final String DEFAULT_HIBERNATE_DIALECT = "org.hibernate.dialect.DerbyDialect";
+ //private static final String DEFAULT_HIBERNATE_DIALECT = "org.hibernate.dialect.DerbyDialect";
//Because the JBoss AS 5.1.0.GA uses Hibernate 3.3.1.GA
//While SOA-P 5 uses Hibernate 3.3.2.GA, they are different for guessDialect, so comment it now.
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/ConfStoreDAOConnectionFactoryImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/ConfStoreDAOConnectionFactoryImpl.java 2010-06-01 20:24:20 UTC (rev 690)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/ConfStoreDAOConnectionFactoryImpl.java 2010-06-02 13:31:07 UTC (rev 691)
@@ -20,20 +20,20 @@
import java.util.Map;
import java.util.Properties;
+
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.jpa.JpaOperator;
import org.apache.ode.dao.jpa.store.ConfStoreDAOConnectionImpl;
-import org.apache.ode.il.config.OdeConfigProperties;
import org.apache.ode.dao.store.ConfStoreDAOConnection;
import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
-import static org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl.isOpen;
-import static org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl._operator;
-import static org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl.buildConfig;
+import org.apache.ode.il.config.OdeConfigProperties;
/**
*/
@@ -41,14 +41,15 @@
static final Log __log = LogFactory.getLog(ConfStoreDAOConnectionFactoryImpl.class);
EntityManagerFactory _emf;
- TransactionManager _txm;
- DataSource _ds;
+ TransactionManager _txm;
+ DataSource _ds;
+ JpaOperator _operator = new JpaOperatorImpl();
public void init(Properties odeConfig,TransactionManager txm, Object env) {
- this._txm = txm;
- this._ds = (DataSource) env;
- Map emfProperties = buildConfig(OdeConfigProperties.PROP_DAOCF + ".", odeConfig, _txm, _ds);
+ this._txm = txm;
+ this._ds = (DataSource) env;
+ Map emfProperties = HibernateUtil.buildConfig(OdeConfigProperties.PROP_DAOCF + ".", odeConfig, _txm, _ds);
_emf = Persistence.createEntityManagerFactory("ode-store", emfProperties);
}
@@ -57,7 +58,7 @@
final ThreadLocal<ConfStoreDAOConnectionImpl> currentConnection = ConfStoreDAOConnectionImpl.getThreadLocal();
ConfStoreDAOConnectionImpl conn = (ConfStoreDAOConnectionImpl)currentConnection.get();
- if (conn != null && isOpen(conn)) {
+ if (conn != null && HibernateUtil.isOpen(conn)) {
return conn;
} else {
EntityManager em = _emf.createEntityManager();
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/HibernateUtil.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/HibernateUtil.java 2010-06-01 20:24:20 UTC (rev 690)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/HibernateUtil.java 2010-06-02 13:31:07 UTC (rev 691)
@@ -22,36 +22,37 @@
import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
+import javax.persistence.EntityManager;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.jpa.JpaConnection;
+import org.apache.ode.il.config.OdeConfigProperties;
+import org.apache.ode.utils.GUID;
+import org.hibernate.cfg.Environment;
+import org.hibernate.ejb.EntityManagerImpl;
+
/**
* Manages datasource and transaction, for hibernate usage.
*
+ * setup Hibernate specific initialization.
+ *
*/
public class HibernateUtil {
-
+ static final Log __log = LogFactory.getLog(HibernateUtil.class);
+
public static final String PROP_GUID = "ode.hibernate.guid";
- private static final Map<String, TransactionManager> _txManagers =
- Collections.synchronizedMap(new HashMap<String, TransactionManager>());
- private static final Map<String, DataSource> _dataSources =
- Collections.synchronizedMap(new HashMap<String,DataSource>());
+ private static final Map<String, TransactionManager> _txManagers = Collections.synchronizedMap(new HashMap<String, TransactionManager>());
+ private static final Map<String, DataSource> _dataSources = Collections.synchronizedMap(new HashMap<String,DataSource>());
- private static final String[] CANNOT_JOIN_FOR_UPDATE_DIALECTS =
- {"org.hibernate.dialect.IngresDialect"};
-
- private final TransactionManager _txManager = null;
-
-
- TransactionManager getTransactionManager() {
- return _txManager;
- }
-
public static void registerTransactionManager(String uuid, TransactionManager txm) {
_txManagers.put(uuid, txm);
}
@@ -60,14 +61,101 @@
_dataSources.put(uuid, ds);
}
-
public static TransactionManager getTransactionManager(Properties props) {
String guid = props.getProperty(PROP_GUID);
- return _txManagers.get(guid);
+ TransactionManager mgr = _txManagers.get(guid);
+ if (__log.isDebugEnabled()) {
+ __log.debug("guid is: " + guid + ", TransactionManager is: " + mgr);
+ }
+ return mgr;
}
public static Connection getConnection(Properties props) throws SQLException {
String guid = props.getProperty(PROP_GUID);
- return _dataSources.get(guid).getConnection();
+ Connection conn = _dataSources.get(guid).getConnection();
+ if (__log.isDebugEnabled()) {
+ __log.debug("guid is: " + guid + ", Connection is: " + conn);
+ }
+ return conn;
}
+
+ public static Map buildConfig(String prefix, Properties odeConfig, TransactionManager txm, DataSource ds) {
+ Map props = new HashMap();
+ props.put("javax.persistence.provider", "org.hibernate.ejb.HibernatePersistence");
+
+ addEntries(prefix, odeConfig, props);
+
+ String guid = new GUID().toString();
+ if (ds != null) {
+ props.put(Environment.CONNECTION_PROVIDER, DataSourceConnectionProvider.class.getName());
+ registerDatasource(guid, ds);
+ }
+ if (txm != null) {
+ props.put(Environment.CURRENT_SESSION_CONTEXT_CLASS, "jta");
+ props.put(Environment.TRANSACTION_MANAGER_STRATEGY, HibernateTransactionManagerLookup.class.getName());
+ //props.put(Environment.TRANSACTION_STRATEGY, "org.apache.ode.dao.jpa.hibernate.JotmTransactionFactory");
+ HibernateUtil.registerTransactionManager(guid, txm);
+ props.put("javax.persistence.transactionType", "JTA");
+ } else {
+ props.put("javax.persistence.transactionType", "RESOURCE_LOCAL");
+ }
+
+ if (ds != null || txm != null) {
+ props.put(HibernateUtil.PROP_GUID, guid);
+ }
+
+ if (Boolean.valueOf(odeConfig.getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE, "true"))) {
+ props.put(Environment.HBM2DDL_AUTO, "create-drop");
+ __log.debug("create-drop DDL by Hibernate automatically");
+ }
+
+ if (__log.isDebugEnabled()) {
+ __log.debug("========= Hibernate properties ==============");
+ for (Iterator it = props.keySet().iterator(); it.hasNext(); ) {
+ Object key = it.next();
+ __log.debug("key : " + key + ", value : " + props.get(key));
+ }
+ __log.debug("==============================================");
+ }
+
+ return props;
+ }
+
+ private static void addEntries(String prefix, Properties odeConfig, Map props) {
+ if (odeConfig != null) {
+ for (Map.Entry me : odeConfig.entrySet()) {
+ String key = (String) me.getKey();
+ if (key.startsWith(prefix)) {
+ String jpaKey = key.substring(prefix.length() - 1);
+ String val = (String) me.getValue();
+ if (val == null || val.trim().length() == 0) {
+ props.remove(jpaKey);
+ } else {
+ props.put(jpaKey, me.getValue());
+ }
+ } else if (key.startsWith("hibernate")) {
+ props.put(key, me.getValue());
+ }
+ }
+ }
+ }
+
+ /*
+ * For some reason Hibernate does not mark an EntityManager as being closed when
+ * the EntityManagerFactory that created it is closed. This method performs a
+ * deep introspection to determine if the EntityManager is still viable.
+ */
+ public static boolean isOpen(JpaConnection conn) {
+ EntityManager mgr = conn.getEntityManager();
+ if (mgr == null) {
+ return false;
+ } else if (mgr instanceof EntityManagerImpl) {
+ EntityManagerImpl mgrImpl = (EntityManagerImpl) mgr;
+ return !mgrImpl.getSession().getSessionFactory().isClosed();
+ } else {
+ return !conn.isClosed();
+ }
+ }
+
+
}
14 years, 6 months
- 1
- 0