Author: rr
Date: Mon Mar 8 08:43:20 2010
New Revision: 920231
URL: http://svn.apache.org/viewvc?rev=920231&view=rev
Log:
ODE-777: Add vendor specific config options for internal pool for jbi-karaf
Added:
ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml (with props)
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/META-INF/persistence.xml
(with props)
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/bpel-epr/pom.xml
ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
ode/branches/APACHE_ODE_1.X/dependencies.rb
ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
ode/branches/APACHE_ODE_1.X/pom.xml
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=920231&r1=920230&r2=920231&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Mon Mar 8 08:43:20 2010
@@ -173,7 +173,7 @@
desc "ODE Interface Layers Common"
define "bpel-epr" do
compile.with projects("utils", "bpel-dao", "bpel-api"),
- AXIOM, COMMONS.lang, COMMONS.logging, DERBY, JAVAX.connector,
JAVAX.stream, JAVAX.transaction, GERONIMO.transaction, GERONIMO.connector,
TRANQL, XMLBEANS
+ AXIOM, COMMONS.lang, COMMONS.logging, COMMONS.beanutils, DERBY,
JAVAX.connector, JAVAX.stream, JAVAX.transaction, GERONIMO.transaction,
GERONIMO.connector, TRANQL, XMLBEANS
package :jar
end
Modified: ode/branches/APACHE_ODE_1.X/bpel-epr/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-epr/pom.xml?rev=920231&r1=920230&r2=920231&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-epr/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-epr/pom.xml Mon Mar 8 08:43:20 2010
@@ -67,5 +67,10 @@
<version>${jencks.version}</version>
<classifier>all</classifier>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.2</version>
+ </dependency>
</dependencies>
</project>
Modified:
ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java?rev=920231&r1=920230&r2=920231&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
Mon Mar 8 08:43:20 2010
@@ -23,6 +23,7 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.Map;
import java.util.Properties;
import org.apache.commons.logging.Log;
@@ -172,8 +173,8 @@
}
for (Object key : _props.keySet()) {
String value = (String) _props.get(key);
- value = SystemUtils.replaceSystemProperties(value);
- _props.put(key, value);
+ value = SystemUtils.replaceSystemProperties(value);
+ _props.put(key, value);
}
}
@@ -203,6 +204,22 @@
public String getDbIntenralJdbcUrl() {
return getProperty(OdeConfigProperties.PROP_DB_INTERNAL_URL,
"jdbc:derby://localhost/ode");
}
+
+ public String getDbInternalMCFClass() {
+ return getProperty("db.int.mcf");
+ }
+
+ public Properties getDbInternalMCFProperties() {
+ String prefix = _prefix + "db.int.mcf.";
+ Properties p = new Properties();
+ for (Map.Entry<Object, Object> e : _props.entrySet()) {
+ String s = "" + e.getKey();
+ if (s.startsWith(prefix)) {
+ p.put(s.substring(prefix.length()), e.getValue());
+ }
+ }
+ return p;
+ }
/**
* JDBC driver class (for use in INTERNAL mode).
@@ -266,7 +283,7 @@
}
public long getDehydrationMaximumAge() {
- return Long.valueOf(getProperty(PROP_PROCESS_DEHYDRATION_MAXIMUM_AGE,
""+20*60*1000));
+ return Long.valueOf(getProperty(PROP_PROCESS_DEHYDRATION_MAXIMUM_AGE,
""+20*60*1000));
}
public int getDehydrationMaximumCount() {
@@ -323,7 +340,7 @@
}
public int getMigrationTransactionTimeout() {
- return Integer.valueOf(getProperty(PROP_MIGRATION_TRANSACTION_TIMEOUT,
String.valueOf(0)));
+ return Integer.valueOf(getProperty(PROP_MIGRATION_TRANSACTION_TIMEOUT,
String.valueOf(0)));
}
}
Modified:
ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java?rev=920231&r1=920230&r2=920231&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
Mon Mar 8 08:43:20 2010
@@ -26,6 +26,7 @@
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.derby.jdbc.EmbeddedDriver;
@@ -136,7 +137,7 @@
public DataSource getDataSource() {
//return __logSql.isDebugEnabled() ? new
LoggingDataSourceWrapper(_datasource, __logSql) : _datasource;
- return __logSql.isDebugEnabled() ?
LoggingInterceptor.createLoggingDS(_datasource, __logSql) : _datasource;
+ return __logSql.isDebugEnabled() ?
LoggingInterceptor.createLoggingDS(_datasource, __logSql) : _datasource;
}
private void initDataSource() throws DatabaseConfigException {
@@ -170,14 +171,13 @@
__log.info(__msgs.msgOdeUsingInternalDb(_odeConfig.getDbIntenralJdbcUrl(),
_odeConfig.getDbInternalJdbcDriverClass()));
initInternalDb(_odeConfig.getDbIntenralJdbcUrl(),
_odeConfig.getDbInternalJdbcDriverClass(),
_odeConfig.getDbInternalUserName(),
_odeConfig.getDbInternalPassword());
-
}
private void initInternalDb(String url, String driverClass, String
username,String password) throws DatabaseConfigException {
__log.debug("Creating connection pool for " + url + " with driver " +
driverClass);
if (!(_txm instanceof RecoverableTransactionManager)) {
- throw new RuntimeException("TransactionManager is not
recoverable.");
+ throw new RuntimeException("TransactionManager is not
recoverable.");
}
TransactionSupport transactionSupport = LocalTransactions.INSTANCE;
@@ -201,15 +201,31 @@
getClass().getName(),
getClass().getClassLoader());
- JDBCDriverMCF mcf = new JDBCDriverMCF();
+
try {
- mcf.setDriver(driverClass);
- mcf.setConnectionURL(url);
- if (username != null) {
- mcf.setUserName(username);
- }
- if (password != null) {
- mcf.setPassword(password);
+ javax.resource.spi.ManagedConnectionFactory mcf = null;
+ String mcfClass = _odeConfig.getDbInternalMCFClass();
+ if (mcfClass != null) {
+ Properties dbInternalMCFProps =
_odeConfig.getDbInternalMCFProperties();
+ if (__log.isDebugEnabled()) {
+ __log.debug("Using internal DB MCF " + mcfClass + " " +
dbInternalMCFProps);
+ }
+ mcf = (javax.resource.spi.ManagedConnectionFactory)
Class.forName(mcfClass).newInstance();
+ BeanUtils.copyProperties(mcf, dbInternalMCFProps);
+ } else {
+ if (__log.isDebugEnabled()) {
+ __log.debug("Using internal DB JDBCDriverMCF");
+ }
+ JDBCDriverMCF mcf2 = new JDBCDriverMCF();
+ mcf = mcf2;
+ mcf2.setDriver(driverClass);
+ mcf2.setConnectionURL(url);
+ if (username != null) {
+ mcf2.setUserName(username);
+ }
+ if (password != null) {
+ mcf2.setPassword(password);
+ }
}
_connectionManager.doStart();
_datasource = (DataSource)
mcf.createConnectionFactory(_connectionManager);
Modified: ode/branches/APACHE_ODE_1.X/dependencies.rb
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dependencies.rb?rev=920231&r1=920230&r2=920231&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dependencies.rb (original)
+++ ode/branches/APACHE_ODE_1.X/dependencies.rb Mon Mar 8 08:43:20 2010
@@ -46,7 +46,8 @@
:logging =>"commons-logging:commons-logging:jar:1.1",
:io =>"commons-io:commons-io:jar:1.4",
:pool =>"commons-pool:commons-pool:jar:1.4",
- :primitives =>"commons-primitives:commons-primitives:jar:1.0"
+ :primitives =>"commons-primitives:commons-primitives:jar:1.0",
+ :beanutils =>"commons-beanutils:commons-beanutils:jar:1.8.2"
)
DERBY = "org.apache.derby:derby:jar:10.5.3.0_1"
DERBY_TOOLS = "org.apache.derby:derbytools:jar:10.5.3.0_1"
Added: ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml?rev=920231&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml Mon Mar 8 08:43:20 2010
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <!--
+
+ 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.
+ -->
+
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jbi-karaf</artifactId>
+ <name>ODE :: JBI Karaf Bundle</name>
+ <packaging>bundle</packaging>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>1.3.4-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.directory}/features</targetPath>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+
<Export-Package>org.apache.ode*;version=${ode.version};-split-package:=merge-first</Export-Package>
+ <Import-Package>
+ !com.sun.mirror*,
+ !junit.framework*,
+ !org.apache.axis2.client*,
+ !org.apache.tools.ant*,
+ javax.jbi*;version="1.0",
+ javax.transaction*;version="1.1",
+ org.apache.commons.httpclient*;version="3.0",
+ org.apache.commons.logging*;version="1.1",
+ org.apache.commons*,
+ org.apache.geronimo.transaction.manager;version="2.0",
+ org.osgi.service.command;version="[0.2,1)",
+ org.springframework.beans.factory.xml;version="2.5",
+ org.apache.geronimo.transaction.manager,
+ org.tranql.connector.jdbc,
+ org.w3c.dom,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers,
+ org.jaxen.saxpath,
+ net.sf.saxon.xpath,
+ *;resolution:=optional
+ </Import-Package>
+<Embed-Dependency>*;inline=**.xsd|schemaorg_apache_xmlbeans/**|**.xml</Embed-Dependency>
+
+ <DynamicImport-Package>*</DynamicImport-Package>
+<Include-Resource>
+src/main/resources,
+...@../dao-jpa-ojpa-derby/target/ode-dao-jpa-ojpa-derby-${project.version}.zip,
+...@../dao-hibernate-db/target/ode-dao-hibernate-db-${project.version}.zip,
+</Include-Resource>
+
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jbi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-schemas</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-hibernate</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+</project>
Propchange: ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/META-INF/persistence.xml?rev=920231&view=auto
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/META-INF/persistence.xml
(added)
+++
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/META-INF/persistence.xml
Mon Mar 8 08:43:20 2010
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ version="1.0">
+ <persistence-unit name="ode-dao">
+ <!--
+ This properties file is used specifically by the
+ OpenJPA Enhancer.
+ -->
+
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrelationSetDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrelatorDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.EventDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.FaultDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageExchangeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageRouteDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrSetProperty</class>
+ <class>org.apache.ode.dao.jpa.MexProperty</class>
+ <class>org.apache.ode.dao.jpa.XmlDataProperty</class>
+ </persistence-unit>
+ <persistence-unit name="ode-store">
+ <!--
+ This properties file is used specifically by the
+ OpenJPA Enhancer.
+ -->
+
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <class>org.apache.ode.store.jpa.ProcessConfDaoImpl</class>
+ <class>org.apache.ode.store.jpa.ProcessConfPropertyDaoImpl</class>
+ <class>org.apache.ode.store.jpa.DeploymentUnitDaoImpl</class>
+ <class>org.apache.ode.store.jpa.VersionTrackerDAOImpl</class>
+ </persistence-unit>
+</persistence>
Propchange:
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=920231&r1=920230&r2=920231&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
Mon Mar 8 08:43:20 2010
@@ -147,10 +147,9 @@
_suManager = new OdeSUManager(_ode);
_initSuccess = true;
__log.info(__msgs.msgOdeInitialized());
- } finally {
- if (!_initSuccess) {
- // TODO ..then what? at least shutdown the scheduler
- }
+ } catch (Throwable t) {
+ __log.fatal("", t);
+ throw new JBIException("Fatal error", t);
}
}
Modified: ode/branches/APACHE_ODE_1.X/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/pom.xml?rev=920231&r1=920230&r2=920231&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/pom.xml Mon Mar 8 08:43:20 2010
@@ -89,7 +89,7 @@
<junit.version>4.4</junit.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
<persistence-api.version>1.0</persistence-api.version>
- <xalan.version>2.7.0-2</xalan.version>
+ <xalan.version>2.7.1</xalan.version>
<ant.version>1.6.5</ant.version>
<openjpa.version>1.2.1</openjpa.version>
<serp.version>1.13.1</serp.version>
@@ -422,7 +422,7 @@
<version>${ode.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ode</groupId>
+ <groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
</dependency>
