You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by pp...@apache.org on 2007/12/19 00:31:08 UTC

svn commit: r605363 - in /labs/fluid/slice: ./ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/services/ src/test/java/org/apache/openjpa/persistence/ src/test/java/org/apache/openjpa/persistence/test/ src/test/resources/ s...

Author: ppoddar
Date: Tue Dec 18 15:30:58 2007
New Revision: 605363

URL: http://svn.apache.org/viewvc?rev=605363&view=rev
Log:
Initial commit

Added:
    labs/fluid/slice/src/main/resources/
    labs/fluid/slice/src/main/resources/META-INF/
    labs/fluid/slice/src/main/resources/META-INF/services/
    labs/fluid/slice/src/main/resources/META-INF/services/org.apache.openjpa.lib.conf.ProductDerivation
    labs/fluid/slice/src/test/java/org/apache/openjpa/persistence/
    labs/fluid/slice/src/test/java/org/apache/openjpa/persistence/test/
      - copied from r602969, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/
    labs/fluid/slice/src/test/resources/
    labs/fluid/slice/src/test/resources/META-INF/
    labs/fluid/slice/src/test/resources/META-INF/persistence.xml
Modified:
    labs/fluid/slice/   (props changed)
    labs/fluid/slice/pom.xml

Propchange: labs/fluid/slice/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 18 15:30:58 2007
@@ -0,0 +1,3 @@
+target
+.classpath
+.project

Modified: labs/fluid/slice/pom.xml
URL: http://svn.apache.org/viewvc/labs/fluid/slice/pom.xml?rev=605363&r1=605362&r2=605363&view=diff
==============================================================================
--- labs/fluid/slice/pom.xml (original)
+++ labs/fluid/slice/pom.xml Tue Dec 18 15:30:58 2007
@@ -127,7 +127,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <scope>test</scope>
+      <scope>compile</scope>
     </dependency>
     
   </dependencies>
@@ -148,10 +148,10 @@
         		<groupId>org.apache.maven.plugins</groupId>
         		<artifactId>maven-surefire-plugin</artifactId>
         		<configuration>
-          			<forkMode>pertest</forkMode>
-          			<disableXmlReport>true</disableXmlReport>
-          			<trimStackTrace>true</trimStackTrace>
-        		</configuration>
+                            <fork>true</fork>
+                    <disableXmlReport>true</disableXmlReport>
+                    <trimStackTrace>true</trimStackTrace>
+                       </configuration>
       		</plugin>
 <!--      		
       		<plugin>
@@ -191,36 +191,26 @@
                         <configuration>
                     		<fork>true</fork>
                             <tasks>
-                                <path id="cp">
+                                <path id="enhance.class.path">
                                     <pathelement path="${basedir}/test/resources"/>
                                     <path refid="maven.test.classpath"/>
                                     <path refid="maven.compile.classpath"/>
                                     <path refid="maven.dependency.classpath"/>
                                 </path>
-                                <taskdef name="openjpac" classname=
-                                    "org.apache.openjpa.ant.PCEnhancerTask">
-                                    <classpath refid="cp"/>
+                                <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
+                                    <classpath refid="enhance.class.path"/>
                                 </taskdef>
                                 <fileset id="enhance.path.ref"
                                     dir="${project.build.testOutputDirectory}">
-                                    <include name="**/*.class"/>
+                                    <include name="domain/*.class"/>
                                 </fileset>
-                                <!-- Generate POJO source files from META-INF/*.xsd -->
-                                <mkdir dir="${generated.src}"/>
-                                <echo message="Compiling generated Java source"/>
-                                <javac srcdir="${generated.src}" 
-                                	executable="${env.JAVA_HOME}/bin/javac.exe"
-                                	fork="true"
-                                	destdir="${project.build.testOutputDirectory}">
-                                    <classpath refid="cp"/>
-                                </javac>
                                 <echo message="Enhancing Entities"/>
-                                <java classname="org.apache.openjpa.enhance.PCEnhancer">
-                                    <classpath refid="cp"/>
-                                    <arg value="-properties"/>
-                                    <arg value="META-INF/persistence.xml"/>
-                                </java>
-                            </tasks>
+                                <openjpac>
+                                    <classpath refid="enhance.class.path"/>
+                                    <fileset refid="enhance.path.ref"/>
+                                    <config log="DefaultLevel=WARN, Enhance=INFO"/>
+                                </openjpac>
+                           </tasks>
                         </configuration>
                         <goals>
                             <goal>run</goal>

Added: labs/fluid/slice/src/main/resources/META-INF/services/org.apache.openjpa.lib.conf.ProductDerivation
URL: http://svn.apache.org/viewvc/labs/fluid/slice/src/main/resources/META-INF/services/org.apache.openjpa.lib.conf.ProductDerivation?rev=605363&view=auto
==============================================================================
--- labs/fluid/slice/src/main/resources/META-INF/services/org.apache.openjpa.lib.conf.ProductDerivation (added)
+++ labs/fluid/slice/src/main/resources/META-INF/services/org.apache.openjpa.lib.conf.ProductDerivation Tue Dec 18 15:30:58 2007
@@ -0,0 +1 @@
+org.apache.openjpa.slice.ProductDerivation
\ No newline at end of file

Added: labs/fluid/slice/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/labs/fluid/slice/src/test/resources/META-INF/persistence.xml?rev=605363&view=auto
==============================================================================
--- labs/fluid/slice/src/test/resources/META-INF/persistence.xml (added)
+++ labs/fluid/slice/src/test/resources/META-INF/persistence.xml Tue Dec 18 15:30:58 2007
@@ -0,0 +1,45 @@
+<?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" version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+   <persistence-unit name="slice">
+        <class>domain.PObject</class>
+        <class>domain.Person</class>
+        <class>domain.Address</class>
+		<properties>
+            <property name="openjpa.BrokerFactory" value="slice"/>
+            <property name="openjpa.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+            <property name="openjpa.ConnectionURL" value="jdbc:mysql://localhost/slice1|jdbc:mysql://localhost/slice2"/>
+            <property name="openjpa.ConnectionUserName" value="root"/>
+            <property name="openjpa.ConnectionPassword" value="hello"/>
+            
+            <property name="openjpa.Connection2URL" value="jdbc:mysql://localhost/slice1"/>
+			<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
+   			<property name="openjpa.QueryCompilationCache" value="false"/>
+   			<property name="openjpa.Log" value="DefaultLevel=WARN, Enhance=TRACE, SQL=TRACE, Query=TRACE"/>
+   			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
+            <property name="openjpa.jdbc.MappingDefaults" value="DefaultMissingInfo=true"/>
+            <property name="slice.DistributionPolicy" value="org.apache.openjpa.distributed.UserDistributionPolicy"/>
+      	</properties>
+   </persistence-unit>
+   
+      <persistence-unit name="slice1">
+        <properties>
+            <property name="openjpa.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+            <property name="openjpa.ConnectionURL" value="jdbc:mysql://localhost/slice1"/>
+            <property name="openjpa.ConnectionUserName" value="root"/>
+            <property name="openjpa.ConnectionPassword" value="hello"/>
+            <property name="openjpa.Connection2URL" value="jdbc:mysql://localhost/slice1"/>
+        </properties>
+   </persistence-unit>
+   
+   <persistence-unit name="slice2">
+        <properties>
+            <property name="openjpa.ConnectionDriverName" value="com.mysql.jdbc.Driver"/>
+            <property name="openjpa.ConnectionURL" value="jdbc:mysql://localhost/slice2"/>
+            <property name="openjpa.ConnectionUserName" value="root"/>
+            <property name="openjpa.ConnectionPassword" value="hello"/>
+            <property name="openjpa.Connection2URL" value="jdbc:mysql://localhost/slice2"/>
+        </properties>
+   </persistence-unit>
+   
+   
+</persistence>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org