db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1579982 - in /db/jdo/trunk: README.html api/pom.xml assembly.xml copyjdorijars/pom.xml exectck/pom.xml parent-pom/pom.xml pom.xml tck/RunRules.html tck/pom.xml
Date Fri, 21 Mar 2014 17:03:43 GMT
Author: mbo
Date: Fri Mar 21 17:03:43 2014
New Revision: 1579982

URL: http://svn.apache.org/r1579982
Log:
JDO-729: Merge changes from branch 3.1-rc1 to trunk

Added:
    db/jdo/trunk/assembly.xml
Modified:
    db/jdo/trunk/README.html
    db/jdo/trunk/api/pom.xml
    db/jdo/trunk/copyjdorijars/pom.xml
    db/jdo/trunk/exectck/pom.xml
    db/jdo/trunk/parent-pom/pom.xml
    db/jdo/trunk/pom.xml
    db/jdo/trunk/tck/RunRules.html
    db/jdo/trunk/tck/pom.xml

Modified: db/jdo/trunk/README.html
URL: http://svn.apache.org/viewvc/db/jdo/trunk/README.html?rev=1579982&r1=1579981&r2=1579982&view=diff
==============================================================================
--- db/jdo/trunk/README.html (original)
+++ db/jdo/trunk/README.html Fri Mar 21 17:03:43 2014
@@ -46,9 +46,11 @@ The JDO 3 project includes the following
 </p>
 <UL>
     <LI>api contains source to build jdo-api-3.x.jar, which defines the JDO API version
3.x for Java 1.5 and later.</LI>
+    <LI>copyjdorijars contains source to build jdo-api-3.x.jar, which defines the JDO
API version 3.x for Java 1.5 and later.</LI>
     <LI>exectck contains source to build the maven plugin to run the TCK the Reference
Implementation (RI)
     or an implementation under test (IUT) </LI>
     <LI>tck contains the JDO 3.x Technology Compatibility Kit for Java 1.5 and later.</LI>
+    <LI>parent-pom contains the maven pom.xml that ties the projects together.</LI>
 </UL>
 <p>
 JDO releases may be downloaded from <a href="http://db.apache.org/jdo/downloads.html">the
Apache JDO downloads page</a>.
@@ -89,21 +91,21 @@ system property by adding -Duser.home=%H
 MAVEN_OPTS.
 </p>
 <a name="jndi"></a>
-<h3>JNDI implementation (fscontext.jar and providerutil.jar)</h3>
+<h3>JNDI Implementation (fscontext.jar and providerutil.jar)</h3>
 <p>
 The JNDI test cases in tck need a JNDI implementation.
 The TCK is configured to use Sun's JNDI implementation.
 To use your own implementation, put the implementation
-jar files into tck/lib/ext and update jndi.properties in the TCK directory
-src/conf.  To download Sun's implementation, go to 
-<a href="http://java.sun.com/products/jndi/downloads/index.html">http://java.sun.com/products/jndi/downloads/index.html</a>,
-click the Download button at <b>Download JNDI 1.2.1 &amp; More</b>, accept
a license 
-agreement, download <b>File System Service Provider, 1.2 Beta 3</b> and then
unpack
-the downloaded zip into <i>tck/lib/ext</i>. It includes the jars fscontext.jar
and providerutil.jar.
+jar files into <i>lib/ext</i> and update jndi.properties in the TCK directory
+src/conf.  To download Oracle's implementation, go to 
+<a href="http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-plat-419418.html#7110-jndi-1.2.1-oth-JPR">
+	http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-plat-419418.html#7110-jndi-1.2.1-oth-JPR</a>.
+Aaccept the license agreement and download <b>File System Service Provider, 1.2 Beta
3</b> and then unpack
+the downloaded zip into <i>lib/ext</i>. It includes the jars fscontext.jar and
providerutil.jar.
 </p>
 
 <a name="building"></a>
-<h2>Building from top level tck project</h2>
+<h2>Building from Top Level TCK Project</h2>
 For instructions for checking out the JDO source, see the Apache JDO 
 <a href="http://db.apache.org/jdo/svn.html">source code</a> page.
 
@@ -117,37 +119,23 @@ This will build the artifacts <i>jdo-api
 <p>
 To build the API, change to the "api" directory of the branch you are working in (or trunk)
and run
 <pre>mvn clean install</pre>
-This will build the <i>jdo-api</i> artifact and install it in your local Maven2
repository.
+This will build the <i>jdo-api</i> artifact and install it in your local Maven2
repository and
+run the TCK on the Reference Implementation.
 </p>
 
 <a name="tck"></a>
-<h2>Running the TCK</h2>
+<h2>Running the TCK on an Implementation Under Test</h2>
 <p>
-To run the JDO TCK on the Reference Implementation, copy the following files to the top-level
-lib/jdori directory. Copy log4j.properties from tck/src/conf. The others may be downloaded
from the maven repository.
-<DL>
-	<DT>asm-3.0.jar</DT>
-	<DT>c3p0-0.9.0.2.jar</DT>
-	<DT>datanucleus-api-jdo-3.0.7.jar</DT>
-	<DT>datanucleus-api-jpa-3.0.8.jar</DT>
-	<DT>datanucleus-core-3.0.9.jar</DT>
-	<DT>datanucleus-enhancer-3.0.1.jar</DT>
-	<DT>datanucleus-rdbms-3.0.8.jar</DT>
-	<DT>log4j-1.2.13.jar</DT>
-	<DT>log4j.properties</DT>
-</DL>
+First build the from the top level TCK project as described above.
 To run the JDO TCK on an Implementation Under Test, copy the jars needed by the implementation
-to the top-level lib/jdori directory, as well as log4j.properties and log4j-1.2.13.jar.
-<DL>
-<p>
-Then change to the "exectck" directory of the branch you are working in (or trunk) and run
-<pre>mvn clean install</pre> This builds and installs the "jdo-exectck" Maven
plugin in your
-local Maven2 repository.
+to the top-level lib/iut directory, as well as log4j.properties and log4j-1.2.13.jar.
+The log4j jar file may be copied from lib/jdori.
 </p>
 <p>
 Change to the "tck" directory of the branch you are working in (or trunk) and run
-<pre>mvn clean install</pre> and this will run the TCK (via the "jdo-exectck"
plugin) on the JDO Reference Implementation on all 
-supported databases and identity types.
+<pre>mvn -Djdo.tck.impl="iut" clean install</pre> and this will run the TCK
+(via the "jdo-exectck" plugin) on the Implementation Under Test
+on all supported databases and identity types.
 </p>
 <p>
 The "jdo-exectck" plugin has various options so you can run other implementations or

Modified: db/jdo/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/pom.xml?rev=1579982&r1=1579981&r2=1579982&view=diff
==============================================================================
--- db/jdo/trunk/api/pom.xml (original)
+++ db/jdo/trunk/api/pom.xml Fri Mar 21 17:03:43 2014
@@ -16,23 +16,28 @@
     limitations under the License.
 -->
 
-<project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>javax.jdo</groupId>
+    <groupId>org.apache.jdo</groupId>
     <artifactId>parent-pom</artifactId>
     <version>3.1-SNAPSHOT</version>
     <relativePath>../parent-pom</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
+  <groupId>javax.jdo</groupId>
   <artifactId>jdo-api</artifactId>
   <name>JDO API</name>
   <version>3.1-SNAPSHOT</version>
   <description>The Java Data Objects (JDO) API is a standard interface-based Java model
abstraction of persistence, developed as Java Specification Request 243 under the auspices
of the Java Community Process.</description>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/db/jdo/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/db/jdo</url>
+  </scm>
+
   <build>
     <sourceDirectory>src/java</sourceDirectory>
     <testSourceDirectory>test/java</testSourceDirectory>
@@ -78,8 +83,6 @@
         <artifactId>maven-source-plugin</artifactId>
         <executions>
           <execution>
-            <id>attach-sources</id>
-            <phase>none</phase>
           </execution>
         </executions>
       </plugin>

Added: db/jdo/trunk/assembly.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/assembly.xml?rev=1579982&view=auto
==============================================================================
--- db/jdo/trunk/assembly.xml (added)
+++ db/jdo/trunk/assembly.xml Fri Mar 21 17:03:43 2014
@@ -0,0 +1,116 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+    <id>src</id>
+    <formats>
+      <format>zip</format>
+      <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <moduleSets>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:parent-pom</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>parent-pom</outputDirectory>
+	      <includes>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>javax.jdo:jdo-api</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>api</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>test/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:jdo-exectck</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>exectck</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:copy-jdori-jars</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>copyjdorijars</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:jdo-tck</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>tck</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+		<include>RunRules.html</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+    </moduleSets>
+    <fileSets>
+      <fileSet>
+	<outputDirectory>.</outputDirectory>
+	<includes>
+	  <include>LICENSE.txt</include>
+	  <include>NOTICE.txt</include>
+	  <include>README.html</include>
+	  <include>assembly.xml</include>
+	  <include>pom.xml</include>
+	  <include>lib/ext</include>
+	  <include>lib/iut</include>
+	  <include>lib/jdori</include>
+	</includes>
+      </fileSet>
+    </fileSets>
+
+</assembly>

Modified: db/jdo/trunk/copyjdorijars/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/copyjdorijars/pom.xml?rev=1579982&r1=1579981&r2=1579982&view=diff
==============================================================================
--- db/jdo/trunk/copyjdorijars/pom.xml (original)
+++ db/jdo/trunk/copyjdorijars/pom.xml Fri Mar 21 17:03:43 2014
@@ -16,22 +16,30 @@
     limitations under the License.
 -->     
 
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>javax.jdo</groupId>
+    <groupId>org.apache.jdo</groupId>
     <artifactId>parent-pom</artifactId>
     <version>3.1-SNAPSHOT</version>
     <relativePath>../parent-pom</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.jdo</groupId>
   <artifactId>copy-jdori-jars</artifactId>
   <name>JDO RI Jar Copy</name>
   <version>3.1-SNAPSHOT</version>
   <description>The Java Data Objects (JDO) API is a standard interface-based Java model
abstraction of persistence, developed as Java Specification Request 243 under the auspices
of the Java Community Process.</description>
   
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/db/jdo/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/db/jdo</url>
+  </scm>
+  
   <build>
+    <sourceDirectory>src/main</sourceDirectory>
     <resources>
       <resource>
 	<directory>${basedir}/src/main/resources</directory>
@@ -53,15 +61,6 @@
             </fileset>
           </filesets>
         </configuration>
-        <executions>
-          <execution>
-            <id>clean-target-directory</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -79,6 +78,14 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   

Modified: db/jdo/trunk/exectck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/pom.xml?rev=1579982&r1=1579981&r2=1579982&view=diff
==============================================================================
--- db/jdo/trunk/exectck/pom.xml (original)
+++ db/jdo/trunk/exectck/pom.xml Fri Mar 21 17:03:43 2014
@@ -1,8 +1,7 @@
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>javax.jdo</groupId>
+        <groupId>org.apache.jdo</groupId>
         <artifactId>parent-pom</artifactId>
         <version>3.1-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
@@ -12,9 +11,16 @@
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo-exectck</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.1-SNAPSHOT</version>
     <name>JDO TCK Execution Maven Mojo</name>
     <url>http://maven.apache.org</url>
+
+   <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/db/jdo/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/db/jdo</url>
+  </scm>
+
     <build>
         <plugins>
             <plugin>
@@ -26,6 +32,14 @@
                     <target>1.6</target>
                 </configuration>
             </plugin>
+	    <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-deploy-plugin</artifactId>
+              <version>2.6</version>
+              <configuration>
+                <skip>true</skip>
+              </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>

Modified: db/jdo/trunk/parent-pom/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/parent-pom/pom.xml?rev=1579982&r1=1579981&r2=1579982&view=diff
==============================================================================
--- db/jdo/trunk/parent-pom/pom.xml (original)
+++ db/jdo/trunk/parent-pom/pom.xml Fri Mar 21 17:03:43 2014
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath></relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>javax.jdo</groupId>
+  <groupId>org.apache.jdo</groupId>
   <artifactId>parent-pom</artifactId>
   <version>3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -21,6 +20,12 @@ Requests (JSR 12 and 243) under the ausp
   <url>http://db.apache.org/jdo</url>
   <inceptionYear>2005</inceptionYear>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/db/jdo/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/db/jdo</url> 
+  </scm>
+
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org</url>
@@ -34,12 +39,12 @@ Requests (JSR 12 and 243) under the ausp
         <version>3.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>javax.jdo</groupId>
+        <groupId>org.apache.jdo</groupId>
         <artifactId>jdo-exectck</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>3.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>javax.jdo</groupId>
+        <groupId>org.apache.jdo</groupId>
         <artifactId>jdo-tck</artifactId>
         <version>3.1-SNAPSHOT</version>
       </dependency>
@@ -194,12 +199,6 @@ Requests (JSR 12 and 243) under the ausp
     </developer>
   </developers>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/db/jdo/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/</url>
-  </scm>
-
   <build>
     <plugins>
       <plugin>
@@ -238,6 +237,14 @@ Requests (JSR 12 and 243) under the ausp
           <headerLocation>${basedir}/../LICENSE.txt</headerLocation>
         </configuration>
       </plugin>
+     <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+       </plugin>
     </plugins>
   </reporting>
 </project>

Modified: db/jdo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/pom.xml?rev=1579982&r1=1579981&r2=1579982&view=diff
==============================================================================
--- db/jdo/trunk/pom.xml (original)
+++ db/jdo/trunk/pom.xml Fri Mar 21 17:03:43 2014
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>javax.jdo</groupId>
-  <artifactId>root</artifactId>
+  <groupId>org.apache</groupId>
+  <artifactId>jdo</artifactId>
   <packaging>pom</packaging>
   <version>3.1-SNAPSHOT</version>
   <name>JDO Root POM</name>
@@ -17,4 +16,62 @@
     <module>tck</module>
   </modules>
 
+  <parent>
+    <groupId>org.apache.jdo</groupId>
+    <artifactId>parent-pom</artifactId>
+    <version>3.1-SNAPSHOT</version>
+    <relativePath>parent-pom</relativePath>
+  </parent>
+  
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/db/jdo/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/db/jdo</url>
+  </scm>
+  
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+          <modules>
+            <module>api</module>
+            <module>parent-pom</module>
+          </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.4</version>
+            <configuration>
+              <appendAssemblyId>true</appendAssemblyId>
+              <descriptors>
+                <descriptor>assembly.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+	  <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+	    <artifactId>maven-gpg-plugin</artifactId>
+	    <version>1.1</version>
+	    <executions>
+	       <execution>
+		  <configuration>
+		    <file>${file}.jar</file>
+		    <keyname>${gpg.keyname}</keyname>
+		  </configuration>
+	      </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: db/jdo/trunk/tck/RunRules.html
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/RunRules.html?rev=1579982&r1=1579981&r2=1579982&view=diff
==============================================================================
--- db/jdo/trunk/tck/RunRules.html (original)
+++ db/jdo/trunk/tck/RunRules.html Fri Mar 21 17:03:43 2014
@@ -18,7 +18,7 @@
 <HTML>
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
-	<TITLE>JDO 3.0 Technology Compatibility Kit Run Rules</TITLE>
+	<TITLE>JDO 3.1 Technology Compatibility Kit Run Rules</TITLE>
 	<STYLE>
 	<!--
 		@page { size: 8.5in 11in }
@@ -26,7 +26,7 @@
 	</STYLE>
 </HEAD>
 <BODY LANG="en-US" DIR="LTR">
-<H1 ALIGN=CENTER>Running the JDO 3.0 Technology Compatibility Kit</H1>
+<H1 ALIGN=CENTER>Running the JDO 3.1 Technology Compatibility Kit</H1>
 <P ALIGN=CENTER><BR><BR>
 </P>
 <P ALIGN=CENTER>24-May-2010</P>
@@ -52,47 +52,36 @@ This includes different hardware and ope
 versions of Java, and different datastores. The TCK supports Java
 versions 1.5 to 1.6. </P>
 <P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT
SIZE=4>Installation</FONT></FONT></P>
-<P>Download the zip file from the distribution location.  Unpack the zip
-file into a directory of your choice. In this directory you will
-find: 
+<P>Download the jdo.3.x-src.zip or jdo.3.x-src.gz file from the distribution location.
 Unpack the archive file into a directory of your choice.
+Follow the instructions in the root level README.html file for building and running the JDO
TCK.
+Please take note of the following files:
 </P>
 <UL>
 	<UL>
-		<LI><P>README.html 
 		</P>
 		<LI><P>Maven configuration file "pom.xml"
-		(common project definition for all Apache JDO projects including
-		the TCK). This file must not be changed.</P>
-		<LI><P ALIGN=LEFT STYLE="margin-bottom: 0.2in">lib - this directory
-		contains a directory ext that should contain jar files<FONT FACE="Times New Roman, serif">
-		<FONT COLOR="#000000">fscontext.jar and providerutil.jar </FONT>us</FONT>ed
-		by the JNDI tests. <FONT FACE="Times New Roman, serif"><FONT COLOR="#000000">The
-		jar files can be found at
-		</FONT></FONT><A HREF="http://java.sun.com/products/jndi/downloads/index.html"><FONT
FACE="Times New Roman, serif"><FONT COLOR="#000000">http://java.sun.com/products/jndi/downloads/index.html</FONT></FONT></A><FONT
FACE="Times New Roman, serif"><FONT COLOR="#000000">.
-		Choose &quot;File System Service Provider, 1.2 Beta 3&quot; from
-		the &quot;Download JNDI 1.2.1 &amp; More&quot; page. Unzip the
-		archive and install them into the lib/ext directory. It is
-		permitted to use a different JNDI implementation; see the
-		README.txt for information on how to configure a different JNDI
-		implementation.</FONT></FONT></P>
-		<LI><P>the TCK directory, which has a release-specific name (e.g.
-		jdo-tck-3.1) and contains:</P>
+		in the top level directory and subprojects.
+		These files must not be changed.</P>
+		<LI><P ALIGN=LEFT STYLE="margin-bottom: 0.2in">lib/ext - 
+		Copy the jar files fscontext.jar and providerutil.jar used by the JNDI tests
+		into this directory. 
+		It is permitted to use a different JNDI implementation; see
+		README.html for more information.
+		</P>
+		<LI><P>lib/iut - this directory is where the JDO implementation
+		jars are installed. It is empty in the distribution. To use the
+		maven target runtck (required for an implementation to prove
+		compliance), copy the JDO implementation jar files into this
+		directory. Alternatively, update the build.properties file in the
+		TCK directory to refer to an existing location of the IUT jar
+		files.</P>
+		<LI><P>the TCK directory, which contains:</P>
 		<UL>
-			<LI><P>pom.xml - the Maven definition of the project.
-			This file must not be modified.</P>
-			<LI><P>this RunRules.html</P>
 			<LI><P>assertions - contains the assertions file identifying the
 			assertions tested by the tests. This is for reference.</P>
 			<LI><P>target - this directory contains artifacts of compiling and
 			running the tests. It does not exist in the distribution and will
 			be created by the maven build process.</P>
-			<LI><P>iut_jars - this directory is where the JDO implementation
-			jars are installed. It is empty in the distribution. To use the
-			maven target runtck (required for an implementation to prove
-			compliance), copy the JDO implementation jar files into this
-			directory. Alternatively, update the build.properties file in the
-			TCK directory to refer to an existing location of the IUT jar
-			files.</P>
 			<LI><P>src - this directory contains the test configuration files
 			and directories:</P>
 			<UL>
@@ -128,7 +117,7 @@ find: 
 <P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT
SIZE=4>Modifying
 the Configuration</FONT></FONT></P>
 <P>The Implementation Under Test (IUT) can be installed into the
-iut_jars directory in the TCK directory. Any .jar files in this
+lib/iut directory. Any jar files in this
 directory are added to the class path used to run the tests.</P>
 <P>There are properties in the build.properties file in the TCK
 directory that must be changed to configure the IUT execution and
@@ -149,15 +138,10 @@ directory in order to provide DDL for ad
 by the JDO implementation under test.</P>
 <P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT
SIZE=4>Running
 the Tests</FONT></FONT></P>
-<P>From the installation directory, change to the TCK directory. From
-the TCK directory, call &quot;mvn clean install&quot; which will build the
-jar files used in the tests, create the Derby database, install the
-schema into the Derby database, and run the TCK on the Reference
-Implementation. Success indicates that the TCK was installed
-correctly.</P>
-<P>Then call &quot;mvn clean -Djdo.tck.impl="iut"&quot; to run the tests on
the
-Implementation Under Test. This will produce console output plus a
-directory in the TCK/target/logs directory whose name contains the
+<P>Follow the instructions in README.html for running the TCK on the JDO Reference
Implementation
+and the Implementation Under Test.
+This will produce console output plus a
+directory in the tck/target/logs directory whose name contains the
 date/time the tests were started. This directory contains the output
 of the tests. This is the directory to be published.</P>
 <P>Some of the TCK tests require the implementation to support up to

Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1579982&r1=1579981&r2=1579982&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Fri Mar 21 17:03:43 2014
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>javax.jdo</groupId>
+        <groupId>org.apache.jdo</groupId>
         <artifactId>parent-pom</artifactId>
         <version>3.1-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
@@ -20,6 +19,12 @@
     NOTE!! There are no unit tests in this project.
     </description>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/db/jdo/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/jdo/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/db/jdo</url>
+  </scm>
+
     <build>
         <sourceDirectory>src/java</sourceDirectory>
         <resources>
@@ -50,7 +55,7 @@
             <plugin>
                 <groupId>org.apache.jdo</groupId>
                 <artifactId>jdo-exectck</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>3.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>integration-test</phase>
@@ -80,6 +85,14 @@
                     <windowtitle>${project.name} ${pom.currentVersion}</windowtitle>
                 </configuration>
             </plugin>
+	    <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-deploy-plugin</artifactId>
+              <version>2.6</version>
+              <configuration>
+                <skip>true</skip>
+              </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>



Mime
View raw message