Email Archive: datanucleus-commits (read-only)
|
[DataNucleus-commits] SF.net SVN: datanucleus:[6569]
test/user.testcase/trunk
From: <andy_jefferson@us...> - 2009-05-23 06:41
|
Revision: 6569
http://datanucleus.svn.sourceforge.net/datanucleus/?rev=6569&view=rev
Author: andy_jefferson
Date: 2009-05-23 06:41:34 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Update to use just M2
Modified Paths:
--------------
test/user.testcase/trunk/.classpath
test/user.testcase/trunk/README.txt
test/user.testcase/trunk/pom.xml
Removed Paths:
-------------
test/user.testcase/trunk/maven.xml
test/user.testcase/trunk/project.properties
test/user.testcase/trunk/project.xml
Property Changed:
----------------
test/user.testcase/trunk/
Property changes on: test/user.testcase/trunk
___________________________________________________________________
Added: svn:ignore
+ bin
Modified: test/user.testcase/trunk/.classpath
===================================================================
--- test/user.testcase/trunk/.classpath 2009-05-22 13:51:45 UTC (rev 6568)
+++ test/user.testcase/trunk/.classpath 2009-05-23 06:41:34 UTC (rev 6569)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/local.repository/javax.jdo/jars/jdo2-api-2.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
+ <classpathentry kind="lib" path="/local.repository/javax.jdo/jars/jdo2-api-2.3-ea.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: test/user.testcase/trunk/README.txt
===================================================================
--- test/user.testcase/trunk/README.txt 2009-05-22 13:51:45 UTC (rev 6568)
+++ test/user.testcase/trunk/README.txt 2009-05-23 06:41:34 UTC (rev 6569)
@@ -3,12 +3,8 @@
This project forms the basis of a DataNucleus Testcase (as defined in the docs).
The user provides the basic classes, datanucleus.properties, and Main.java
-and we can then run it using the provided Maven1/Maven2 project files.
+and we can then run it using the provided Maven2 project files.
-To execute the testcase using Maven1 :
-maven clean jar runtest
-
-
To execute the testcase using Maven2 :
mvn clean compile exec:java
Deleted: test/user.testcase/trunk/maven.xml
===================================================================
--- test/user.testcase/trunk/maven.xml 2009-05-22 13:51:45 UTC (rev 6568)
+++ test/user.testcase/trunk/maven.xml 2009-05-23 06:41:34 UTC (rev 6569)
@@ -1,58 +0,0 @@
-<project
- xmlns:maven="jelly:maven"
- xmlns:ant="jelly:ant"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util">
-
- <!-- Clean up local files. -->
- <postGoal name="clean">
- <ant:delete quiet="true" failonerror="false">
- <fileset dir="${basedir}">
- <include name="junit*.properties"/>
- <include name="datanucleus.log"/>
- <include name="datanucleus-enhancer.log"/>
- <include name="maven.log"/>
- </fileset>
- </ant:delete>
- </postGoal>
-
- <!-- Perform enhance directly after compilation -->
- <postGoal name="java:compile">
- <copy todir="${basedir}/target/classes">
- <fileset dir="${basedir}/src/java">
- <include name="**/*.jdo"/>
- <include name="**/*.orm"/>
- <include name="**/*.xml"/>
- </fileset>
- </copy>
- <attainGoal name="datanucleus:enhance"/>
- </postGoal>
-
- <!-- Goal to run the test. -->
- <goal name="runtest">
- <copy todir="${basedir}/target/classes">
- <fileset dir="${basedir}/src/java/">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
- <copy todir="${basedir}/target/classes">
- <fileset dir="${basedir}">
- <include name="datanucleus.properties"/>
- </fileset>
- </copy>
-
- <path id="myclasspath">
- <path refid="maven.dependency.classpath"/>
- <pathelement path="${maven.build.dest}"/>
- </path>
-
- <ant:java dir="${basedir}"
- classname="org.datanucleus.test.Main"
- failonerror="true"
- fork="true">
- <classpath refid="myclasspath"/>
- <jvmarg value="-Dlog4j.configuration=file:${basedir}/log4j.properties"/>
- </ant:java>
- </goal>
-
-</project>
Modified: test/user.testcase/trunk/pom.xml
===================================================================
--- test/user.testcase/trunk/pom.xml 2009-05-22 13:51:45 UTC (rev 6568)
+++ test/user.testcase/trunk/pom.xml 2009-05-23 06:41:34 UTC (rev 6569)
@@ -1,150 +1,173 @@
-<?xml version="1.0"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.datanucleus</groupId>
- <version>1.1-SNAPSHOT</version>
- <artifactId>datanucleus-test-samples</artifactId>
- <name>DataNucleus TestSamples</name>
- <description><![CDATA[
- DataNucleus Test Samples, providing the basic samples used in testing.
- ]]></description>
-
- <dependencies>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-rdbms</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jpa</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-connectionpool</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
-
- <build>
- <!-- For the defaults of Maven 2.0.x see http://maven.apache.org/pom.html#The_Super_POM -->
- <sourceDirectory>src/java</sourceDirectory>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/java</directory>
- <includes>
- <include>**/plugin.xml</include>
- <include>**/persistence.xml</include>
- <include>**/*.jdo</include>
- <include>**/*.orm</include>
- <include>**/orm.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/</directory>
- <includes>
- <include>**/datanucleus.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>README.txt</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>ISO-8859-1</encoding>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>maven-datanucleus-plugin</artifactId>
- <version>1.1-SNAPSHOT</version>
- <configuration>
- <fork>false</fork>
- <verbose>false</verbose>
- <mappingIncludes>**/*.jdo, **/*.class</mappingIncludes>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <mainClass>org.datanucleus.test.Main</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.datanucleus</groupId>
+ <version>1.1-SNAPSHOT</version>
+ <artifactId>datanucleus-test-samples</artifactId>
+ <name>DataNucleus TestSamples</name>
+ <description><![CDATA[
+ DataNucleus Test Samples, providing the basic samples used in testing.
+ ]]></description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>[1.1, 1.1.99)</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
+ <version>[1.1, 1.1.99)</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jpa</artifactId>
+ <version>[1.1, 1.1.99)</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo2-api</artifactId>
+ <version>2.3-ea</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-connectionpool</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <!-- For the defaults of Maven 2.0.x see http://maven.apache.org/pom.html#The_Super_POM -->
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/java</directory>
+ <includes>
+ <include>**/plugin.xml</include>
+ <include>**/persistence.xml</include>
+ <include>**/*.jdo</include>
+ <include>**/*.orm</include>
+ <include>**/orm.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/conf</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/</directory>
+ <includes>
+ <include>**/datanucleus.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>README.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>*.log</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>ISO-8859-1</encoding>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>maven-datanucleus-plugin</artifactId>
+ <version>1.1.3</version>
+ <configuration>
+ <fork>true</fork>
+ <verbose>true</verbose>
+ <api>JDO</api>
+ <!--persistenceUnitName>JPATest</persistenceUnitName-->
+ <mappingIncludes>**/*.jdo, **/*.class</mappingIncludes>
+ <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <mainClass>org.datanucleus.test.Main</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>log4j.configuration</key>
+ <value>file:${basedir}/log4j.properties</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
Deleted: test/user.testcase/trunk/project.properties
===================================================================
--- test/user.testcase/trunk/project.properties 2009-05-22 13:51:45 UTC (rev 6568)
+++ test/user.testcase/trunk/project.properties 2009-05-23 06:41:34 UTC (rev 6569)
@@ -1,26 +0,0 @@
-# -------------------------------------------------------------------
-# P R O J E C T P R O P E R T I E S
-# -------------------------------------------------------------------
-# Allow selection of JDBC jar - see below
-maven.jar.override=on
-
-# User Interface
-maven.xdoc.date=left
-maven.xdoc.date.format=dd MMMM yyyy HH:mm
-maven.xdoc.version=${pom.currentVersion}
-
-# Maven compilation
-maven.compile.debug=on
-maven.compile.deprecation=off
-maven.compile.optimize=on
-
-#
-# JPOX plugin
-#
-maven.datanucleus.log4j.configuration=file:${basedir}/log4j.properties
-maven.datanucleus.verbose=true
-maven.datanucleus.properties=${basedir}/datanucleus.properties
-maven.datanucleus.jdo.fileset.include=**/*.jdo
-maven.datanucleus.jdo.fileset.include.2=**/*.class
-maven.datanucleus.enhancer.classenhancer=asm
-
Deleted: test/user.testcase/trunk/project.xml
===================================================================
--- test/user.testcase/trunk/project.xml 2009-05-22 13:51:45 UTC (rev 6568)
+++ test/user.testcase/trunk/project.xml 2009-05-23 06:41:34 UTC (rev 6569)
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<project>
- <pomVersion>3</pomVersion>
- <name>DataNucleus Testcase</name>
- <groupId>com.datanucleus</groupId>
- <artifactId>datanucleustest</artifactId>
- <currentVersion>1.0</currentVersion>
- <inceptionYear>2004</inceptionYear>
- <package>com.datanucleus.tests</package>
- <shortDescription>DataNucleus Testcase</shortDescription>
- <description><![CDATA[
- DataNucleus Testcase
- ]]></description>
-
- <!-- Software Dependencies -->
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <url>http://jakarta.apache.org/log4j/</url>
- </dependency>
-
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>com.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.datanucleus</groupId>
- <artifactId>datanucleus-java5</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- <dependency>
- <groupId>com.datanucleus</groupId>
- <artifactId>datanucleus-dbcp</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
-
- <!-- Build process -->
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- </build>
-
- <!-- Reports that we are interested in -->
- <reports>
- </reports>
-</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thread View
| Thread | Author | Date | |
|---|---|---|---|
| [DataNucleus-commits] SF.net SVN: datanucleus:[3946] test/user.testcase/trunk | <andy_jefferson@us...> |
|
|
|
|