Author: aadamchik
Date: Thu Aug 10 14:44:09 2006
New Revision: 430548
URL: http://svn.apache.org/viewvc?rev=430548&view=rev
Log:
committing before the move to the main trunk
Removed:
incubator/cayenne/sandbox/itest-unit1/src/test/java/org/apache/cayenne/jpa/itest/ResultSetTemplate.java
incubator/cayenne/sandbox/itest-unit1/src/test/java/org/apache/cayenne/jpa/itest/RowTemplate.java
incubator/cayenne/sandbox/itest-unit1/src/test/java/org/apache/cayenne/jpa/itest/Unit1DataSource.java
incubator/cayenne/sandbox/itest-unit1/src/test/java/org/apache/cayenne/jpa/itest/Unit1DataSourceFactory.java
incubator/cayenne/sandbox/itest-unit1/src/test/java/org/apache/cayenne/jpa/itest/Unit1TestSetup.java
incubator/cayenne/sandbox/itest-unit1/src/test/java/org/apache/cayenne/jpa/itest/UnitTestDBUtils.java
Modified:
incubator/cayenne/sandbox/itest-unit1/pom.xml
incubator/cayenne/sandbox/itest-unit1/src/main/java/org/apache/cayenne/jpa/itest1/entity/FieldPersistenceEntity.java
Modified: incubator/cayenne/sandbox/itest-unit1/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/itest-unit1/pom.xml?rev=430548&r1=430547&r2=430548&view=diff
==============================================================================
--- incubator/cayenne/sandbox/itest-unit1/pom.xml (original)
+++ incubator/cayenne/sandbox/itest-unit1/pom.xml Thu Aug 10 14:44:09 2006
@@ -19,26 +19,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jpa</artifactId>
+ <artifactId>itest-provider</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -56,13 +44,13 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>never</forkMode>
- <childDelegation>false</childDelegation>
+ <forkMode>once</forkMode>
<argLine>
-
-javaagent:${settings.localRepository}/org/apache/cayenne/core/cayenne-jpa/${version}/cayenne-jpa-${version}.jar
+
-javaagent:${settings.localRepository}/org/apache/cayenne/core/cayenne-jpa-agent/${version}/cayenne-jpa-agent-${version}.jar
</argLine>
</configuration>
</plugin>
+
</plugins>
</build>
</project>
Modified:
incubator/cayenne/sandbox/itest-unit1/src/main/java/org/apache/cayenne/jpa/itest1/entity/FieldPersistenceEntity.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/itest-unit1/src/main/java/org/apache/cayenne/jpa/itest1/entity/FieldPersistenceEntity.java?rev=430548&r1=430547&r2=430548&view=diff
==============================================================================
---
incubator/cayenne/sandbox/itest-unit1/src/main/java/org/apache/cayenne/jpa/itest1/entity/FieldPersistenceEntity.java
(original)
+++
incubator/cayenne/sandbox/itest-unit1/src/main/java/org/apache/cayenne/jpa/itest1/entity/FieldPersistenceEntity.java
Thu Aug 10 14:44:09 2006
@@ -21,8 +21,6 @@
import javax.persistence.Entity;
import javax.persistence.Id;
-import junit.framework.AssertionFailedError;
-
@Entity
public class FieldPersistenceEntity {
@@ -34,12 +32,12 @@
protected String property1 = INITIAL_VALUE;
public int getProperty1() {
- throw new AssertionFailedError(
+ throw new RuntimeException(
"getter is not supposed to be called in case of field based
persistence");
}
public void setProperty1(int value) {
- throw new AssertionFailedError(
+ throw new RuntimeException(
"setter is not supposed to be called in case of field based
persistence");
}
}