Author: jeff.yuchang Date: 2010-04-15 07:57:12 -0400 (Thu, 15 Apr 2010) New Revision: 622 Modified: branches/ODE/ODE-1.x-fixes/bpel-store/pom.xml branches/ODE/ODE-1.x-fixes/dao-hibernate-db/pom.xml branches/ODE/ODE-1.x-fixes/dao-hibernate/pom.xml branches/ODE/ODE-1.x-fixes/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/ProcessManagementDaoTest.java branches/ODE/ODE-1.x-fixes/pom.xml Log: * add jboss maven repository for hibernate and javassist. (still having failed test cases though) Modified: branches/ODE/ODE-1.x-fixes/bpel-store/pom.xml =================================================================== --- branches/ODE/ODE-1.x-fixes/bpel-store/pom.xml 2010-04-15 01:34:54 UTC (rev 621) +++ branches/ODE/ODE-1.x-fixes/bpel-store/pom.xml 2010-04-15 11:57:12 UTC (rev 622) @@ -73,6 +73,10 @@ <artifactId>hibernate-core</artifactId> </dependency> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> <groupId>javax.persistence</groupId> <artifactId>persistence-api</artifactId> </dependency> Modified: branches/ODE/ODE-1.x-fixes/dao-hibernate/pom.xml =================================================================== --- branches/ODE/ODE-1.x-fixes/dao-hibernate/pom.xml 2010-04-15 01:34:54 UTC (rev 621) +++ branches/ODE/ODE-1.x-fixes/dao-hibernate/pom.xml 2010-04-15 11:57:12 UTC (rev 622) @@ -57,6 +57,10 @@ <artifactId>hibernate-core</artifactId> </dependency> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>${slf4j.version}</version> Modified: branches/ODE/ODE-1.x-fixes/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/ProcessManagementDaoTest.java =================================================================== --- branches/ODE/ODE-1.x-fixes/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/ProcessManagementDaoTest.java 2010-04-15 01:34:54 UTC (rev 621) +++ branches/ODE/ODE-1.x-fixes/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/ProcessManagementDaoTest.java 2010-04-15 11:57:12 UTC (rev 622) @@ -50,12 +50,8 @@ protected void tearDown() throws Exception { stopTM(); } - - public void testFIXME() { - //MERGE COMMENT: please uncomment the tests below - } - /* + public void testInstanceSummary() throws Exception { Set<String> pids = new HashSet<String>(); QName pid = QName.valueOf("{ns}pid"); @@ -78,5 +74,5 @@ System.out.println("resultSummary:" + r); assertEquals(0, r.size()); } - */ + } Modified: branches/ODE/ODE-1.x-fixes/dao-hibernate-db/pom.xml =================================================================== --- branches/ODE/ODE-1.x-fixes/dao-hibernate-db/pom.xml 2010-04-15 01:34:54 UTC (rev 621) +++ branches/ODE/ODE-1.x-fixes/dao-hibernate-db/pom.xml 2010-04-15 11:57:12 UTC (rev 622) @@ -33,7 +33,7 @@ <dependencies> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> + <artifactId>hibernate-core</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: branches/ODE/ODE-1.x-fixes/pom.xml =================================================================== --- branches/ODE/ODE-1.x-fixes/pom.xml 2010-04-15 01:34:54 UTC (rev 621) +++ branches/ODE/ODE-1.x-fixes/pom.xml 2010-04-15 11:57:12 UTC (rev 622) @@ -64,7 +64,7 @@ <wsdl4j.version>1.6.2</wsdl4j.version> <woodstox.version>3.2.4</woodstox.version> <javax.mail.version>1.4</javax.mail.version> - <hibernate.version>3.3.2.ga</hibernate.version> + <hibernate.version>3.3.2.GA</hibernate.version> <spring.version>2.5.6</spring.version> <geronimo.specs.version>1.0</geronimo.specs.version> <geronimo.version>2.0.1</geronimo.version> @@ -100,6 +100,7 @@ <activemq.version>4.1.1</activemq.version> <xml-apis.version>1.3.04</xml-apis.version> <servicemix.nmr.version>1.1.0-SNAPSHOT</servicemix.nmr.version> + <javassist.version>3.9.0.GA</javassist.version> </properties> @@ -263,6 +264,11 @@ <enabled>false</enabled> </snapshots> </repository> + <repository> + <id>JBoss</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.com/maven2/</url> + </repository> </repositories> <!-- @@ -287,11 +293,6 @@ <name>ODE Maven2 repository</name> <url>http://pxe.intalio.org/public/maven2</url> </repository> - <repository> - <id>JBoss</id> - <name>JBoss Repository</name> - <url>http://repository.jboss.com/maven2/</url> - </repository> </repositories> <pluginRepositories> @@ -490,6 +491,11 @@ <version>${annogen.version}</version> </dependency> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + </dependency> + <dependency> <groupId>antlr</groupId> <artifactId>antlr</artifactId> <version>${antlr.version}</version>