openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r571259 - in /openjpa/trunk: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java openjpa-project/pom.xml src/site/apt/index.apt
Date Thu, 30 Aug 2007 18:01:11 GMT
Author: pcl
Date: Thu Aug 30 11:01:10 2007
New Revision: 571259

URL: http://svn.apache.org/viewvc?rev=571259&view=rev
Log:
updated site index with some links and more content; changed pom definitions to put docs into
the uploaded builds

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java
    openjpa/trunk/openjpa-project/pom.xml
    openjpa/trunk/src/site/apt/index.apt

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java?rev=571259&r1=571258&r2=571259&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java
Thu Aug 30 11:01:10 2007
@@ -510,6 +510,19 @@
 
         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();

Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=571259&r1=571258&r2=571259&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Thu Aug 30 11:01:10 2007
@@ -71,6 +71,9 @@
             ${openjpa.assembly.sourceBase}.zip
         </openjpa.assembly.sourceFile>
 
+        <parent.site.docs>
+            ${project.basedir}/../target/site/docs
+        </parent.site.docs>
 
         <docbook.source>${project.basedir}/src/doc/manual</docbook.source>
         <docbook.target>${project.basedir}/target/manual</docbook.target>
@@ -191,6 +194,17 @@
                                     <imgSrcPath>
                                         ${docbook.source}/
                                     </imgSrcPath>
+                                    <postProcess>
+                                        <!-- copy to parent module for 
+                                             expanded access in upload -->
+                                        <mkdir dir="${parent.site.docs}"/>
+                                        <copy todir="${parent.site.docs}">
+                                            <fileset
+                                                dir="${docbook.target}">
+                                                <include name="manual.pdf"/>
+                                            </fileset>
+                                        </copy>
+                                    </postProcess>
                                 </configuration>
                             </execution>
                             <execution>
@@ -232,6 +246,16 @@
                                                 <include name="*.*"/>
                                             </fileset>
                                         </copy>
+
+                                        <!-- copy to parent module for 
+                                             expanded access in upload -->
+                                        <mkdir dir="${parent.site.docs}"/>
+                                        <copy todir="${parent.site.docs}">
+                                            <fileset
+                                                dir="${docbook.target}">
+                                                <include name="*.*"/>
+                                            </fileset>
+                                        </copy>
                                     </postProcess>
                                 </configuration>
                             </execution>
@@ -251,6 +275,17 @@
                                     <htmlCustomization>
                                         ${docbook.source}/manual-xhtml.xsl
                                     </htmlCustomization>
+                                    <postProcess>
+                                        <!-- copy to parent module for 
+                                             expanded access in upload -->
+                                        <mkdir dir="${parent.site.docs}"/>
+                                        <copy todir="${parent.site.docs}">
+                                            <fileset
+                                                dir="${docbook.target}">
+                                                <include name="manual.html"/>
+                                            </fileset>
+                                        </copy>
+                                    </postProcess>
                                 </configuration>
                             </execution>
                         </executions>

Modified: openjpa/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/openjpa/trunk/src/site/apt/index.apt?rev=571259&r1=571258&r2=571259&view=diff
==============================================================================
--- openjpa/trunk/src/site/apt/index.apt (original)
+++ openjpa/trunk/src/site/apt/index.apt Thu Aug 30 11:01:10 2007
@@ -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



Mime
View raw message