[overlord-commits] Overlord SVN: r216 - in cdl/trunk: runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation and 3 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Mon Aug 4 11:34:52 EDT 2008


Author: jeff.yuchang
Date: 2008-08-04 11:34:52 -0400 (Mon, 04 Aug 2008)
New Revision: 216

Modified:
   cdl/trunk/pom.xml
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/EPRWrapper.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Identity.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/JoinState.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/ScheduleItem.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java
   cdl/trunk/samples/pom.xml
Log:
* Update the entity table names, update it to start with "CDL_".



Modified: cdl/trunk/pom.xml
===================================================================
--- cdl/trunk/pom.xml	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/pom.xml	2008-08-04 15:34:52 UTC (rev 216)
@@ -1,218 +1,229 @@
-<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.overlord</groupId>
-	<artifactId>cdl</artifactId>
-	<version>1.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Overlord::CDL</name>
-	<url>http://www.jboss.org/overlord</url>
-	<description>
-		JBoss Overlord.
-	</description>
-	<scm>
-		<connection>scm:svn:https://svn.jboss.org/repos/soag/cdl/trunk</connection>
-	</scm>
-	<developers>
-		<developer>
-			<name>Jeff Yu</name>
-			<id>jeff.yuchang</id>
-			<email>cyu at redhat.com</email>
-			<organization>Red Hat</organization>
-			<roles>
-				<role>Developer</role>
-			</roles>
-			<timezone>+8</timezone>
-		</developer>
-	</developers>
-	<modules>
-		<module>runtime</module>
-		<module>samples</module>
-	</modules>
-
-	<properties>
-		<overlord-version>1.0-SNAPSHOT</overlord-version>
-	</properties>
-	
-	<profiles>
-		<profile>
-			<id>release</id>
-			<modules>
-				<module>docs</module>
-		        <module>docs/examples/gettingstarted</module>
-			</modules>
-		</profile>
-		<profile>
-		    <!-- 
-			This profile is activated when the "generate.docs" property is set,
-			as in "mvn ... -Dgenerate.docs=true ..."
-		    -->
-	      <id>docs</id>
-	      <activation>
-	        <property>
-	          <name>generate.docs</name>
-	        </property>
-	      </activation>
-	      <modules>
-	        <module>docs</module>
-	      </modules>
-		  <reporting>
-		    <plugins>
-		      <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-javadoc-plugin</artifactId>
-		        <configuration>
-		          <aggregate>true</aggregate>
-				  <show>public</show>
-				  <title>JBoss Overlord ${project.version}</title>
-		        </configuration>
-		      </plugin>
-		    </plugins>
-		  </reporting>
-	    </profile>
-	</profiles>
-
-	<build>
-		<!-- This section defines the default plugin settings inherited by child projects. -->
-		<pluginManagement>
-			<plugins>
-				<!-- Fixes how test resources of a project can be used in projects dependent on it  -->
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.2</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.2</version>
-					<configuration>
-						<aggregate>true</aggregate>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<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>
-							<goal>test-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>
-			<!-- 
-           Build a test-jar for each project, so that src/test/* resources and classes can be used
-           in other projects.  Also customize how the jar files are assembled.
-           -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<archive>
-						<manifest>
-							<addDefaultSpecificationEntries>
-								true
-							</addDefaultSpecificationEntries>
-							<addDefaultImplementationEntries>
-								true
-							</addDefaultImplementationEntries>
-						</manifest>
-						<manifestEntries>
-							<Implementation-URL>
-								${pom.url}
-							</Implementation-URL>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-			</plugin>
-	    </plugins>
-	</reporting>
-	
-	<repositories>
-		<repository>
-			<id>jboss</id>
-			<url>http://repository.jboss.com/maven2/</url>
-		</repository>
-		
-		<repository>
-			<id>jboss-snapshot</id>
-			<url>http://snapshots.jboss.org/maven2</url>
-		</repository>
-
-	    <repository>
-	        <id>maven.repo</id>
-	        <name>maven repository</name>
-	        <url>http://repo1.maven.org/maven2</url>
-	    </repository>
-
-	    <repository>
-	        <id>ibiblio</id>
-	        <name>ibiblio repository</name>
-	        <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
-	    </repository>
-
-		<repository>
-		    <id>codehaus</id>
-			<name>codehaus repository</name>
-			<url>http://repo1.maven.org/maven2</url>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<!-- Copy the distribution jar file to a local checkout of the maven repository 
- 			  -  This variable can be set in $MAVEN_HOME/conf/settings.xml -->
-			<id>repository.jboss.org</id>
-			<url>file://${jboss.repository.root}</url>
-		</repository>
-	</distributionManagement>
-	
-</project>
-
+<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.overlord</groupId>
+	<artifactId>cdl</artifactId>
+	<version>1.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>Overlord::CDL</name>
+	<url>http://www.jboss.org/overlord</url>
+	<description>
+		JBoss Overlord.
+	</description>
+	<scm>
+		<connection>scm:svn:https://svn.jboss.org/repos/soag/cdl/trunk</connection>
+	</scm>
+	<developers>
+		<developer>
+			<name>Jeff Yu</name>
+			<id>jeff.yuchang</id>
+			<email>cyu at redhat.com</email>
+			<organization>Red Hat</organization>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+8</timezone>
+		</developer>
+		<developer>
+		    <name>Gary Brown</name>
+		    <id>objectiser</id>
+		    <email>gary.brown at hattricksoftware.com</email>
+		    <organization>Hattrick Software</organization>
+		    <roles>
+		        <role>Developer</role>
+		    </roles>
+		    <timezone>+1</timezone>
+		</developer>
+	</developers>
+	<modules>
+		<module>runtime</module>
+		<module>distribution/assembly</module>
+		<module>samples</module>
+	</modules>
+
+	<properties>
+		<overlord-version>1.0-SNAPSHOT</overlord-version>
+	</properties>
+	
+	<profiles>
+		<profile>
+			<id>release</id>
+			<modules>
+				<module>docs</module>
+		        <module>docs/examples/gettingstarted</module>
+			</modules>
+		</profile>
+		<profile>
+		    <!-- 
+			This profile is activated when the "generate.docs" property is set,
+			as in "mvn ... -Dgenerate.docs=true ..."
+		    -->
+	      <id>docs</id>
+	      <activation>
+	        <property>
+	          <name>generate.docs</name>
+	        </property>
+	      </activation>
+	      <modules>
+	        <module>docs</module>
+	      </modules>
+		  <reporting>
+		    <plugins>
+		      <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-javadoc-plugin</artifactId>
+		        <configuration>
+		          <aggregate>true</aggregate>
+				  <show>public</show>
+				  <title>JBoss Overlord ${project.version}</title>
+		        </configuration>
+		      </plugin>
+		    </plugins>
+		  </reporting>
+	    </profile>
+	</profiles>
+
+	<build>
+		<!-- This section defines the default plugin settings inherited by child projects. -->
+		<pluginManagement>
+			<plugins>
+				<!-- Fixes how test resources of a project can be used in projects dependent on it  -->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.2</version>
+					<configuration>
+						<aggregate>true</aggregate>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<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>
+							<goal>test-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>
+			<!-- 
+           Build a test-jar for each project, so that src/test/* resources and classes can be used
+           in other projects.  Also customize how the jar files are assembled.
+           -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultSpecificationEntries>
+								true
+							</addDefaultSpecificationEntries>
+							<addDefaultImplementationEntries>
+								true
+							</addDefaultImplementationEntries>
+						</manifest>
+						<manifestEntries>
+							<Implementation-URL>
+								${pom.url}
+							</Implementation-URL>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+			</plugin>
+	    </plugins>
+	</reporting>
+	
+	<repositories>
+		<repository>
+			<id>jboss</id>
+			<url>http://repository.jboss.com/maven2/</url>
+		</repository>
+		
+		<repository>
+			<id>jboss-snapshot</id>
+			<url>http://snapshots.jboss.org/maven2</url>
+		</repository>
+
+	    <repository>
+	        <id>maven.repo</id>
+	        <name>maven repository</name>
+	        <url>http://repo1.maven.org/maven2</url>
+	    </repository>
+
+	    <repository>
+	        <id>ibiblio</id>
+	        <name>ibiblio repository</name>
+	        <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
+	    </repository>
+
+		<repository>
+		    <id>codehaus</id>
+			<name>codehaus repository</name>
+			<url>http://repo1.maven.org/maven2</url>
+		</repository>
+
+	</repositories>
+
+	<distributionManagement>
+		<repository>
+			<!-- Copy the distribution jar file to a local checkout of the maven repository 
+ 			  -  This variable can be set in $MAVEN_HOME/conf/settings.xml -->
+			<id>repository.jboss.org</id>
+			<url>file://${jboss.repository.root}</url>
+		</repository>
+	</distributionManagement>
+	
+</project>
+

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/EPRWrapper.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/EPRWrapper.java	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/EPRWrapper.java	2008-08-04 15:34:52 UTC (rev 216)
@@ -35,7 +35,7 @@
  *
  */
 @Entity
- at Table(name="T_EPRS")
+ at Table(name="CDL_EPRS")
 public class EPRWrapper implements Serializable{
 	
 	private static final long serialVersionUID = 1111L;

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Identity.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Identity.java	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Identity.java	2008-08-04 15:34:52 UTC (rev 216)
@@ -41,7 +41,7 @@
 
 
 @Entity
- at Table(name="T_IDENTITY")
+ at Table(name="CDL_IDENTITY")
 public class Identity implements HibernateObject {
 	
 	private static final long serialVersionUID = 1112L;

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/JoinState.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/JoinState.java	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/JoinState.java	2008-08-04 15:34:52 UTC (rev 216)
@@ -32,7 +32,7 @@
  *
  */
 @Entity
- at Table(name="T_JOIN_STATES")
+ at Table(name="CDL_JOIN_STATES")
 public class JoinState implements HibernateObject {
 
 	private static final long serialVersionUID = 1113L;

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/ScheduleItem.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/ScheduleItem.java	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/ScheduleItem.java	2008-08-04 15:34:52 UTC (rev 216)
@@ -29,7 +29,7 @@
 
 
 @Entity
- at Table(name="T_SCHEDULE_ITEM")
+ at Table(name="CDL_SCHEDULE_ITEM")
 public class ScheduleItem implements HibernateObject {
 	
 	private static final long serialVersionUID = 1114L;

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java	2008-08-04 15:34:52 UTC (rev 216)
@@ -19,6 +19,10 @@
  */
 package org.jboss.soa.overlord.conversation;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,6 +34,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
@@ -42,7 +47,7 @@
 import org.jboss.soa.esb.message.Message;
 
 @Entity
- at Table(name="T_SESSION")
+ at Table(name="CDL_SESSION")
 public class Session implements HibernateObject {
 
 	private static final long serialVersionUID = 1115L;
@@ -80,9 +85,6 @@
 	@Column(name = "POJO_CLASS")
 	private String pojoClass;
 	
-	@Column(name = "POJO_ID")
-	private long pojoID;
-	
 	@Column(name="SERVICE_NAME")
 	private String serviceName;
 	
@@ -92,6 +94,10 @@
 	@Transient
 	private Object businessObject;
 	
+	@Lob
+	@Column(name="Business_OBJECT")
+	private byte[] serializedObject;
+	
 	public Session() {
 	}
 	
@@ -323,20 +329,24 @@
 		this.pojoClass = pojoClass;
 	}
 
-	public long getPojoID() {
-		return pojoID;
-	}
-
-	public void setPojoID(long pojoID) {
-		this.pojoID = pojoID;
-	}
-
 	public Object getBusinessObject() {
 		return businessObject;
 	}
 
 	public void setBusinessObject(Object businessObject) {
 		this.businessObject = businessObject;
+		
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		ObjectOutputStream out;
+		
+		try {
+			out = new ObjectOutputStream(bos);
+			out.writeObject(this.businessObject);
+			out.close();
+		} catch (Exception e) {
+			throw new RuntimeException("Error in setting business object of " + businessObject, e);
+		}
+		this.serializedObject = bos.toByteArray();
 	}
 
 	public String getServiceName() {
@@ -371,6 +381,23 @@
 		this.joinStates = joinStates;
 	}
 	
+	public byte[] getSerializedObject() {
+		return serializedObject;
+	}
+
+	public void setSerializedObject(byte[] serializedObject) {
+		this.serializedObject = serializedObject;
+		
+		ByteArrayInputStream bais = new ByteArrayInputStream(serializedObject);
+		try {
+			ObjectInputStream in = new ObjectInputStream(bais);
+			this.businessObject = in.readObject();
+			in.close();
+		} catch (Exception e) {
+			throw new RuntimeException("Error in reading Object", e);
+		}
+	}
+
 	public String toString() {
 		StringBuffer sbuffer = new StringBuffer();
 		sbuffer.append("[ Session id: " + id);

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java	2008-08-04 15:34:52 UTC (rev 216)
@@ -45,16 +45,11 @@
 		org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
 		Class<?> pojoclass= ClassLoaderUtil.loadClass(sessionName);
 		Object businessState = pojoclass.newInstance();
-		hibernateSession.save(businessState);
 		
 		Session conversationSession = new Session();
 		conversationSession.setPojoClass(sessionName);
 		conversationSession.setStatus(SessionStatus.Active);
-		if (businessState instanceof HibernateObject) {
-			HibernateObject ho = (HibernateObject) businessState;
-			conversationSession.setPojoID(ho.getId());
-			logger.debug("Set Business State Object ID : " + ho.getId());
-		}
+		
 		conversationSession.setBusinessObject(businessState);
 		
 		Service service = pojoclass.getAnnotation(Service.class);
@@ -83,16 +78,9 @@
 			logger.info("bound to " + key);
 		}
 		
-		hibernateSession.save(businessState);
-		
 		Session conversationSession = new Session();
 		conversationSession.setPojoClass(sessionName);
 		conversationSession.setStatus(SessionStatus.Active);
-		if (businessState instanceof HibernateObject) {
-			HibernateObject ho = (HibernateObject) businessState;
-			conversationSession.setPojoID(ho.getId());
-			logger.debug("Set Business State Object ID : " + ho.getId());
-		}
 		conversationSession.setBusinessObject(businessState);
 		conversationSession.setParent(parentSession);
 		
@@ -120,10 +108,6 @@
 		if (sessionKey != null) {
 			org.hibernate.Session hibernateSession = HibernateUtil.currentSession();
 			Session session = (Session) hibernateSession.load(Session.class, Long.valueOf(sessionKey));
-			Class<?> pojoClass = ClassLoaderUtil.loadClass(session.getPojoClass());
-			Object pojo = hibernateSession.load(pojoClass, Long.valueOf(session.getPojoID()));
-			session.setBusinessObject(pojo);
-
 			return session;
 		}
 		
@@ -197,10 +181,6 @@
 		}
 		
 		Session session = (Session)hibernateSession.load(Session.class, theID.getSession().getId());
-		Class<?> pojoClass = ClassLoaderUtil.loadClass(session.getPojoClass());
-		Object pojo = hibernateSession.load(pojoClass, Long.valueOf(session.getPojoID()));
-		session.setBusinessObject(pojo);
-		
 		logger.debug("Get Session of " + session + " by using identity of " + id);
 		
 		return session;

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java	2008-08-04 15:34:52 UTC (rev 216)
@@ -55,11 +55,11 @@
 		while (variable.startsWith("parent.")) {
 			variable = variable.substring(7);
 			session = session.getParent();
-			if (session.getPojoID() != 0) {
+/*			if (session.getPojoID() != 0) {
 				Class<?> pojoClass = ClassLoaderUtil.loadClass(session.getPojoClass());
 				Object pojo = SessionManager.getObject(session.getPojoID(), pojoClass);
 				session.setBusinessObject(pojo);
-			}
+			}*/
 		}
 		
 		if (stateExpression != null) {			

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java	2008-08-04 15:34:52 UTC (rev 216)
@@ -23,7 +23,6 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.AnnotationConfiguration;
-import org.hibernate.cfg.Configuration;
 
 /**
  * @author jeffyu
@@ -37,8 +36,7 @@
 	
 	static {
 		try {
-			Configuration configuration = new AnnotationConfiguration().configure();
-			sessionFactory = configuration.buildSessionFactory();
+			sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory();
 		} catch (Throwable t) {
 			throw new ExceptionInInitializerError(t);
 		}

Modified: cdl/trunk/samples/pom.xml
===================================================================
--- cdl/trunk/samples/pom.xml	2008-08-04 15:30:18 UTC (rev 215)
+++ cdl/trunk/samples/pom.xml	2008-08-04 15:34:52 UTC (rev 216)
@@ -24,8 +24,8 @@
 
 
 	<modules>
-		<!--module>jbossesb/purchasing</module>
-		<module>jbossesb/broker</module-->
+		<module>jbossesb/purchasing</module>
+		<module>jbossesb/creditAgency</module>
 	</modules>
 
    <build>




More information about the overlord-commits mailing list