db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1833246 - in /db/jdo/trunk: api/ api/src/java/ api/src/main/java/ api/src/main/java/javax/jdo/ api/src/main/resources/javax/ api/src/main/resources/javax/jdo/ api/src/schema/ api/src/test/ api/src/test/java/javax/jdo/ api/src/test/java/jav...
Date Sat, 09 Jun 2018 18:21:55 GMT
Author: mbo
Date: Sat Jun  9 18:21:54 2018
New Revision: 1833246

URL: http://svn.apache.org/viewvc?rev=1833246&view=rev
Log:
JDO-774 Restructure JDO maven project

Added:
    db/jdo/trunk/api/src/main/java/
      - copied from r1833245, db/jdo/trunk/api/src/java/
    db/jdo/trunk/api/src/main/resources/javax/
      - copied from r1833245, db/jdo/trunk/api/src/schema/javax/
    db/jdo/trunk/api/src/main/resources/javax/jdo/Bundle.properties
      - copied unchanged from r1833245, db/jdo/trunk/api/src/java/javax/jdo/Bundle.properties
    db/jdo/trunk/api/src/test/
      - copied from r1833245, db/jdo/trunk/api/test/
    db/jdo/trunk/api/src/test/resources/Negative0-dtd.jdo
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Negative0-dtd.jdo
    db/jdo/trunk/api/src/test/resources/Negative0-dtd.jdoquery
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Negative0-dtd.jdoquery
    db/jdo/trunk/api/src/test/resources/Negative0-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Negative0-dtd.orm
    db/jdo/trunk/api/src/test/resources/Negative0-xsd.jdo
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Negative0-xsd.jdo
    db/jdo/trunk/api/src/test/resources/Negative0-xsd.jdoquery
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Negative0-xsd.jdoquery
    db/jdo/trunk/api/src/test/resources/Negative0-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Negative0-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive0-dtd.jdo
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive0-dtd.jdo
    db/jdo/trunk/api/src/test/resources/Positive0-dtd.jdoquery
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive0-dtd.jdoquery
    db/jdo/trunk/api/src/test/resources/Positive0-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive0-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive0-xsd.jdo
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive0-xsd.jdo
    db/jdo/trunk/api/src/test/resources/Positive0-xsd.jdoquery
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive0-xsd.jdoquery
    db/jdo/trunk/api/src/test/resources/Positive0-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive0-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive1-dtd.jdo
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive1-dtd.jdo
    db/jdo/trunk/api/src/test/resources/Positive1-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive1-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive1-xsd.jdo
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive1-xsd.jdo
    db/jdo/trunk/api/src/test/resources/Positive1-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive1-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.1-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.1-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.1-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.1-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.2.1-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.2.1-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.2.1-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.2.1-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.2.2-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.2.2-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.2.2-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.2.2-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.1-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.1-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.1-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.1-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.2-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.2-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.2-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.2-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.3-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.3-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.3-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.3-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.4-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.4-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.4-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.4-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.5-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.5-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.5-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.5-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.6-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.6-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.3.6-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.3.6-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.4-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.4-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.4-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.4-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.5-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.5-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.5-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.5-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.6-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.6-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.6-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.6-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.8.1-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.8.1-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.8.1-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.8.1-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.8.2-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.8.2-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.8.2-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.8.2-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.8.3-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.8.3-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive15.8.3-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive15.8.3-xsd.orm
    db/jdo/trunk/api/src/test/resources/Positive99-dtd.jdo
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive99-dtd.jdo
    db/jdo/trunk/api/src/test/resources/Positive99-dtd.jdoquery
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive99-dtd.jdoquery
    db/jdo/trunk/api/src/test/resources/Positive99-dtd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive99-dtd.orm
    db/jdo/trunk/api/src/test/resources/Positive99-xsd.jdo
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive99-xsd.jdo
    db/jdo/trunk/api/src/test/resources/Positive99-xsd.jdoquery
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive99-xsd.jdoquery
    db/jdo/trunk/api/src/test/resources/Positive99-xsd.orm
      - copied unchanged from r1833245, db/jdo/trunk/api/test/schema/Positive99-xsd.orm
    db/jdo/trunk/api/src/test/resources/jdoconfig/
      - copied from r1833245, db/jdo/trunk/api/test/schema/jdoconfig/
    db/jdo/trunk/tck/NOTICE.txt
      - copied unchanged from r1833245, db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt
    db/jdo/trunk/tck/src/main/java/
      - copied from r1833245, db/jdo/trunk/tck/src/java/
    db/jdo/trunk/tck/src/main/resources/conf/
      - copied from r1833245, db/jdo/trunk/tck/src/conf/
    db/jdo/trunk/tck/src/main/resources/jdo/
      - copied from r1833245, db/jdo/trunk/tck/src/jdo/
    db/jdo/trunk/tck/src/main/resources/orm/
      - copied from r1833245, db/jdo/trunk/tck/src/orm/
    db/jdo/trunk/tck/src/main/resources/sql/
      - copied from r1833245, db/jdo/trunk/tck/src/sql/
    db/jdo/trunk/tck/src/main/resources/testdata/
      - copied from r1833245, db/jdo/trunk/tck/src/testdata/
    db/jdo/trunk/tck/src/main/resources/uml/
      - copied from r1833245, db/jdo/trunk/tck/src/uml/
Removed:
    db/jdo/trunk/api/src/java/
    db/jdo/trunk/api/src/main/java/javax/jdo/Bundle.properties
    db/jdo/trunk/api/src/schema/
    db/jdo/trunk/api/src/test/schema/
    db/jdo/trunk/api/test/
    db/jdo/trunk/tck/src/conf/
    db/jdo/trunk/tck/src/java/
    db/jdo/trunk/tck/src/jdo/
    db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt
    db/jdo/trunk/tck/src/orm/
    db/jdo/trunk/tck/src/sql/
    db/jdo/trunk/tck/src/testdata/
    db/jdo/trunk/tck/src/uml/
Modified:
    db/jdo/trunk/api/pom.xml
    db/jdo/trunk/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
    db/jdo/trunk/api/src/test/java/javax/jdo/schema/XMLTest.java
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
    db/jdo/trunk/tck/pom.xml

Modified: db/jdo/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/pom.xml?rev=1833246&r1=1833245&r2=1833246&view=diff
==============================================================================
--- db/jdo/trunk/api/pom.xml (original)
+++ db/jdo/trunk/api/pom.xml Sat Jun  9 18:21:54 2018
@@ -39,44 +39,6 @@
   </scm>
 
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>test/java</testSourceDirectory>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <includes>
-          <include>javax/jdo/*.properties</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/schema</directory>
-        <includes>
-          <include>javax/jdo/*.dtd</include>
-          <include>javax/jdo/*.xsd</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${basedir}/test/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <directory>${basedir}/test/schema</directory>
-        <includes>
-          <include>**/*.jdo</include>
-          <include>**/*.jdoquery</include>
-          <include>**/*.orm</include>
-          <include>**/jdoconfig.xml</include>
-        </includes>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: db/jdo/trunk/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java?rev=1833246&r1=1833245&r2=1833246&view=diff
==============================================================================
--- db/jdo/trunk/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java (original)
+++ db/jdo/trunk/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java Sat Jun  9 18:21:54
2018
@@ -37,13 +37,13 @@ public abstract class AbstractJDOConfigT
     /**
      * Returns the JDO configuration class path prefix's default value, which is
      * the project base directory suffixed by the path to the configuration
-     * directory (<tt>test/schema/jdoconfig</tt>).
+     * directory (<tt>src/test/resources/jdoconfig</tt>).
      * 
      * @return the default class path prefix used by this test suite.
      * 
      */
     protected static String initJDOConfigClasspathPrefix() {
-        return initBasedir() + "test/schema/jdoconfig";
+        return initBasedir() + "src/test/resources/jdoconfig";
     }
 
     /**

Modified: db/jdo/trunk/api/src/test/java/javax/jdo/schema/XMLTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/test/java/javax/jdo/schema/XMLTest.java?rev=1833246&r1=1833245&r2=1833246&view=diff
==============================================================================
--- db/jdo/trunk/api/src/test/java/javax/jdo/schema/XMLTest.java (original)
+++ db/jdo/trunk/api/src/test/java/javax/jdo/schema/XMLTest.java Sat Jun  9 18:21:54 2018
@@ -34,7 +34,7 @@ public class XMLTest extends AbstractTes
     protected static String BASEDIR = System.getProperty("basedir", ".");
 
     /** File prefix */
-    protected static final String FILE_PREFIX = BASEDIR + "/test/schema/";
+    protected static final String FILE_PREFIX = BASEDIR + "/src/test/resources/";
 
     /** */
     protected static final File JDO_XSD_FILE = 

Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java?rev=1833246&r1=1833245&r2=1833246&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java Sat Jun
 9 18:21:54 2018
@@ -48,7 +48,7 @@ public abstract class AbstractTCKMojo ex
     /**
      * Location of the configuration directory.
      * @parameter property="project.conf.directory"
-     *      default-value="${basedir}/src/conf"
+     *      default-value="${basedir}/src/main/resources/conf"
      * @required
      */
     protected String confDirectory;
@@ -56,7 +56,7 @@ public abstract class AbstractTCKMojo ex
     /**
      * Location of the configuration directory.
      * @parameter property="project.sql.directory"
-     *      default-value="${basedir}/src/sql"
+     *      default-value="${basedir}/src/main/resources/sql"
      * @required
      */
     protected String sqlDirectory;
@@ -101,7 +101,7 @@ public abstract class AbstractTCKMojo ex
 
     /**
      * Convenience method to set the cfgList from the file
-     * "src/conf/configurations.list".
+     * "src/main/resources/conf/configurations.list".
      * @throws MojoExecutionException If the file could not be found/opened
      */
     protected void setCfgListFromFile() throws MojoExecutionException {
@@ -116,7 +116,7 @@ public abstract class AbstractTCKMojo ex
         catch (Exception e) {
             // Error finding configurations.list
             throw new MojoExecutionException("No configuration specified and could not "
+
-                "find 'src/conf/configurations.list'");
+                "find 'src/main/resources/conf/configurations.list'");
 		}
     }
 }

Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java?rev=1833246&r1=1833245&r2=1833246&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java Sat Jun  9 18:21:54
2018
@@ -60,7 +60,7 @@ public class Enhance extends AbstractMoj
     /**
      * Root of the TCK source installation.
      * @parameter property="project.src.directory"
-     *      default-value="${basedir}/src"
+     *      default-value="${basedir}/src/main/resources"
      * @required
      */
     private String srcDirectory;

Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java?rev=1833246&r1=1833245&r2=1833246&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java Sat Jun 
9 18:21:54 2018
@@ -66,7 +66,7 @@ public class InstallSchema extends Abstr
                     PropertyUtils.string2Set(cfgList, cfgs);
             }
             else {
-                    // Fallback to "src/conf/configurations.list"
+                    // Fallback to "src/conf/main/resources/configurations.list"
                     setCfgListFromFile();
                 if (cfgList != null) {
                     cfgs = new HashSet<String>();

Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java?rev=1833246&r1=1833245&r2=1833246&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java Sat Jun  9 18:21:54
2018
@@ -160,7 +160,7 @@ public class RunTCK extends AbstractTCKM
     /**
      * Properties to use in accessing database.
      * @parameter property="jdo.tck.signaturefile"
-     *      default-value="${basedir}/src/conf/jdo-signatures.txt"
+     *      default-value="${basedir}/src/main/resources/conf/jdo-signatures.txt"
      * @optional
      */
     private String signaturefile;

Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1833246&r1=1833245&r2=1833246&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Sat Jun  9 18:21:54 2018
@@ -43,29 +43,21 @@
   </scm>
 
     <build>
-        <sourceDirectory>src/java</sourceDirectory>
         <resources>
             <resource>
-                <targetPath>META-INF</targetPath>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>META-INF/NOTICE.txt</include>
-                </includes>
+                <directory>${basedir}/src/main/resources/conf</directory>
             </resource>
             <resource>
-                <directory>${basedir}/src/conf</directory>
+                <directory>${basedir}/src/main/resources/jdo</directory>
             </resource>
             <resource>
-                <directory>${basedir}/src/jdo</directory>
+                <directory>${basedir}/src/main/resources/orm</directory>
             </resource>
             <resource>
-                <directory>${basedir}/src/orm</directory>
+                <directory>${basedir}/src/main/resources/sql</directory>
             </resource>
             <resource>
-                <directory>${basedir}/src/sql</directory>
-            </resource>
-            <resource>
-                <directory>${basedir}/src/testdata</directory>
+                <directory>${basedir}/src/main/resources/testdata</directory>
             </resource>
         </resources>
         <plugins>



Mime
View raw message