Author: nbelaevski Date: 2010-10-04 13:27:49 -0400 (Mon, 04 Oct 2010) New Revision: 19434 Added: trunk/examples/richfaces-showcase/src/main/resources-gae/ trunk/examples/richfaces-showcase/src/main/resources-gae/META-INF/ trunk/examples/richfaces-showcase/src/main/resources-gae/META-INF/jdoconfig.xml trunk/examples/richfaces-showcase/src/main/resources-gae/META-INF/persistence.xml Removed: trunk/examples/richfaces-showcase/src/main/resources/META-INF/jdoconfig.xml trunk/examples/richfaces-showcase/src/main/resources/META-INF/persistence.xml Modified: trunk/examples/richfaces-showcase/pom.xml Log: https://jira.jboss.org/browse/RF-9270 Modified: trunk/examples/richfaces-showcase/pom.xml =================================================================== --- trunk/examples/richfaces-showcase/pom.xml 2010-10-04 17:24:54 UTC (rev 19433) +++ trunk/examples/richfaces-showcase/pom.xml 2010-10-04 17:27:49 UTC (rev 19434) @@ -145,6 +145,14 @@ </dependency> </dependencies> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>src/main/resources-gae</directory> + </resource> + </resources> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> Deleted: trunk/examples/richfaces-showcase/src/main/resources/META-INF/jdoconfig.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/resources/META-INF/jdoconfig.xml 2010-10-04 17:24:54 UTC (rev 19433) +++ trunk/examples/richfaces-showcase/src/main/resources/META-INF/jdoconfig.xml 2010-10-04 17:27:49 UTC (rev 19434) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<jdoconfig xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdocon... - - <persistence-manager-factory name="transactions-optional"> - <property name="javax.jdo.PersistenceManagerFactoryClass" - value="org.datanucleus.store.appengine.jdo.DatastoreJDOPersistenceManagerFactory"/> - <property name="javax.jdo.option.ConnectionURL" value="appengine"/> - <property name="javax.jdo.option.NontransactionalRead" value="true"/> - <property name="javax.jdo.option.NontransactionalWrite" value="true"/> - <property name="javax.jdo.option.RetainValues" value="true"/> - <property name="datanucleus.appengine.autoCreateDatastoreTxns" value="true"/> - </persistence-manager-factory> -</jdoconfig> Deleted: trunk/examples/richfaces-showcase/src/main/resources/META-INF/persistence.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/resources/META-INF/persistence.xml 2010-10-04 17:24:54 UTC (rev 19433) +++ trunk/examples/richfaces-showcase/src/main/resources/META-INF/persistence.xml 2010-10-04 17:27:49 UTC (rev 19434) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> - <persistence-unit name="transactions-optional"> - <provider>org.datanucleus.store.appengine.jpa.DatastorePersistenceProvider</provider> - <properties> - <property name="datanucleus.NontransactionalRead" value="true"/> - <property name="datanucleus.NontransactionalWrite" value="true"/> - <property name="datanucleus.ConnectionURL" value="appengine"/> - </properties> - </persistence-unit> - -</persistence> \ No newline at end of file Copied: trunk/examples/richfaces-showcase/src/main/resources-gae/META-INF/jdoconfig.xml (from rev 19429, trunk/examples/richfaces-showcase/src/main/resources/META-INF/jdoconfig.xml) =================================================================== --- trunk/examples/richfaces-showcase/src/main/resources-gae/META-INF/jdoconfig.xml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/resources-gae/META-INF/jdoconfig.xml 2010-10-04 17:27:49 UTC (rev 19434) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<jdoconfig xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdocon... + + <persistence-manager-factory name="transactions-optional"> + <property name="javax.jdo.PersistenceManagerFactoryClass" + value="org.datanucleus.store.appengine.jdo.DatastoreJDOPersistenceManagerFactory"/> + <property name="javax.jdo.option.ConnectionURL" value="appengine"/> + <property name="javax.jdo.option.NontransactionalRead" value="true"/> + <property name="javax.jdo.option.NontransactionalWrite" value="true"/> + <property name="javax.jdo.option.RetainValues" value="true"/> + <property name="datanucleus.appengine.autoCreateDatastoreTxns" value="true"/> + </persistence-manager-factory> +</jdoconfig> Copied: trunk/examples/richfaces-showcase/src/main/resources-gae/META-INF/persistence.xml (from rev 19429, trunk/examples/richfaces-showcase/src/main/resources/META-INF/persistence.xml) =================================================================== --- trunk/examples/richfaces-showcase/src/main/resources-gae/META-INF/persistence.xml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/resources-gae/META-INF/persistence.xml 2010-10-04 17:27:49 UTC (rev 19434) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="transactions-optional"> + <provider>org.datanucleus.store.appengine.jpa.DatastorePersistenceProvider</provider> + <properties> + <property name="datanucleus.NontransactionalRead" value="true"/> + <property name="datanucleus.NontransactionalWrite" value="true"/> + <property name="datanucleus.ConnectionURL" value="appengine"/> + </properties> + </persistence-unit> + +</persistence> \ No newline at end of file