riftsaw SVN: r324 - branches/ODE/ODE-1.x-fixes.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-25 03:27:24 -0500 (Wed, 25 Nov 2009)
New Revision: 324
Modified:
branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw
Log:
* update the ode version back to 2.0-SNAPSHOT.
Modified: branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw
===================================================================
--- branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw 2009-11-25 07:29:27 UTC (rev 323)
+++ branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw 2009-11-25 08:27:24 UTC (rev 324)
@@ -23,7 +23,7 @@
require "buildr/hibernate"
# Keep this structure to allow the build system to update version numbers.
-VERSION_NUMBER = "2.0-M2"
+VERSION_NUMBER = "2.0-SNAPSHOT"
NEXT_VERSION = "2.0-CR1"
ANNONGEN = "annogen:annogen:jar:0.1.0"
15 years, 3 months
riftsaw SVN: r323 - trunk/qa.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-25 02:29:27 -0500 (Wed, 25 Nov 2009)
New Revision: 323
Modified:
trunk/qa/build.xml
Log:
* update it back to 2.0-SNAPSHOT
Modified: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2009-11-24 19:25:38 UTC (rev 322)
+++ trunk/qa/build.xml 2009-11-25 07:29:27 UTC (rev 323)
@@ -9,7 +9,7 @@
<!-- CONFIGURABLE PROPERTIES -->
<property name="database" value="hsqldb" />
- <property name="riftsaw.version" value="2.0-M2" />
+ <property name="riftsaw.version" value="2.0-SNAPSHOT" />
<property name="riftsaw.home" value="${riftsaw.parent.dir}/riftsaw-${riftsaw.version}" /> <!-- riftsaw.home should not be configured. change riftsaw.parent.dir instead -->
<property name="jboss.parent.dir" value="${riftsaw.home}" />
15 years, 3 months
riftsaw SVN: r322 - in branches/ODE/ODE-1.x-fixes: bpel-store/src/main/java/org/apache/ode/store/hib and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: kurtstam
Date: 2009-11-24 14:25:38 -0500 (Tue, 24 Nov 2009)
New Revision: 322
Modified:
branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw
branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
branches/ODE/ODE-1.x-fixes/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
Log:
RIFTSAW-106 bringing hibernate version to 3.3.2.ga
Modified: branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw
===================================================================
--- branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw 2009-11-24 17:15:41 UTC (rev 321)
+++ branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw 2009-11-24 19:25:38 UTC (rev 322)
@@ -44,8 +44,8 @@
:version=>"1.3"),
"org.apache.ws.security:wss4j:jar:1.5.3",
"org.apache.santuario:xmlsec:jar:1.4.0",
- "opensaml:opensaml:jar:1.1",
- "bouncycastle:bcprov-jdk15:jar:132"]
+ "opensaml:opensaml:jar:1.1b",
+ "bouncycastle:bcprov-jdk15:jar:140"]
)
AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.3"
BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.0"
@@ -69,8 +69,8 @@
:transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:2.0.1",
:connector =>"org.apache.geronimo.components:geronimo-connector:jar:2.0.1"
)
-HIBERNATE = [ "org.hibernate:hibernate:jar:3.2.5.ga", "asm:asm:jar:1.5.3",
- "antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.1_3", "net.sf.ehcache:ehcache:jar:1.2.3" ]
+HIBERNATE = [ "org.hibernate:hibernate-core:jar:3.3.2.GA", "asm:asm:jar:1.5.3",
+ "antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.2", "net.sf.ehcache:ehcache:jar:1.2.3" ]
HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7"
JAVAX = struct(
:activation =>"javax.activation:activation:jar:1.1",
@@ -167,7 +167,7 @@
compile.options.source = "1.5"
compile.options.target = "1.5"
- manifest["Implementation-Vendor"] = "Apache Software Foundation"
+ manifest["Implementation-Vendor"] = "JBoss by Red Hat"
meta_inf << file("NOTICE")
desc "ODE Axis Integration Layer"
Modified: branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
===================================================================
--- branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java 2009-11-24 17:15:41 UTC (rev 321)
+++ branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java 2009-11-24 19:25:38 UTC (rev 322)
@@ -34,7 +34,7 @@
import org.hibernate.cfg.Environment;
import org.hibernate.connection.ConnectionProvider;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.DialectFactory;
+import org.hibernate.dialect.resolver.StandardDialectResolver;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
@@ -42,7 +42,6 @@
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
@@ -52,32 +51,12 @@
private static final Messages __msgs = MessageBundle.getMessages(Messages.class);
- private static final String DEFAULT_HIBERNATE_DIALECT = "org.hibernate.dialect.DerbyDialect";
+ private static final Dialect DEFAULT_HIBERNATE_DIALECT = new org.hibernate.dialect.DerbyDialect();
- private static final HashMap<String, DialectFactory.VersionInsensitiveMapper> HIBERNATE_DIALECTS = new HashMap<String, DialectFactory.VersionInsensitiveMapper>();
-
private static final String _guid = new GUID().toString();
private static final Map<String, DataSource> _dataSources = new ConcurrentHashMap<String, DataSource>();
- static {
- // Hibernate has a nice table that resolves the dialect from the database
- // product name,
- // but doesn't include all the drivers. So this is supplementary, and some
- // day in the
- // future they'll add more drivers and we can get rid of this.
- // Drivers already recognized by Hibernate:
- // HSQL Database Engine
- // DB2/NT
- // MySQL
- // PostgreSQL
- // Microsoft SQL Server Database, Microsoft SQL Server
- // Sybase SQL Server
- // Informix Dynamic Server
- // Oracle 8 and Oracle >8
- HIBERNATE_DIALECTS.put("Apache Derby", new DialectFactory.VersionInsensitiveMapper(DEFAULT_HIBERNATE_DIALECT));
- }
-
private TransactionManager _txMgr;
private final DataSource _ds;
@@ -150,9 +129,9 @@
}
}
- private String guessDialect(DataSource dataSource) throws Exception {
+ private Dialect guessDialect(DataSource dataSource) throws Exception {
- String dialect = null;
+ Dialect dialect = null;
// Open a connection and use that connection to figure out database
// product name/version number in order to decide which Hibernate
// dialect to use.
@@ -160,17 +139,8 @@
try {
DatabaseMetaData metaData = conn.getMetaData();
if (metaData != null) {
- String dbProductName = metaData.getDatabaseProductName();
- int dbMajorVer = metaData.getDatabaseMajorVersion();
- __log.info("Using database " + dbProductName + " major version " + dbMajorVer);
- DialectFactory.DatabaseDialectMapper mapper = HIBERNATE_DIALECTS.get(dbProductName);
- if (mapper != null) {
- dialect = mapper.getDialectClass(dbMajorVer);
- } else {
- Dialect hbDialect = DialectFactory.determineDialect(dbProductName, dbMajorVer);
- if (hbDialect != null)
- dialect = hbDialect.getClass().getName();
- }
+ StandardDialectResolver dialectResolver = new StandardDialectResolver();
+ dialect = dialectResolver.resolveDialect(metaData);
}
} finally {
conn.close();
Modified: branches/ODE/ODE-1.x-fixes/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
===================================================================
--- branches/ODE/ODE-1.x-fixes/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java 2009-11-24 17:15:41 UTC (rev 321)
+++ branches/ODE/ODE-1.x-fixes/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java 2009-11-24 19:25:38 UTC (rev 322)
@@ -28,7 +28,8 @@
import org.hibernate.HibernateException;
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.DialectFactory;
+import org.hibernate.dialect.resolver.DialectFactory;
+import org.hibernate.dialect.resolver.StandardDialectResolver;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
@@ -137,39 +138,14 @@
return new SessionManager(properties, ds, tm);
}
- private static final String DEFAULT_HIBERNATE_DIALECT = "org.hibernate.dialect.DerbyDialect";
+ private static final Dialect DEFAULT_HIBERNATE_DIALECT = new org.hibernate.dialect.DerbyDialect();
- private static final HashMap<String, DialectFactory.VersionInsensitiveMapper> HIBERNATE_DIALECTS = new HashMap<String, DialectFactory.VersionInsensitiveMapper>();
-
- static {
- // Hibernate has a nice table that resolves the dialect from the
- // database
- // product name,
- // but doesn't include all the drivers. So this is supplementary, and
- // some
- // day in the
- // future they'll add more drivers and we can get rid of this.
- // Drivers already recognized by Hibernate:
- // HSQL Database Engine
- // DB2/NT
- // MySQL
- // PostgreSQL
- // Microsoft SQL Server Database, Microsoft SQL Server
- // Sybase SQL Server
- // Informix Dynamic Server
- // Oracle 8 and Oracle >8
- HIBERNATE_DIALECTS.put("Apache Derby", new DialectFactory.VersionInsensitiveMapper(
- "org.hibernate.dialect.DerbyDialect"));
- HIBERNATE_DIALECTS.put("INGRES", new DialectFactory.VersionInsensitiveMapper(
- "org.hibernate.dialect.IngresDialect"));
- }
-
public void shutdown() {
// Not too much to do for hibernate.
}
- private String guessDialect(DataSource dataSource) throws Exception {
- String dialect = null;
+ private Dialect guessDialect(DataSource dataSource) throws Exception {
+ Dialect dialect = null;
// Open a connection and use that connection to figure out database
// product name/version number in order to decide which Hibernate
// dialect to use.
@@ -177,17 +153,9 @@
try {
DatabaseMetaData metaData = conn.getMetaData();
if (metaData != null) {
- String dbProductName = metaData.getDatabaseProductName();
- int dbMajorVer = metaData.getDatabaseMajorVersion();
- __log.info("Using database " + dbProductName + " major version " + dbMajorVer);
- DialectFactory.DatabaseDialectMapper mapper = HIBERNATE_DIALECTS.get(dbProductName);
- if (mapper != null) {
- dialect = mapper.getDialectClass(dbMajorVer);
- } else {
- Dialect hbDialect = DialectFactory.determineDialect(dbProductName, dbMajorVer);
- if (hbDialect != null)
- dialect = hbDialect.getClass().getName();
- }
+ StandardDialectResolver dialectResolver = new StandardDialectResolver();
+ dialect = dialectResolver.resolveDialect(metaData);
+
}
} finally {
conn.close();
15 years, 3 months
riftsaw SVN: r321 - trunk/distribution/src/main/release/db/datasource.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-11-24 12:15:41 -0500 (Tue, 24 Nov 2009)
New Revision: 321
Modified:
trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml
Log:
Update H2 settings
Modified: trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml
===================================================================
--- trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml 2009-11-24 17:08:24 UTC (rev 320)
+++ trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml 2009-11-24 17:15:41 UTC (rev 321)
@@ -19,7 +19,7 @@
name="jboss:service=h2,database=BPELDB">
<attribute name="Database">BPELDB</attribute>
<attribute name="DataDir">${jboss.server.data.dir}</attribute>
- <attribute name="Flags">;MVCC=true;LOCK_MODE=3;LOG=2</attribute>
+ <attribute name="Flags">;MVCC=true;LOCK_MODE=3;LOG=2;DB_CLOSE_ON_EXIT=FALSE</attribute>
</mbean>
</datasources>
15 years, 3 months
riftsaw SVN: r320 - in trunk: console/integration and 5 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-11-24 12:08:24 -0500 (Tue, 24 Nov 2009)
New Revision: 320
Modified:
trunk/console/integration/pom.xml
trunk/distribution/pom.xml
trunk/integration-tests/pom.xml
trunk/pom.xml
trunk/runtime/engine-assembly/pom.xml
trunk/runtime/engine/pom.xml
trunk/runtime/jbossesb-bpel/pom.xml
Log:
* moving shared dependencies into parent pom.
Modified: trunk/console/integration/pom.xml
===================================================================
--- trunk/console/integration/pom.xml 2009-11-24 16:20:55 UTC (rev 319)
+++ trunk/console/integration/pom.xml 2009-11-24 17:08:24 UTC (rev 320)
@@ -43,7 +43,6 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.2.0</version>
</dependency>
<dependency>
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2009-11-24 16:20:55 UTC (rev 319)
+++ trunk/distribution/pom.xml 2009-11-24 17:08:24 UTC (rev 320)
@@ -57,17 +57,14 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -82,7 +79,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
@@ -97,7 +93,6 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.0</version>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2009-11-24 16:20:55 UTC (rev 319)
+++ trunk/integration-tests/pom.xml 2009-11-24 17:08:24 UTC (rev 320)
@@ -54,7 +54,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -85,19 +84,16 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.6.0.GA</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -127,7 +123,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -139,7 +134,6 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-24 16:20:55 UTC (rev 319)
+++ trunk/pom.xml 2009-11-24 17:08:24 UTC (rev 320)
@@ -76,7 +76,13 @@
<rosetta.version>4.6</rosetta.version>
<jbossesb.version>4.6</jbossesb.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
- <h2.version>1.2.124</h2.version>
+ <h2.version>1.2.124</h2.version>
+ <javassist.version>3.11.0.GA</javassist.version>
+ <jaxws.version>2.1</jaxws.version>
+ <xmlbeans.version>2.2.0</xmlbeans.version>
+ <commons.codec.version>1.3</commons.codec.version>
+ <xerces.version>2.9.0</xerces.version>
+ <commons.httpclient.version>3.1</commons.httpclient.version>
</properties>
<dependencyManagement>
@@ -115,12 +121,12 @@
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
</dependency>
-
<dependency>
<artifactId>h2</artifactId>
<groupId>com.h2database</groupId>
<version>${h2.version}</version>
</dependency>
+
<!-- RiftSaw Ode artifacts -->
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
@@ -157,19 +163,6 @@
<artifactId>riftsaw-schedule-simpler</artifactId>
<version>${riftsaw.ode.version}</version>
</dependency>
-
- <!-- ODE2 dependencies
- <dependency>
- <groupId>org.jboss.soa.bpel</groupId>
- <artifactId>riftsaw-il-common</artifactId>
- <version>${riftsaw.engine.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.soa.bpel</groupId>
- <artifactId>riftsaw-engine</artifactId>
- <version>${riftsaw.engine.version}</version>
- </dependency>
- -->
<!-- ODE1.3.3 dependencies -->
<dependency>
@@ -217,13 +210,53 @@
<artifactId>riftsaw-tools</artifactId>
<version>${riftsaw.ode.version}</version>
</dependency>
-
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>${xmlbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2009-11-24 16:20:55 UTC (rev 319)
+++ trunk/runtime/engine/pom.xml 2009-11-24 17:08:24 UTC (rev 320)
@@ -89,20 +89,17 @@
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.11.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.11.0.GA</version>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -121,7 +118,6 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.0.68</version>
<scope>provided</scope>
</dependency>
Modified: trunk/runtime/engine-assembly/pom.xml
===================================================================
--- trunk/runtime/engine-assembly/pom.xml 2009-11-24 16:20:55 UTC (rev 319)
+++ trunk/runtime/engine-assembly/pom.xml 2009-11-24 17:08:24 UTC (rev 320)
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.2.0</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
Modified: trunk/runtime/jbossesb-bpel/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel/pom.xml 2009-11-24 16:20:55 UTC (rev 319)
+++ trunk/runtime/jbossesb-bpel/pom.xml 2009-11-24 17:08:24 UTC (rev 320)
@@ -33,13 +33,11 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
15 years, 3 months
