Author: jeff.yuchang Date: 2011-01-28 07:54:54 -0500 (Fri, 28 Jan 2011) New Revision: 1289 Modified: trunk/distribution/src/main/release/db/jdbc/sybase.properties trunk/distribution/src/main/release/install/build.xml trunk/qa/build.xml trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sybase.sql trunk/runtime/engine/pom.xml Log: *RIFTSAW-340, added the as_config in the log message section. *Updated the sybase.sql file and some configuration. (sybase support still not working though) *Updated deployer's dependency to deployer-as5 and deployer-as6. Modified: trunk/distribution/src/main/release/db/jdbc/sybase.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/sybase.properties 2011-01-28 10:30:14 UTC (rev 1288) +++ trunk/distribution/src/main/release/db/jdbc/sybase.properties 2011-01-28 12:54:54 UTC (rev 1289) @@ -1,5 +1,5 @@ connection.url=jdbc:sybase:Tds:localhost:5000/riftsaw -driver=com.sybase.jdbc2.jdbc.SybDataSource +driver=com.sybase.jdbc3.jdbc.SybDataSource username=riftsaw password=riftsaw -dialect=org.hibernate.dialect.SybaseDialect \ No newline at end of file +dialect=org.hibernate.dialect.SybaseDialect Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2011-01-28 10:30:14 UTC (rev 1288) +++ trunk/distribution/src/main/release/install/build.xml 2011-01-28 12:54:54 UTC (rev 1289) @@ -202,6 +202,8 @@ todir="${deploy.dir}/${bpel-runtime}/lib" /> </target> + <target name="internal.install.riftsaw.into.jboss.db.sybase" /> + <!-- uninstall database specific driver --> <target name="internal.uninstall.riftsaw.into.jboss.db.hsql" /> @@ -215,6 +217,8 @@ <target name="internal.uninstall.riftsaw.into.jboss.db.db2" /> + <target name="internal.uninstall.riftsaw.into.jboss.db.sybase" /> + <target name="internal.install.riftsaw.ws.stack" unless="keep.ws.stack"> <echo>Replacing the Web Service Stack to ${ws.stack}-${ws.version}</echo> <antcall target="get.ws.stack" /> Modified: trunk/qa/build.xml =================================================================== --- trunk/qa/build.xml 2011-01-28 10:30:14 UTC (rev 1288) +++ trunk/qa/build.xml 2011-01-28 12:54:54 UTC (rev 1289) @@ -51,6 +51,7 @@ <echo message="riftsaw.home......... ${riftsaw.home}" /> <echo message="jboss.home.. ${jboss.home}" /> <echo message="org_jboss_esb_home .. ${org_jboss_esb_home}" /> + <echo message="org_jboss_as_config.. ${org_jboss_as_config}" /> <echo message="===============================" /> <condition property="is.jboss.distro.available"> Modified: trunk/runtime/engine/pom.xml =================================================================== --- trunk/runtime/engine/pom.xml 2011-01-28 10:30:14 UTC (rev 1288) +++ trunk/runtime/engine/pom.xml 2011-01-28 12:54:54 UTC (rev 1289) @@ -79,10 +79,16 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel.runtime</groupId> - <artifactId>deployer</artifactId> + <artifactId>deployer-as5</artifactId> <version>${pom.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.soa.bpel.runtime</groupId> + <artifactId>deployer-as6</artifactId> + <version>${pom.version}</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sybase.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sybase.sql 2011-01-28 10:30:14 UTC (rev 1288) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sybase.sql 2011-01-28 12:54:54 UTC (rev 1289) @@ -4,19 +4,19 @@ CREATE TABLE ODE_JOB ( jobid CHAR(64) DEFAULT '' NOT NULL, ts BIGINT DEFAULT 0 NOT NULL, - nodeid char(64), + nodeid char(64) null, scheduled int DEFAULT 0 NOT NULL, transacted int DEFAULT 0 NOT NULL, - instanceId BIGINT, - mexId varchar(255), - processId varchar(255), - type varchar(255), - channel varchar(255), - correlatorId varchar(255), - correlationKeySet varchar(255), - retryCount int, - inMem int, + instanceId BIGINT null, + mexId varchar(255) null, + processId varchar(255) null, + type varchar(255) null, + channel varchar(255) null, + correlatorId varchar(255) null, + correlationKeySet varchar(255) null, + retryCount int null, + inMem int null, detailsExt IMAGE null, PRIMARY KEY(jobid));