diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java index da61175c7..3eebdb702 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java @@ -510,6 +510,19 @@ public abstract class AbstractUnenhancedClassTest assertFalse(em.isDetached(un)); assertTrue(em.isDetached(copy)); + + /* + ##### need to make detachment algorithm in ReflectingPC smarter + // ensure that remove() cannot be invoked on a detached instance + try { + em.getTransaction().begin(); + em.remove(copy); + fail("remove() cannot be invoked on detached instance"); + } catch (IllegalArgumentException e) { + em.getTransaction().rollback(); + } + */ + copy.setStringField("offline update"); em.getTransaction().begin(); diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml index dc39f015b..2a278a440 100644 --- a/openjpa-project/pom.xml +++ b/openjpa-project/pom.xml @@ -71,6 +71,9 @@ ${openjpa.assembly.sourceBase}.zip + + ${project.basedir}/../target/site/docs + ${project.basedir}/src/doc/manual ${project.basedir}/target/manual @@ -191,6 +194,17 @@ ${docbook.source}/ + + + + + + + + + @@ -232,6 +246,16 @@ + + + + + + + + @@ -251,6 +275,17 @@ ${docbook.source}/manual-xhtml.xsl + + + + + + + + + diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 08258fcf9..260eb2fda 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -19,6 +19,18 @@ openjpa ------ - This is the OpenJPA build site. For the official site, please visit {{{http://openjpa.apache.org}http://openjpa.apache.org}}. - + For the official OpenJPA site, please visit {{{http://openjpa.apache.org}http://openjpa.apache.org}}. This area is automatically generated by maven during the site deploy process, which is automatically triggered by svn checkins or manually run by a release manager. + The contents of this directory (including documentation and release artifacts) are not necessarily endorsed by the OpenJPA community, and are not official release artifacts. + +*-------------------*-------------------------* + Description | Location +*-------------------*-------------------------* + Source and binary | {{downloads/}} + download directory | +*-------------------*-------------------------* + Documentation | {{docs/index.html}} + (multi-page) | +*-------------------*-------------------------* + JavaDoc | {{apidocs/index.html}} +*-------------------*-------------------------* \ No newline at end of file