riftsaw SVN: r991 - trunk/runtime/engine-assembly/src/main/resources/bpel-sql.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-09-28 06:27:45 -0400 (Tue, 28 Sep 2010)
New Revision: 991
Modified:
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql
Log:
Update DDL for BPAF tables. Add missing SQL dialects
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-09-27 09:10:08 UTC (rev 990)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-09-28 10:27:45 UTC (rev 991)
@@ -242,4 +242,32 @@
ID bigint generated by default as identity,
VERSION bigint,
primary key (ID)
-);
\ No newline at end of file
+);
+
+create table BPAF_EVENT (
+ EID bigint generated by default as identity,
+ ACTIVITY_DEFINITION_ID varchar(255),
+ ACTIVITY_INSTANCE_ID varchar(255),
+ ACTIVITY_NAME varchar(255),
+ CURRENT_STATE varchar(255),
+ PREVIOUS_STATE varchar(255),
+ PROCESS_DEFINITION_ID varchar(255),
+ PROCESS_INSTANCE_ID varchar(255),
+ PROCESS_NAME varchar(255),
+ SERVER_ID varchar(255),
+ TIMESTAMP bigint,
+ primary key (EID)
+ );
+
+ create table BPAF_EVENT_DATA (
+ TID bigint generated by default as identity,
+ NAME varchar(255),
+ VALUE varchar(255),
+ EVENT_ID bigint,
+ primary key (TID)
+ );
+
+ alter table BPAF_EVENT_DATA
+ add constraint FK3E83D1BCDA848C8
+ foreign key (EVENT_ID)
+ references BPAF_EVENT;
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-09-27 09:10:08 UTC (rev 990)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-09-28 10:27:45 UTC (rev 991)
@@ -242,4 +242,33 @@
ID bigint generated by default as identity,
VERSION bigint,
primary key (ID)
-);
\ No newline at end of file
+);
+
+
+ create table BPAF_EVENT (
+ EID bigint generated by default as identity (start with 1),
+ ACTIVITY_DEFINITION_ID varchar(255),
+ ACTIVITY_INSTANCE_ID varchar(255),
+ ACTIVITY_NAME varchar(255),
+ CURRENT_STATE varchar(255),
+ PREVIOUS_STATE varchar(255),
+ PROCESS_DEFINITION_ID varchar(255),
+ PROCESS_INSTANCE_ID varchar(255),
+ PROCESS_NAME varchar(255),
+ SERVER_ID varchar(255),
+ TIMESTAMP bigint,
+ primary key (EID)
+ );
+
+ create table BPAF_EVENT_DATA (
+ TID bigint generated by default as identity (start with 1),
+ NAME varchar(255),
+ VALUE varchar(255),
+ EVENT_ID bigint,
+ primary key (TID)
+ );
+
+ alter table BPAF_EVENT_DATA
+ add constraint FK3E83D1BCDA848C8
+ foreign key (EVENT_ID)
+ references BPAF_EVENT;
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-09-27 09:10:08 UTC (rev 990)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-09-28 10:27:45 UTC (rev 991)
@@ -247,4 +247,34 @@
ID bigint not null auto_increment,
VERSION bigint,
primary key (ID)
-) type=InnoDB;
\ No newline at end of file
+) type=InnoDB;
+
+ create table BPAF_EVENT (
+ EID bigint not null auto_increment,
+ ACTIVITY_DEFINITION_ID varchar(255),
+ ACTIVITY_INSTANCE_ID varchar(255),
+ ACTIVITY_NAME varchar(255),
+ CURRENT_STATE varchar(255),
+ PREVIOUS_STATE varchar(255),
+ PROCESS_DEFINITION_ID varchar(255),
+ PROCESS_INSTANCE_ID varchar(255),
+ PROCESS_NAME varchar(255),
+ SERVER_ID varchar(255),
+ TIMESTAMP bigint,
+ primary key (EID)
+ );
+
+ create table BPAF_EVENT_DATA (
+ TID bigint not null auto_increment,
+ NAME varchar(255),
+ VALUE varchar(255),
+ EVENT_ID bigint,
+ primary key (TID)
+ );
+
+ alter table BPAF_EVENT_DATA
+ add index FK3E83D1BCDA848C8 (EVENT_ID),
+ add constraint FK3E83D1BCDA848C8
+ foreign key (EVENT_ID)
+ references BPAF_EVENT (EID);
+
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-09-27 09:10:08 UTC (rev 990)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-09-28 10:27:45 UTC (rev 991)
@@ -245,3 +245,33 @@
);
create sequence bpel_sequence;
+
+ create table BPAF_EVENT (
+ EID number(19,0) not null,
+ ACTIVITY_DEFINITION_ID varchar2(255 char),
+ ACTIVITY_INSTANCE_ID varchar2(255 char),
+ ACTIVITY_NAME varchar2(255 char),
+ CURRENT_STATE varchar2(255 char),
+ PREVIOUS_STATE varchar2(255 char),
+ PROCESS_DEFINITION_ID varchar2(255 char),
+ PROCESS_INSTANCE_ID varchar2(255 char),
+ PROCESS_NAME varchar2(255 char),
+ SERVER_ID varchar2(255 char),
+ TIMESTAMP number(19,0),
+ primary key (EID)
+ );
+
+ create table BPAF_EVENT_DATA (
+ TID number(19,0) not null,
+ NAME varchar2(255 char),
+ VALUE varchar2(255 char),
+ EVENT_ID number(19,0),
+ primary key (TID)
+ );
+
+ alter table BPAF_EVENT_DATA
+ add constraint FK3E83D1BCDA848C8
+ foreign key (EVENT_ID)
+ references BPAF_EVENT;
+
+ create 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-09-27 09:10:08 UTC (rev 990)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-09-28 10:27:45 UTC (rev 991)
@@ -244,4 +244,32 @@
primary key (ID)
);
-create sequence bpel_sequence;
\ No newline at end of file
+create sequence bpel_sequence;
+
+create table BPAF_EVENT (
+ EID bigint generated by default as identity,
+ ACTIVITY_DEFINITION_ID varchar(255),
+ ACTIVITY_INSTANCE_ID varchar(255),
+ ACTIVITY_NAME varchar(255),
+ CURRENT_STATE varchar(255),
+ PREVIOUS_STATE varchar(255),
+ PROCESS_DEFINITION_ID varchar(255),
+ PROCESS_INSTANCE_ID varchar(255),
+ PROCESS_NAME varchar(255),
+ SERVER_ID varchar(255),
+ TIMESTAMP bigint,
+ primary key (EID)
+ );
+
+ create table BPAF_EVENT_DATA (
+ TID bigint generated by default as identity,
+ NAME varchar(255),
+ VALUE varchar(255),
+ EVENT_ID bigint,
+ primary key (TID)
+ );
+
+ alter table BPAF_EVENT_DATA
+ add constraint FK3E83D1BCDA848C8
+ foreign key (EVENT_ID)
+ references BPAF_EVENT;
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql 2010-09-27 09:10:08 UTC (rev 990)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql 2010-09-28 10:27:45 UTC (rev 991)
@@ -243,3 +243,32 @@
VERSION numeric(19,0) null,
primary key (ID)
);
+
+create table BPAF_EVENT (
+ EID numeric(19,0) identity not null,
+ ACTIVITY_DEFINITION_ID varchar(255) null,
+ ACTIVITY_INSTANCE_ID varchar(255) null,
+ ACTIVITY_NAME varchar(255) null,
+ CURRENT_STATE varchar(255) null,
+ PREVIOUS_STATE varchar(255) null,
+ PROCESS_DEFINITION_ID varchar(255) null,
+ PROCESS_INSTANCE_ID varchar(255) null,
+ PROCESS_NAME varchar(255) null,
+ SERVER_ID varchar(255) null,
+ TIMESTAMP numeric(19,0) null,
+ primary key (EID)
+ );
+
+ create table BPAF_EVENT_DATA (
+ TID numeric(19,0) identity not null,
+ NAME varchar(255) null,
+ VALUE varchar(255) null,
+ EVENT_ID numeric(19,0) null,
+ primary key (TID)
+ );
+
+ alter table BPAF_EVENT_DATA
+ add constraint FK3E83D1BCDA848C8
+ foreign key (EVENT_ID)
+ references BPAF_EVENT;
+
14 years, 2 months
- 1
- 0
RiftSaw-sqlserver - Build # 91 - Failure!
by jboss-qa-internal＠redhat.com
RiftSaw-sqlserver - Build # 91 - Failure:
Check console output at http://hudson.qa.jboss.com/hudson/job/RiftSaw-sqlserver/91/ to view the results.
14 years, 2 months
- 1
- 0
Hudson build is back to Hudson build is back to normal : RiftSaw-jbossws-cxf #88
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf/88/changes>
14 years, 2 months
- 1
- 0
riftsaw SVN: r990 - in branches/ODE/RiftSaw-ODE-trunk/dao-jpa: src/main/resources/META-INF and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-09-27 05:10:08 -0400 (Mon, 27 Sep 2010)
New Revision: 990
Modified:
branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml
branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/resources/META-INF/persistence.xml
branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml
Log:
Added BPAF mapping to JPA config
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2010-09-27 09:09:34 UTC (rev 989)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2010-09-27 09:10:08 UTC (rev 990)
@@ -83,6 +83,13 @@
<groupId>net.sourceforge.serp</groupId>
<artifactId>serp</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>activity-monitor-model</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
<build>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/resources/META-INF/persistence.xml 2010-09-27 09:09:34 UTC (rev 989)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/resources/META-INF/persistence.xml 2010-09-27 09:10:08 UTC (rev 990)
@@ -38,6 +38,8 @@
<class>org.apache.ode.dao.jpa.bpel.CorrSetProperty</class>
<class>org.apache.ode.dao.jpa.bpel.MexProperty</class>
<class>org.apache.ode.dao.jpa.bpel.XmlDataProperty</class>
+ <class>org.jboss.bpm.monitor.model.bpaf.Event</class>
+ <class>org.jboss.bpm.monitor.model.bpaf.Tuple</class>
</persistence-unit>
<persistence-unit name="ode-store" transaction-type="JTA">
<class>org.apache.ode.dao.jpa.store.ProcessConfDaoImpl</class>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml 2010-09-27 09:09:34 UTC (rev 989)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml 2010-09-27 09:10:08 UTC (rev 990)
@@ -39,6 +39,8 @@
<class>org.apache.ode.dao.jpa.bpel.CorrSetProperty</class>
<class>org.apache.ode.dao.jpa.bpel.MexProperty</class>
<class>org.apache.ode.dao.jpa.bpel.XmlDataProperty</class>
+ <class>org.jboss.bpm.monitor.model.bpaf.Event</class>
+ <class>org.jboss.bpm.monitor.model.bpaf.Tuple</class>
</persistence-unit>
<persistence-unit name="ode-store" transaction-type="JTA">
<mapping-file>META-INF/riftsaw-orm.xml</mapping-file>
14 years, 2 months
- 1
- 0
riftsaw SVN: r989 - branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-09-27 05:09:34 -0400 (Mon, 27 Sep 2010)
New Revision: 989
Modified:
branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java
Log:
Expose EntityManagerFactory through config properties (workaround)
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-09-27 09:03:31 UTC (rev 988)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-09-27 09:09:34 UTC (rev 989)
@@ -52,6 +52,9 @@
Map emfProperties = HibernateUtil.buildConfig(OdeConfigProperties.PROP_DAOCF + ".", odeConfig, _txm, _ds);
_emf = Persistence.createEntityManagerFactory("ode-bpel", emfProperties);
+ // dirty hack
+ odeConfig.put("ode.emf", _emf);
+
}
public BpelDAOConnection getConnection() {
14 years, 2 months
- 1
- 0
riftsaw SVN: r988 - in trunk: console and 20 other directories.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2010-09-27 05:03:31 -0400 (Mon, 27 Sep 2010)
New Revision: 988
Added:
trunk/console/bpaf/
trunk/console/bpaf/pom.xml
trunk/console/bpaf/src/
trunk/console/bpaf/src/main/
trunk/console/bpaf/src/main/java/
trunk/console/bpaf/src/main/java/org/
trunk/console/bpaf/src/main/java/org/jboss/
trunk/console/bpaf/src/main/java/org/jboss/soa/
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityEndAdapter.java
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityFailedAdapter.java
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityStartAdapter.java
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/BPAFLogAdapter.java
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/EventAdapter.java
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceEndAdapter.java
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceStartAdapter.java
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceTerminationAdapter.java
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/JDBCPersistenceStrategy.java
trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/PersistenceStrategy.java
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/DefaultEMLocator.java
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/EntityManagerLocator.java
Removed:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/Runner.java
Modified:
trunk/console/integration/pom.xml
trunk/console/pom.xml
trunk/distribution/pom.xml
trunk/distribution/src/main/assembly/bin.xml
trunk/distribution/src/main/release/db/bpel.properties
trunk/distribution/src/main/release/install/build.xml
trunk/pom.xml
trunk/runtime/deployer/pom.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/service/BPELEngineService.java
trunk/samples/quickstart/hello_world/bpelContent/deploy.xml
Log:
BPAF history support, first cut (disabled by default)
Added: trunk/console/bpaf/pom.xml
===================================================================
--- trunk/console/bpaf/pom.xml (rev 0)
+++ trunk/console/bpaf/pom.xml 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.bpel.console</groupId>
+ <artifactId>bpaf</artifactId>
+ <packaging>jar</packaging>
+ <version>2.2.0-SNAPSHOT</version>
+ <name>RiftSaw::Console::BPAF</name>
+
+ <parent>
+ <groupId>org.jboss.soa.bpel.console</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>activity-monitor-model</artifactId>
+ </dependency>
+
+ <!--dependency>
+ <groupId>org.jboss.errai</groupId>
+ <artifactId>errai-bus</artifactId>
+ </dependency-->
+
+ <dependency>
+ <groupId>org.jboss.soa.bpel.console</groupId>
+ <artifactId>integration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.1.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.3.1.GA</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- RiftSaw -->
+
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-bpel-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-bpel-schemas</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.soa.bpel.runtime</groupId>
+ <artifactId>riftsaw-engine</artifactId>
+ <version>${riftsaw.engine.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-bpel-store</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-bpel-dao</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-bpel-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-utils</artifactId>
+ </dependency>
+
+ <!-- ODE 2.0 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>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-bpel-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-bpel-epr</artifactId>
+ </dependency>
+ <!-- -->
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+
+ <build>
+ <finalName>riftsaw-console-bpaf</finalName>
+
+ <plugins>
+ <!-- Specify the compiler options and settings -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>false</showWarnings>
+ </configuration>
+ </plugin>
+
+ <!-- Produce source jars during the 'verify' phase -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityEndAdapter.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityEndAdapter.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityEndAdapter.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.apache.ode.bpel.evt.ActivityExecEndEvent;
+import org.jboss.bpm.monitor.model.bpaf.Event;
+import org.jboss.bpm.monitor.model.bpaf.State;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 21, 2010
+ */
+public final class ActivityEndAdapter
+ implements EventAdapter.EventDetailMapping<ActivityExecEndEvent> {
+
+ public Event adoptDetails(Event target, ActivityExecEndEvent source) {
+
+ Event.EventDetails details = target.getEventDetails();
+ details.setCurrentState(State.Closed_Completed);
+
+ ActivityStartAdapter.mapDefault(target, source);
+
+ return target;
+ }
+}
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityFailedAdapter.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityFailedAdapter.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityFailedAdapter.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.apache.ode.bpel.evt.ActivityFailureEvent;
+import org.jboss.bpm.monitor.model.bpaf.Event;
+import org.jboss.bpm.monitor.model.bpaf.State;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 21, 2010
+ */
+public final class ActivityFailedAdapter
+ implements EventAdapter.EventDetailMapping<ActivityFailureEvent> {
+
+ public Event adoptDetails(Event target, ActivityFailureEvent source) {
+
+ Event.EventDetails details = target.getEventDetails();
+ details.setCurrentState(State.Closed_Completed_Failed);
+
+ ActivityStartAdapter.mapDefault(target, source);
+
+ return target;
+ }
+}
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityStartAdapter.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityStartAdapter.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ActivityStartAdapter.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.apache.ode.bpel.evt.ActivityEvent;
+import org.apache.ode.bpel.evt.ActivityExecStartEvent;
+import org.jboss.bpm.monitor.model.bpaf.Event;
+import org.jboss.bpm.monitor.model.bpaf.State;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 21, 2010
+ */
+public final class ActivityStartAdapter
+ implements EventAdapter.EventDetailMapping<ActivityExecStartEvent> {
+
+ public Event adoptDetails(Event target, ActivityExecStartEvent source) {
+
+ Event.EventDetails details = target.getEventDetails();
+ details.setCurrentState(State.Open_Running);
+
+ mapDefault(target, source);
+
+ return target;
+ }
+
+ static void mapDefault(Event target, ActivityEvent source)
+ {
+ InstanceStartAdapter.mapDefault(target, source);
+
+ target.setActivityDefinitionID(String.valueOf(source.getActivityDeclarationId()));
+ target.setActivityInstanceID(String.valueOf(source.getActivityId()));
+ target.setActivityName( source.getActivityName() );
+ }
+}
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/BPAFLogAdapter.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/BPAFLogAdapter.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/BPAFLogAdapter.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.evt.*;
+import org.apache.ode.bpel.iapi.BpelEventListener;
+import org.jboss.bpm.monitor.model.bpaf.Event;
+
+import java.util.Properties;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 20, 2010
+ */
+public class BPAFLogAdapter implements BpelEventListener {
+
+ protected final Log log = LogFactory.getLog(BPAFLogAdapter.class);
+
+ final static Class[] notableEvents = new Class[] {
+ ActivityExecStartEvent.class,
+ ActivityExecEndEvent.class,
+ ActivityFailureEvent.class,
+ ProcessInstanceStartedEvent.class,
+ ProcessCompletionEvent.class,
+ ProcessTerminationEvent.class
+ };
+
+ private PersistenceStrategy persistenceStrategy = null;
+
+ public void onEvent(BpelEvent bpelEvent) {
+ if(isNotable(bpelEvent))
+ {
+ Event event = EventAdapter.createBPAFModel(bpelEvent);
+ persistenceStrategy.persist(event);
+ }
+ }
+
+ public void startup(Properties properties) {
+ this.persistenceStrategy = new JDBCPersistenceStrategy();
+ this.persistenceStrategy.start();
+ log.info("Using: " + persistenceStrategy.getClass());
+ }
+
+ public void shutdown() {
+ this.persistenceStrategy.stop();
+ System.out.println("BPAFLogAdapter shutdown");
+ }
+
+ private static boolean isNotable(BpelEvent event)
+ {
+ boolean notable = false;
+ for(Class c : notableEvents)
+ if(c.equals(event.getClass()))
+ {
+ notable = true;
+ break;
+ }
+ return notable;
+ }
+}
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/EventAdapter.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/EventAdapter.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/EventAdapter.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.evt.*;
+import org.jboss.bpm.monitor.model.bpaf.Event;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 21, 2010
+ */
+public class EventAdapter {
+
+ protected final static Log log = LogFactory.getLog(EventAdapter.class);
+
+ static Map<Class<?>, EventDetailMapping> detailMapping = new HashMap<Class<?>, EventDetailMapping>();
+
+ static
+ {
+ detailMapping.put(ProcessInstanceStartedEvent.class, new InstanceStartAdapter());
+ detailMapping.put(ProcessCompletionEvent.class, new InstanceEndAdapter());
+ detailMapping.put(ProcessTerminationEvent.class, new InstanceTerminationAdapter());
+
+ detailMapping.put(ActivityExecStartEvent.class, new ActivityStartAdapter());
+ detailMapping.put(ActivityExecEndEvent.class, new ActivityEndAdapter());
+ detailMapping.put(ActivityFailureEvent.class, new ActivityFailedAdapter());
+ }
+
+ public static Event createBPAFModel(BpelEvent bpelEvent)
+ {
+ ProcessEvent source = (ProcessEvent)bpelEvent;
+
+ // base event data
+ Event target = new Event(false);
+ target.setTimestamp(bpelEvent.getTimestamp().getTime());
+ target.setProcessDefinitionID(source.getProcessId().toString());
+ target.setProcessName(source.getProcessName().toString());
+
+ EventDetailMapping mapping = detailMapping.get(bpelEvent.getClass());
+ if(mapping!=null)
+ mapping.adoptDetails(target, source);
+ else
+ log.warn("No mapping for "+ bpelEvent.getClass());
+
+ return target;
+ }
+
+ public interface EventDetailMapping<T extends ProcessEvent>
+ {
+ Event adoptDetails(Event target, T source);
+ }
+}
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceEndAdapter.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceEndAdapter.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceEndAdapter.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.apache.ode.bpel.evt.ProcessCompletionEvent;
+import org.jboss.bpm.monitor.model.bpaf.Event;
+import org.jboss.bpm.monitor.model.bpaf.State;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 21, 2010
+ */
+public final class InstanceEndAdapter implements EventAdapter.EventDetailMapping<ProcessCompletionEvent> {
+ public Event adoptDetails(Event target, ProcessCompletionEvent source) {
+
+ Event.EventDetails details = target.getEventDetails();
+ details.setCurrentState(State.Closed_Completed);
+
+ InstanceStartAdapter.mapDefault(target, source);
+
+ return target;
+ }
+}
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceStartAdapter.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceStartAdapter.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceStartAdapter.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.apache.ode.bpel.evt.ProcessInstanceEvent;
+import org.apache.ode.bpel.evt.ProcessInstanceStartedEvent;
+import org.jboss.bpm.monitor.model.bpaf.Event;
+import org.jboss.bpm.monitor.model.bpaf.State;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 21, 2010
+ */
+public final class InstanceStartAdapter
+ implements EventAdapter.EventDetailMapping<ProcessInstanceStartedEvent> {
+
+ public Event adoptDetails(Event target, ProcessInstanceStartedEvent source) {
+
+ Event.EventDetails details = target.getEventDetails();
+ details.setCurrentState(State.Open_Running);
+
+ mapDefault(target, source);
+
+ return target;
+ }
+
+ static void mapDefault(Event target, ProcessInstanceEvent source) {
+ target.setProcessInstanceID(source.getProcessInstanceId().toString());
+ }
+}
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceTerminationAdapter.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceTerminationAdapter.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/InstanceTerminationAdapter.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.apache.ode.bpel.evt.ProcessTerminationEvent;
+import org.jboss.bpm.monitor.model.bpaf.Event;
+import org.jboss.bpm.monitor.model.bpaf.State;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 21, 2010
+ */
+public final class InstanceTerminationAdapter implements EventAdapter.EventDetailMapping<ProcessTerminationEvent> {
+ public Event adoptDetails(Event target, ProcessTerminationEvent source) {
+
+ Event.EventDetails details = target.getEventDetails();
+ details.setCurrentState(State.Closed_Cancelled);
+
+ InstanceStartAdapter.mapDefault(target, source);
+
+ return target;
+ }
+}
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/JDBCPersistenceStrategy.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/JDBCPersistenceStrategy.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/JDBCPersistenceStrategy.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.monitor.model.bpaf.Event;
+import org.jboss.soa.bpel.console.util.DefaultEMLocator;
+import org.jboss.soa.bpel.console.util.EntityManagerLocator;
+
+import javax.persistence.EntityManager;
+
+/**
+ * Plain JDBC batch persistence.
+ *
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 21, 2010
+ */
+public final class JDBCPersistenceStrategy implements PersistenceStrategy {
+
+ protected final Log log = LogFactory.getLog(JDBCPersistenceStrategy.class);
+
+ private EntityManagerLocator defaultLocator = new DefaultEMLocator();
+
+ public void start() {
+
+ }
+
+ public void stop() {
+
+ }
+
+ public void persist(Event event) {
+
+ try {
+
+ // get entity manager
+ EntityManager entityManager = defaultLocator.locate();
+
+ // It's managed by JACORB
+ // Hence we don't deal with the TX here
+ entityManager.persist(event);
+
+ } catch (Exception e) {
+ log.error("Error persisting event", e);
+ }
+
+ }
+}
Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/PersistenceStrategy.java
===================================================================
--- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/PersistenceStrategy.java (rev 0)
+++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/PersistenceStrategy.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.bpaf;
+
+import org.jboss.bpm.monitor.model.bpaf.Event;
+
+/**
+ * Strategy for persisting {@link org.jboss.bpm.monitor.model.bpaf.Event}'s
+ *
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 21, 2010
+ */
+public interface PersistenceStrategy {
+ void start();
+ void stop();
+ void persist(Event event);
+}
Modified: trunk/console/integration/pom.xml
===================================================================
--- trunk/console/integration/pom.xml 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/console/integration/pom.xml 2010-09-27 09:03:31 UTC (rev 988)
@@ -91,6 +91,22 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-bpel-epr</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>riftsaw-dao-jpa-hibernate</artifactId>
+ </dependency>
+
<!-- -->
<!-- Common -->
Added: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/DefaultEMLocator.java
===================================================================
--- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/DefaultEMLocator.java (rev 0)
+++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/DefaultEMLocator.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.util;
+
+import org.apache.ode.dao.jpa.bpel.BpelDAOConnectionImpl;
+
+import javax.persistence.EntityManager;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 22, 2010
+ */
+public class DefaultEMLocator implements EntityManagerLocator {
+ public EntityManager locate() {
+
+ final ThreadLocal<BpelDAOConnectionImpl> currentConnection = BpelDAOConnectionImpl.getThreadLocal();
+ BpelDAOConnectionImpl bpelDAOConnection = currentConnection.get();
+ if(null==bpelDAOConnection)
+ throw new IllegalStateException("Unabled to locate BpelDAOConnectionImpl from ThreadLocal");
+
+ return bpelDAOConnection.getEntityManager();
+
+ }
+}
Added: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/EntityManagerLocator.java
===================================================================
--- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/EntityManagerLocator.java (rev 0)
+++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/util/EntityManagerLocator.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2009 JBoss, a divison Red Hat, Inc
+ *
+ * Licensed 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.jboss.soa.bpel.console.util;
+
+import javax.persistence.EntityManager;
+
+/**
+ * @author: Heiko Braun <hbraun(a)redhat.com>
+ * @date: Sep 22, 2010
+ */
+public interface EntityManagerLocator {
+ EntityManager locate();
+}
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/console/pom.xml 2010-09-27 09:03:31 UTC (rev 988)
@@ -19,6 +19,7 @@
<module>integration</module>
<module>identity</module>
<module>bpel2svg</module>
+ <module>bpaf</module>
</modules>
</project>
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/distribution/pom.xml 2010-09-27 09:03:31 UTC (rev 988)
@@ -179,6 +179,18 @@
<dependency>
<groupId>org.jboss.soa.bpel.console</groupId>
+ <artifactId>bpaf</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>activity-monitor-model</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>identity</artifactId>
<version>${version}</version>
</dependency>
Modified: trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- trunk/distribution/src/main/assembly/bin.xml 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/distribution/src/main/assembly/bin.xml 2010-09-27 09:03:31 UTC (rev 988)
@@ -119,6 +119,14 @@
</includes>
</fileSet>
+ <fileSet>
+ <directory>../console/bpaf/target</directory>
+ <outputDirectory>/modules/bpel-console</outputDirectory>
+ <includes>
+ <include>riftsaw-console-bpaf.jar</include>
+ </includes>
+ </fileSet>
+
<fileSet>
<directory>../console/identity/target</directory>
<outputDirectory>/modules/bpel-console</outputDirectory>
@@ -173,7 +181,7 @@
<include>org.jboss.bpm:gwt-console-server-integration</include>
<include>org.jboss.bpm:gwt-console-rpc</include>
<include>org.codehaus.jettison:jettison</include>
-
+ <include>org.jboss.bpm:activity-monitor-model</include>
</includes>
</dependencySet>
Modified: trunk/distribution/src/main/release/db/bpel.properties
===================================================================
--- trunk/distribution/src/main/release/db/bpel.properties 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/distribution/src/main/release/db/bpel.properties 2010-09-27 09:03:31 UTC (rev 988)
@@ -128,8 +128,14 @@
hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
hibernate.show_sql=false
hibernate.connection.isolation=2
+hibernate.jdbc.batch_size=20
jta.UserTransaction=UserTransaction
ode.persistence=hibernate
+
+#
+# BPAF History
+#
+#bpel.event.listeners=org.jboss.soa.bpel.console.bpaf.BPAFLogAdapter
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/distribution/src/main/release/install/build.xml 2010-09-27 09:03:31 UTC (rev 988)
@@ -102,6 +102,10 @@
<mkdir dir="${deploy.dir}/bpel-console"/>
<mkdir dir="${deploy.dir}/bpel-console/bpel-identity.sar"/>
<mkdir dir="${deploy.dir}/bpel-console/gwt-console-server.war"/>
+
+ <copy file="${modules}/bpel-console/riftsaw-console-bpaf.jar" todir="${deploy.dir}/bpel-console"/>
+ <copy file="${modules}/bpel-console/activity-monitor-model.jar" todir="${deploy.dir}/bpel-console"/>
+
<copy file="${modules}/bpel-console/riftsaw-console-integration.jar" todir="${deploy.dir}/bpel-console"/>
<copy file="${modules}/bpel-console/jettison.jar" todir="${deploy.dir}/bpel-console"/>
<unzip src="${modules}/bpel-console/riftsaw-console-identity.jar" dest="${deploy.dir}/bpel-console/bpel-identity.sar"/>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/pom.xml 2010-09-27 09:03:31 UTC (rev 988)
@@ -77,7 +77,7 @@
<properties>
<riftsaw.ode.version>2.2.0-SNAPSHOT</riftsaw.ode.version>
<riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version>
- <bpel.console.version>2.1.2</bpel.console.version>
+ <bpel.console.version>2.2.0-SNAPSHOT</bpel.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>4.8.1</junit.version>
<jboss.version>5.1.0.GA</jboss.version>
@@ -125,6 +125,12 @@
<classifier>riftsaw</classifier>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>activity-monitor-model</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
Modified: trunk/runtime/deployer/pom.xml
===================================================================
--- trunk/runtime/deployer/pom.xml 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/runtime/deployer/pom.xml 2010-09-27 09:03:31 UTC (rev 988)
@@ -74,6 +74,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.0</version>
+ </dependency>
</dependencies>
<build>
<finalName>jboss-riftsaw-deployer</finalName>
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/service/BPELEngineService.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/service/BPELEngineService.java 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/service/BPELEngineService.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -20,9 +20,11 @@
import org.jboss.logging.Logger;
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.engine.BPELEngineFactory;
+import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
import org.jboss.util.naming.NonSerializableFactory;
import javax.naming.*;
+import javax.persistence.EntityManagerFactory;
/**
* This is the JBoss Service managing the BPEL engine.
@@ -58,6 +60,17 @@
m_bpelEngine.init();
rebindPMAPI();
+
+ // hack to expose the EntityManagerFactory.
+ // See org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl as well.
+ EntityManagerFactory emf = (EntityManagerFactory)
+ ((BPELEngineImpl)m_bpelEngine).getOdeConfig().getProperties().get("ode.emf");
+
+ if(emf!=null) // can happen when the persistence implementation is changed
+ bindEMF(emf);
+ else
+ log.warn("EntityManagerFactory cannot be exposed through JNDI.");
+
}
/**
@@ -167,4 +180,11 @@
NonSerializableFactory.rebind(fullName, m_bpelEngine.getManagementInterface(), true);
}
}
+
+ private void bindEMF(EntityManagerFactory emf) throws NamingException {
+ InitialContext rootCtx = new InitialContext();
+ Name fullName = rootCtx.getNameParser("").parse("bpel/EntityManagerFactory");
+ logger.info("EntityManagerFactory fullName="+fullName);
+ NonSerializableFactory.rebind(fullName, emf, true);
+ }
}
Deleted: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/Runner.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/Runner.java 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/Runner.java 2010-09-27 09:03:31 UTC (rev 988)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.bpel.runtime.ws;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
-public class Runner
-{
- static QName service;
- static String port;
-
- public static void main(String[] args) throws Exception
- {
- // HelloWorldProcessRequest
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition wsdlDefinition = wsdlReader.readWSDL(
- "file:///Users/hbraun/dev/env/riftsaw-distro/jbossesb-4.6/samples/quickstarts/webservice_esb_bpel/bpel/wsdl/BPELRetailer.wsdl"
- );
-
- service = new QName("http://www.jboss.org/samples/bpel/Retailer.wsdl", "RetailerService");
- port = "RetailerPort";
-
- SOAPMessageAdapter soapAdapter =new SOAPMessageAdapter(wsdlDefinition, service, port);
-
- System.out.println("RPC ? "+soapAdapter.isRPC());
-
- WSDLParser parser = new WSDLParser(wsdlDefinition);
- Operation op = parser.getDocLitOperation(
- service, port, new QName("http://www.jboss.org/samples/bpel/CustomerOrder.xsd", "customerOrder")
- );
-
- System.out.println("operation: "+op.getName());
-
- System.out.println(
- "URL: " + parser.getServiceLocationURL(service, port)
- );
- }
-
-}
Modified: trunk/samples/quickstart/hello_world/bpelContent/deploy.xml
===================================================================
--- trunk/samples/quickstart/hello_world/bpelContent/deploy.xml 2010-09-27 07:21:17 UTC (rev 987)
+++ trunk/samples/quickstart/hello_world/bpelContent/deploy.xml 2010-09-27 09:03:31 UTC (rev 988)
@@ -23,6 +23,7 @@
<process name="bpl:HelloWorld">
<active>true</active>
+ <process-events generate="all"/>
<provide partnerLink="helloPartnerLink">
<service name="intf:HelloService" port="HelloPort"/>
</provide>
14 years, 2 months
- 1
- 0
Build failed in Hudson: RiftSaw #259
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw/259/changes>
Changes:
[jeff.yuchang] * apply Julian's fix for db2.
[kurt.stam(a)jboss.com] updating to the latest jUDDI release
[kurt.stam(a)jboss.com] RIFTSAW-276, uddi client no longer throws an exception when no results are found. Updating the RiftSaw UDDI code to handle this.
[alex.guizar(a)jboss.com] RIFTSAW-126 clean up integration-tests classpath to resolve jaxb implementation conflicts in jaxws-based tests;
decrease mex.timeout for tutorials
[jeff.yuchang] * update a little bit.
[jeff.yuchang] * Added clustering userguide, and a cross pointer at gettingstartedguide.
[alex.guizar(a)jboss.com] ignore eclipse files in clustering module
[alex.guizar(a)jboss.com] resolve jdk 1.5 api incompatibilities in transformers
------------------------------------------
[...truncated 2552 lines...]
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.029 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.samples.QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase
java.lang.RuntimeException: Cannot obtain MBeanServerConnection using jndi props: {java.naming.provider.url=localhost:1099, java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory, java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jnp.interfaces, hostKey=localhost/127.0.0.1:1099}
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:75)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getDeployer(RiftSawTestHelper.java:82)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:22)
at junit.framework.TestResult.runProtected(TestResult.java:128)
at junit.extensions.TestSetup.run(TestSetup.java:27)
at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:83)
at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: javax.naming.NameNotFoundException: invoker not bound
at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
at org.jnp.server.NamingServer.lookup(NamingServer.java:396)
at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
at sun.reflect.GeneratedMethodAccessor625.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
at sun.rmi.transport.Transport$1.run(Transport.java:159)
at java.security.AccessController.doPrivileged(Native Method)
at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.024 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.samples.QuickstartBPELHelloWorldExtendedTimeoutTestCase
java.lang.RuntimeException: Cannot obtain MBeanServerConnection using jndi props: {java.naming.provider.url=localhost:1099, java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory, java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jnp.interfaces, hostKey=localhost/127.0.0.1:1099}
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:75)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getDeployer(RiftSawTestHelper.java:82)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:22)
at junit.framework.TestResult.runProtected(TestResult.java:128)
at junit.extensions.TestSetup.run(TestSetup.java:27)
at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:83)
at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: javax.naming.NameNotFoundException: invoker not bound
at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
at org.jnp.server.NamingServer.lookup(NamingServer.java:396)
at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
at sun.reflect.GeneratedMethodAccessor625.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
at sun.rmi.transport.Transport$1.run(Transport.java:159)
at java.security.AccessController.doPrivileged(Native Method)
at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.024 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.testcases.RiftSaw70TestCase
java.lang.RuntimeException: Cannot obtain MBeanServerConnection using jndi props: {java.naming.provider.url=localhost:1099, java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory, java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jnp.interfaces, hostKey=localhost/127.0.0.1:1099}
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:75)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getDeployer(RiftSawTestHelper.java:82)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:22)
at junit.framework.TestResult.runProtected(TestResult.java:128)
at junit.extensions.TestSetup.run(TestSetup.java:27)
at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:83)
at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: javax.naming.NameNotFoundException: invoker not bound
at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
at org.jnp.server.NamingServer.lookup(NamingServer.java:396)
at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
at sun.reflect.GeneratedMethodAccessor625.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
at sun.rmi.transport.Transport$1.run(Transport.java:159)
at java.security.AccessController.doPrivileged(Native Method)
at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.026 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.samples.QuickstartBPELSecureInvokeTestCase
Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec
Results :
Tests in error:
junit.framework.TestSuite(a)f5e0873(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)57a7ddcf(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)13b06041(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)20992bae(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)6855a338(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)c68c26c(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)3f9f3736(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7bcd107f(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7f033a6f(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)3fb6101e(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)255d17d7(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)53343ed0(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)1629ce8c(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)1fcef4f7(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)774acfcd(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)63cd66ea(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)6490832e(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)16e1eea8(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)f593af(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)50269997(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)4b142196(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)50d17ec3(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)291946c2(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)57ac3379(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)3d3cdaa(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)3a289d2e(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7ba85d38(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)6655bb93(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7d8a8ce2(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)30ff94b1(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7a7c3885(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)45660d6(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)5076e8a7(org.jboss.soa.bpel.tests.RiftSawTestSetup)
Tests run: 33, Failures: 0, Errors: 33, Skipped: 0
[ERROR] There are test failures.
Please refer to <http://hudson.qa.jboss.com/hudson/job/RiftSaw/ws/riftsaw/integration-test...> for the individual test results.
[INFO] [antrun:run {execution: undeploy-riftsaw}]
[INFO] Executing tasks
stop-server:
[echo] Stopping the server
[echo] Server is at <http://hudson.qa.jboss.com/hudson/job/RiftSaw/ws/riftsaw-2.2.0-SNAPSHOT/j...>
[java] Exception in thread "main" javax.naming.NameNotFoundException: RMIAdaptor not bound
[java] at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
[java] at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
[java] at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
[java] at org.jnp.server.NamingServer.lookup(NamingServer.java:443)
[java] at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
[java] at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
[java] at sun.reflect.GeneratedMethodAccessor625.invoke(Unknown Source)
[java] at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
[java] at java.lang.reflect.Method.invoke(Method.java:597)
[java] at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
[java] at sun.rmi.transport.Transport$1.run(Transport.java:159)
[java] at java.security.AccessController.doPrivileged(Native Method)
[java] at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
[java] at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
[java] at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
[java] at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
[java] at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
[java] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
[java] at java.lang.Thread.run(Thread.java:619)
[java] at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
[java] at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
[java] at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
[java] at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
[java] at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
[java] at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
[java] at javax.naming.InitialContext.lookup(InitialContext.java:392)
[java] at org.jboss.Shutdown.main(Shutdown.java:219)
[java] Java Result: 1
[echo] Shutdown rc = 1
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] An Ant BuildException has occured: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/RiftSaw/ws/riftsaw/integration-test...>:117: Unable to shut down JBoss (maybe it hasn't fully started yet?).
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 7 minutes 55 seconds
[INFO] Finished at: Fri Sep 24 18:44:24 EDT 2010
[INFO] Final Memory: 116M/662M
[INFO] ------------------------------------------------------------------------
Recording test results
Archiving artifacts
14 years, 2 months
- 1
- 1
RiftSaw-oracle - Build # 96 - Failure!
by jboss-qa-internal＠redhat.com
RiftSaw-oracle - Build # 96 - Failure:
Check console output at http://hudson.qa.jboss.com/hudson/job/RiftSaw-oracle/96/ to view the results.
14 years, 2 months
- 1
- 0
riftsaw SVN: r987 - trunk/distribution/src/main/release/db.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-09-27 03:21:17 -0400 (Mon, 27 Sep 2010)
New Revision: 987
Modified:
trunk/distribution/src/main/release/db/bpel.properties
Log:
* Configured the simple scheduler module to use JPA's implementation.
Modified: trunk/distribution/src/main/release/db/bpel.properties
===================================================================
--- trunk/distribution/src/main/release/db/bpel.properties 2010-09-27 07:11:55 UTC (rev 986)
+++ trunk/distribution/src/main/release/db/bpel.properties 2010-09-27 07:21:17 UTC (rev 987)
@@ -56,6 +56,7 @@
bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl
bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl
+bpel.dao.factory.scheduler=org.apache.ode.dao.jpa.hibernate.SchedulerDAOConnectionFactoryImpl
## Transaction Factory
## default is org.apache.ode.il.EmbeddedGeronimoFactory
14 years, 2 months
- 1
- 0
riftsaw SVN: r986 - in trunk/runtime: uddi/src/main/java/org/jboss/soa/bpel/uddi and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-09-27 03:11:55 -0400 (Mon, 27 Sep 2010)
New Revision: 986
Modified:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfig.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfigImpl.java
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
Log:
* added nodeName in the bindingkey.
* fixed the webservice baseurl for the accesspoint.
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfig.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfig.java 2010-09-24 03:48:00 UTC (rev 985)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfig.java 2010-09-27 07:11:55 UTC (rev 986)
@@ -48,6 +48,8 @@
int getWebServiceSecurePort();
- public String getClusterNodeName();
+ String getClusterNodeName();
+ String getUddiNodeName();
+
}
\ No newline at end of file
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfigImpl.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfigImpl.java 2010-09-24 03:48:00 UTC (rev 985)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfigImpl.java 2010-09-27 07:11:55 UTC (rev 986)
@@ -242,4 +242,10 @@
public void setClusterNodeName(String clusterNodeName) {
this.clusterNodeName = clusterNodeName;
}
+
+
+ public String getUddiNodeName() {
+ return this.getWebServiceHost() + "-" + this.getWebServicePort();
+ }
+
}
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-09-24 03:48:00 UTC (rev 985)
+++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-09-27 07:11:55 UTC (rev 986)
@@ -21,6 +21,7 @@
*/
package org.jboss.soa.bpel.uddi;
+import java.net.MalformedURLException;
import java.net.URL;
import java.rmi.RemoteException;
import java.util.List;
@@ -44,6 +45,7 @@
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.TransportException;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
+import org.jboss.soa.bpel.runtime.integration.ServerConfigFactory;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
import org.jboss.soa.bpel.runtime.ws.WebServiceClient;
import org.uddi.api_v3.AccessPoint;
@@ -79,7 +81,7 @@
UDDIClerk bpelClerk = null;
public static final String DEFAULT_SERVICE_KEY_FORMAT = "uddi:${keyDomain}:bpel-services-";
- public static final String DEFAULT_BINDING_KEY_FORMAT = "uddi:${keyDomain}:bindings-";
+ public static final String DEFAULT_BINDING_KEY_FORMAT = "uddi:${keyDomain}:bindings-${nodeName}-";
//Can be set in the uddi.xml property section
public static final String LANG = "lang";
public static final String SERVICE_DESCRIPTION = "serviceDescription";
@@ -198,6 +200,7 @@
if (bpelClerk!=null) {
try {
Properties properties = bpelClerk.getUDDINode().getProperties();
+ properties.put("nodeName", ServerConfigFactory.getServerConfig().getUddiNodeName());
//Constructing the bindingKey
String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + bindingName, properties);
if (properties.containsKey(BINDING_KEY_FORMAT)) {
@@ -238,6 +241,8 @@
String serviceName, String portName, URL accessUrl)
throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException {
Properties properties = clerk.getUDDINode().getProperties();
+ properties.put("nodeName", ServerConfigFactory.getServerConfig().getUddiNodeName());
+
//Constructing the serviceKey
String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + serviceName, properties);
if (properties.containsKey(SERVICE_KEY_FORMAT)) {
@@ -303,6 +308,7 @@
Properties properties = clerk.getUDDINode().getProperties();
BindingTemplate bindingTemplate = new BindingTemplate();
+
//Constructing the bindingKey
String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + serviceName + "-"
+ portName, properties);
@@ -495,6 +501,27 @@
* @return
*/
private String getWebserviceBaseUrl() {
- return (properties.getProperty(WebServiceClient.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080"));
+ String url = properties.getProperty(WebServiceClient.BPEL_WEBSERVICE_BASEURL);
+ if (url != null) {
+ return url;
+ }
+
+ return getDefaultWebServiceBaseUrl();
}
+
+ private String getDefaultWebServiceBaseUrl() {
+ try {
+ String webServiceHost = ServerConfigFactory.getServerConfig().getWebServiceHost();
+ int webServicePort = ServerConfigFactory.getServerConfig().getWebServicePort();
+ URL theURL = new URL("http://" + webServiceHost + ":" + webServicePort);
+ if (Boolean.valueOf(properties.getProperty(WebServiceClient.BPEL_WEBSERVICE_SECURE, "false"))) {
+ int secureWebServicePort = ServerConfigFactory.getServerConfig().getWebServicePort();
+ theURL = new URL("https://" + webServiceHost + ":" + secureWebServicePort);
+ }
+ return theURL.toExternalForm();
+ } catch (MalformedURLException e) {
+ log.error("Error in constructing the webservice base url.", e);
+ return null;
+ }
+ }
}
14 years, 2 months
- 1
- 0