openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwsut...@apache.org
Subject svn commit: r1072039 - in /openjpa/trunk/openjpa-examples/openbooks: build.properties run.properties src/main/resources/META-INF/persistence.xml src/main/resources/demo.properties src/main/resources/images/buy.jpg
Date Fri, 18 Feb 2011 16:19:04 GMT
Author: kwsutter
Date: Fri Feb 18 16:19:04 2011
New Revision: 1072039

URL: http://svn.apache.org/viewvc?rev=1072039&view=rev
Log:
OPENJPA-1945.  Updating configuration files (.properties and .xml) to make the sample easier
to use "out of the box", especially for the JSE environment.

Added:
    openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/buy.jpg   (with props)
Modified:
    openjpa/trunk/openjpa-examples/openbooks/build.properties
    openjpa/trunk/openjpa-examples/openbooks/run.properties
    openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
    openjpa/trunk/openjpa-examples/openbooks/src/main/resources/demo.properties

Modified: openjpa/trunk/openjpa-examples/openbooks/build.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/build.properties?rev=1072039&r1=1072038&r2=1072039&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/openbooks/build.properties (original)
+++ openjpa/trunk/openjpa-examples/openbooks/build.properties Fri Feb 18 16:19:04 2011
@@ -21,7 +21,7 @@
 # Directory location of maven repository
 maven.repos=${user.home}/.m2/repository
 # OpenJPA runtime artifact
-openjpa.version=2.1.0-SNAPSHOT
+openjpa.version=2.2.0-SNAPSHOT
 
 # This is the variable of interest. 
 # Notice that the variable points to a directory, not a *.jar file.

Modified: openjpa/trunk/openjpa-examples/openbooks/run.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/run.properties?rev=1072039&r1=1072038&r2=1072039&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/openbooks/run.properties (original)
+++ openjpa/trunk/openjpa-examples/openbooks/run.properties Fri Feb 18 16:19:04 2011
@@ -21,8 +21,10 @@
 # Directory location of maven repository
 maven.repos=${user.home}/.m2/repository
 # OpenJPA runtime artifact
-openjpa.version=2.1.0-SNAPSHOT
+openjpa.version=2.2.0-SNAPSHOT
 openjpa.lib=${maven.repos}/org/apache/openjpa/openjpa-all/${openjpa.version}
 # Other depends
-jdbc.driver=${maven.repos}/mysql/mysql-connector-java/5.1.12/mysql-connector-java-5.1.12.jar
-
+# MySQL
+#jdbc.driver=${maven.repos}/mysql/mysql-connector-java/5.1.12/mysql-connector-java-5.1.12.jar
+# Derby
+jdbc.driver=${maven.repos}/org/apache/derby/derby/10.5.3.0_1/derby-10.5.3.0_1.jar

Modified: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml?rev=1072039&r1=1072038&r2=1072039&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml (original)
+++ openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml Fri
Feb 18 16:19:04 2011
@@ -21,39 +21,41 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     version="1.0">
     <persistence-unit name="OpenBooks">
-    	<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    	
-    	<class>openbook.domain.Book</class>
-    	<class>openbook.domain.Inventory</class>
-    	<class>openbook.domain.PurchaseOrder</class>
-    	<class>openbook.domain.LineItem</class>
-    	<class>openbook.domain.Customer</class>
-    	<class>openbook.domain.Author</class>
-    	
-    	<properties>
-	    <!-- Use these for MySQL
-    		<property name="javax.persistence.jdbc.driver"   value="com.mysql.jdbc.Driver"/>
-    		<property name="javax.persistence.jdbc.url"      value="jdbc:mysql://localhost/OpenBooks"/>
-    		<property name="javax.persistence.jdbc.user"     value="scott"/>
-    		<property name="javax.persistence.jdbc.password" value="tiger"/>
-	    -->
+        <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+        
+        <class>openbook.domain.Book</class>
+        <class>openbook.domain.Inventory</class>
+        <class>openbook.domain.PurchaseOrder</class>
+        <class>openbook.domain.LineItem</class>
+        <class>openbook.domain.Customer</class>
+        <class>openbook.domain.Author</class>
+        
+        <properties>
+        <!-- Use these for MySQL
+            <property name="javax.persistence.jdbc.driver"   value="com.mysql.jdbc.Driver"/>
+            <property name="javax.persistence.jdbc.url"      value="jdbc:mysql://localhost/OpenBooks"/>
+            <property name="javax.persistence.jdbc.user"     value="user"/>
+            <property name="javax.persistence.jdbc.password" value="password"/>
+        -->
+            
+        <!-- Use these for derby -->
             <property name="javax.persistence.jdbc.driver"   value="org.apache.derby.jdbc.EmbeddedDriver"/>
             <property name="javax.persistence.jdbc.url"      value="jdbc:derby:memory:OpenBooks;create=true"/>
             <property name="javax.persistence.jdbc.user"     value=""/>
             <property name="javax.persistence.jdbc.password" value=""/>
 
 
-            <property name="openjpa.DataCache"                value="true"/> 		
+            <property name="openjpa.DataCache"                value="true"/>      
 
             <property name="openjpa.RemoteCommitProvider"     value="sjvm"/>
             <property name="openjpa.InitializeEagerly"        value="true"/>
-    		
-    		<property name="openjpa.DynamicEnhancementAgent"  value="false"/>
-    		<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
-    		
+            
+            <property name="openjpa.DynamicEnhancementAgent"  value="false"/>
+            <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
+            
             <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
-    		<property name="openjpa.jdbc.QuerySQLCache"       value="true(EnableStatistics=true)"/>
-    		
-    	</properties>
+            <property name="openjpa.jdbc.QuerySQLCache"       value="true(EnableStatistics=true)"/>
+            
+        </properties>
     </persistence-unit>
     
 </persistence>

Modified: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/demo.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/demo.properties?rev=1072039&r1=1072038&r2=1072039&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/openbooks/src/main/resources/demo.properties (original)
+++ openjpa/trunk/openjpa-examples/openbooks/src/main/resources/demo.properties Fri Feb 18
16:19:04 2011
@@ -20,7 +20,7 @@
 #  Configures properties for the graphical user interface client              #
 # --------------------------------------------------------------------------- #
 #
-# Location of the slides. A defualt set of slides have been included.
+# Location of the slides. A default set of slides have been included.
 # This is the default root directory path resolved w.r.t. current directory
 # where slides files reside
 # openbook.slides.dir=slides/
@@ -33,9 +33,9 @@
 # If the URI is without a scheme, then it is resolved against the current directory. 
 # If URI is a file system path, use a forward slash at the end to signify that it is a directory.
 # The URI can be an external URI such as FishEye source code repository. 
-# The value of this URI is defaulted to "source/" i.e. in accordance to build.xml which installs
-# the viewable source code in "source/" sub-directory w.r.t OpenBooks executable.
-# openbook.source.root=source/
+# The value of this URI is defaulted to "source/openbook" i.e. in accordance to build.xml
which installs
+# the viewable source code in "source/openbook" sub-directory w.r.t OpenBooks executable.
+openbook.source.root=source/openbook
 # Following is where the files are originally created by the Ant build script. 
 # Useful for in-place testing   
 # openbook.source.root=openjpa-examples/openbooks/target/generated-html/openbook/
@@ -56,9 +56,9 @@
 # value are separated by an arrow.
 # The key is a user visible moniker to refer to the actual URI to be displayed
 # The URI is relative w.r.t. the root URI specified (or defaulted) via openbook.source.root
property
-openbook.source.list= domain.Book-> Book.java.html, Author -> domain/Author.java.html,
\
+openbook.source.list= Book-> domain/Book.java.html, Author -> domain/Author.java.html,
\
     Customer -> domain/Customer.java.html,Inventory -> domain/Inventory.java.html,\
-    PurchaseOrder-> domain/PurchaseOrder.java.html, LineItem -> domain/LineItem.java.html,Service
-> \
-    domain/OpenBookService.java.html, Persistence Service -> server/PersistenceService.java.html,
 \
-    Implementation -> server/OpenBookServiceImpl.java.html, BuyBook -> domain/BuyBookPage.java.html
+    PurchaseOrder-> domain/PurchaseOrder.java.html, LineItem -> domain/LineItem.java.html,
OpenBookService -> \
+    server/OpenBookService.java.html, OpenBookServiceImpl -> server/OpenBookServiceImpl.java.html,
\
+    PersistenceService -> server/PersistenceService.java.html, BuyBookPage -> client/BuyBookPage.java.html
   
\ No newline at end of file

Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/buy.jpg
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/buy.jpg?rev=1072039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/buy.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message