Author: lwaterman
Date: Thu Dec 21 16:07:28 2006
New Revision: 489517
URL: http://svn.apache.org/viewvc?view=rev&rev=489517
Log:
Fix Test name and add schema generation to build
Added:
incubator/ode/trunk/bpel-test/build.xml
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
- copied, changed from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java
- copied, changed from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
- copied, changed from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Test.java
- copied, changed from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
- copied, changed from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java
- copied, changed from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java
Removed:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java
Modified:
incubator/ode/trunk/bpel-test/pom.xml
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
Added: incubator/ode/trunk/bpel-test/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/build.xml?view=auto&rev=489517
==============================================================================
--- incubator/ode/trunk/bpel-test/build.xml (added)
+++ incubator/ode/trunk/bpel-test/build.xml Thu Dec 21 16:07:28 2006
@@ -0,0 +1,53 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ -->
+
+<project name="dao-jpa-db-derby" default="run" >
+
+ <property name="descriptors.dir"
value="${basedir}/src/test/resources/META-INF" />
+ <property name="database.dir" value="${basedir}/target/database/derby" />
+ <property name="database.name" value="ode-test-db" />
+ <property name="derby.target.sql" value="${database.dir}/derby.sql" />
+
+
+ <target name="db" >
+ <delete dir="${database.dir}"/>
+ <mkdir dir="${database.dir}"/>
+ <antcall inheritRefs="true" target="gen-schemas" />
+ <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:${database.dir}/${database.name};create=true"
+ userid="sa" password="" src="${derby.target.sql}"
+ autocommit="true" onerror="abort" delimiter=";"
+ classpathref="maven.dependency.classpath">
+ </sql>
+ </target>
+
+
+ <target name="gen-schemas">
+ <java classname="org.apache.openjpa.jdbc.meta.MappingTool">
+ <arg line="-p ${descriptors.dir}/persistence.xml"/>
+ <arg line="-sa build"/>
+ <arg line="-fk true"/>
+ <arg line="-sql ${derby.target.sql}"/>
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ </classpath>
+ </java>
+ </target>
+
+</project>
Modified: incubator/ode/trunk/bpel-test/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/pom.xml?view=diff&rev=489517&r1=489516&r2=489517
==============================================================================
--- incubator/ode/trunk/bpel-test/pom.xml (original)
+++ incubator/ode/trunk/bpel-test/pom.xml Thu Dec 21 16:07:28 2006
@@ -38,14 +38,28 @@
<useProjectReferences>false</useProjectReferences>
</configuration>
</plugin>
- <!-- Having some problems with this because the embedded DB is
created
- relative to the build path - see persistent.xml URL
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.0</version>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>Generate Derby DB</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="build.xml" target="db"
inheritRefs="true"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
- <executions>
+
+ <!-- Having some problems with this because the embedded
DB is created
+ relative to the build path - see persistent.xml URL
<execution>
<phase>compile</phase>
<id>OpenJPA Mapping Tool</id>
@@ -64,11 +78,12 @@
<goals>
<goal>run</goal>
</goals>
- </execution>
+ </execution>
+ -->
</executions>
</plugin>
- -->
+
</plugins>
</build>
Modified:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java?view=diff&rev=489517&r1=489516&r2=489517
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
Thu Dec 21 16:07:28 2006
@@ -54,6 +54,7 @@
if ( Boolean.getBoolean("org.apache.ode.test.persitent")) {
emf =
Persistence.createEntityManagerFactory("ode-unit-test-embedded");
em = emf.createEntityManager();
+ String pr = Persistence.PERSISTENCE_PROVIDER;
server.setDaoConnectionFactory(new
org.apache.ode.dao.jpa.ojpa.BPELDAOConnectionFactoryImpl(em));
} else {
server.setDaoConnectionFactory(new
BpelDAOConnectionFactoryImpl());
Copied:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
(from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java?view=diff&rev=489517&p1=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java&r1=488406&p2=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java&r2=489517
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
Thu Dec 21 16:07:28 2006
@@ -1,6 +1,6 @@
package org.apache.ode.test;
-public class BasicActivities20Tests extends BPELTest {
+public class BasicActivities20Test extends BPELTest {
public void testHelloWorld2() throws Throwable {
go("target/test-classes/bpel/2.0/HelloWorld2");
}
Copied:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java
(from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Tests.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java?view=diff&rev=489517&p1=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Tests.java&r1=488406&p2=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java&r2=489517
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Tests.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java
Thu Dec 21 16:07:28 2006
@@ -1,6 +1,6 @@
package org.apache.ode.test;
-public class CompensationHandling20Tests extends BPELTest {
+public class CompensationHandling20Test extends BPELTest {
public void testCompensationHandlers() throws Throwable {
go("target/test-classes/bpel/2.0/TestCompensationHandlers");
Copied:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
(from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java?view=diff&rev=489517&p1=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java&r1=488406&p2=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java&r2=489517
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
Thu Dec 21 16:07:28 2006
@@ -1,6 +1,6 @@
package org.apache.ode.test;
-public class DataHandling20Tests extends BPELTest {
+public class DataHandling20Test extends BPELTest {
public void testXPathNamespace1() throws Throwable {
go("target/test-classes/bpel/2.0/TestXPathNamespace1");
Copied:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Test.java
(from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Test.java?view=diff&rev=489517&p1=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java&r1=488406&p2=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Test.java&r2=489517
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Test.java
Thu Dec 21 16:07:28 2006
@@ -1,6 +1,6 @@
package org.apache.ode.test;
-public class FaultHandling20Tests extends BPELTest {
+public class FaultHandling20Test extends BPELTest {
public void testFaultHandlers() throws Throwable {
go("target/test-classes/bpel/2.0/TestFaultHandlers");
}
Copied:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
(from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java?view=diff&rev=489517&p1=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java&r1=488406&p2=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java&r2=489517
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
Thu Dec 21 16:07:28 2006
@@ -1,6 +1,6 @@
package org.apache.ode.test;
-public class MessageRouting20Tests extends BPELTest {
+public class MessageRouting20Test extends BPELTest {
public void testCorrelation() throws Throwable {
go("target/test-classes/bpel/2.0/TestCorrelation");
Copied:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java
(from r488406,
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java?view=diff&rev=489517&p1=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java&r1=488406&p2=incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java&r2=489517
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java
Thu Dec 21 16:07:28 2006
@@ -1,6 +1,6 @@
package org.apache.ode.test;
-public class StructuredActivities20Tests extends BPELTest {
+public class StructuredActivities20Test extends BPELTest {
public void testFlowActivity1() throws Throwable {
// Test Flow with XPath20
go("target/test-classes/bpel/2.0/TestFlowActivity1");
