db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1382226 - in /db/torque/torque4/trunk: ./ src/ torque-ant-tasks/ torque-generator/ torque-maven-parent/ torque-maven-parent/src/ torque-maven-plugin/ torque-runtime/ torque-site/ torque-site/src/site/xdoc/developer-info/ torque-templates/ ...
Date Sat, 08 Sep 2012 02:52:03 GMT
Author: tfischer
Date: Sat Sep  8 02:52:01 2012
New Revision: 1382226

URL: http://svn.apache.org/viewvc?rev=1382226&view=rev
Log:
change to hierarchical project structure - step 2

Added:
    db/torque/torque4/trunk/KEYS
      - copied unchanged from r1382223, db/torque/torque4/trunk/torque-maven-parent/KEYS
    db/torque/torque4/trunk/LICENSE.txt
      - copied unchanged from r1382223, db/torque/torque4/trunk/torque-maven-parent/LICENSE.txt
    db/torque/torque4/trunk/NOTICE
      - copied unchanged from r1382223, db/torque/torque4/trunk/torque-maven-parent/NOTICE
    db/torque/torque4/trunk/src/
      - copied from r1382223, db/torque/torque4/trunk/torque-maven-parent/src/
Removed:
    db/torque/torque4/trunk/torque-maven-parent/KEYS
    db/torque/torque4/trunk/torque-maven-parent/LICENSE.txt
    db/torque/torque4/trunk/torque-maven-parent/NOTICE
    db/torque/torque4/trunk/torque-maven-parent/src/
Modified:
    db/torque/torque4/trunk/pom.xml
    db/torque/torque4/trunk/torque-ant-tasks/pom.xml
    db/torque/torque4/trunk/torque-generator/pom.xml
    db/torque/torque4/trunk/torque-maven-plugin/pom.xml
    db/torque/torque4/trunk/torque-runtime/pom.xml
    db/torque/torque4/trunk/torque-site/pom.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml
    db/torque/torque4/trunk/torque-templates/pom.xml
    db/torque/torque4/trunk/torque-test/pom.xml

Modified: db/torque/torque4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1382226&r1=1382225&r2=1382226&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Sat Sep  8 02:52:01 2012
@@ -37,12 +37,12 @@
   <url>http://db.apache.org/torque/releases/torque-4.0</url>
 
   <modules>
-    <module>../torque-runtime</module>
-    <module>../torque-generator</module>
-    <module>../torque-templates</module>
-    <module>../torque-maven-plugin</module>
-    <module>../torque-ant-tasks</module>
-    <module>../torque-site</module>
+    <module>torque-runtime</module>
+    <module>torque-generator</module>
+    <module>torque-templates</module>
+    <module>torque-maven-plugin</module>
+    <module>torque-ant-tasks</module>
+    <module>torque-site</module>
   </modules>
 
   <issueManagement>
@@ -305,9 +305,9 @@
   </contributors>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-maven-parent</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-maven-parent</developerConnection>
-    <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-parent</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
   </scm>
 
   <build>
@@ -378,8 +378,8 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.5</version>
         <configuration>
-          <configLocation>${basedir}/../torque-maven-parent/src/main/checkstyle/checkstyle.xml</configLocation>
-          <headerLocation>${basedir}/../torque-maven-parent/src/main/checkstyle/license-header.txt</headerLocation>
+          <configLocation>${basedir}/../src/main/checkstyle/checkstyle.xml</configLocation>
+          <headerLocation>${basedir}/../src/main/checkstyle/license-header.txt</headerLocation>
         </configuration>
       </plugin>
       <plugin>
@@ -477,8 +477,8 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.5</version>
         <configuration>
-          <configLocation>${basedir}/../torque-maven-parent/src/main/checkstyle/checkstyle.xml</configLocation>
-          <headerLocation>${basedir}/../torque-maven-parent/src/main/checkstyle/license-header.txt</headerLocation>
+          <configLocation>${basedir}/../src/main/checkstyle/checkstyle.xml</configLocation>
+          <headerLocation>${basedir}/../src/main/checkstyle/license-header.txt</headerLocation>
         </configuration>
       </plugin>
       <plugin>
@@ -520,7 +520,7 @@
     <profile>
       <id>test</id>
       <modules>
-        <module>../torque-test</module>
+        <module>torque-test</module>
       </modules>
     </profile>
   </profiles>

Modified: db/torque/torque4/trunk/torque-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/pom.xml?rev=1382226&r1=1382225&r2=1382226&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/torque4/trunk/torque-ant-tasks/pom.xml Sat Sep  8 02:52:01 2012
@@ -22,7 +22,7 @@
     <groupId>org.apache.torque</groupId>
     <artifactId>torque-maven-parent</artifactId>
     <version>4.0-beta1-SNAPSHOT</version>
-    <relativePath>../torque-maven-parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -79,7 +79,7 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <configuration>
               <descriptors>
-                <descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
+                <descriptor>../src/main/assembly/bin-with-dependencies.xml</descriptor>
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>

Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1382226&r1=1382225&r2=1382226&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Sat Sep  8 02:52:01 2012
@@ -22,7 +22,7 @@
     <groupId>org.apache.torque</groupId>
     <artifactId>torque-maven-parent</artifactId>
     <version>4.0-beta1-SNAPSHOT</version>
-    <relativePath>../torque-maven-parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -180,7 +180,7 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <configuration>
               <descriptors>
-                <descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
+                <descriptor>../src/main/assembly/bin-with-dependencies.xml</descriptor>
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>

Modified: db/torque/torque4/trunk/torque-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin/pom.xml?rev=1382226&r1=1382225&r2=1382226&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/torque4/trunk/torque-maven-plugin/pom.xml Sat Sep  8 02:52:01 2012
@@ -22,7 +22,7 @@
     <groupId>org.apache.torque</groupId>
     <artifactId>torque-maven-parent</artifactId>
     <version>4.0-beta1-SNAPSHOT</version>
-    <relativePath>../torque-maven-parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: db/torque/torque4/trunk/torque-runtime/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=1382226&r1=1382225&r2=1382226&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/pom.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/pom.xml Sat Sep  8 02:52:01 2012
@@ -22,7 +22,7 @@
     <groupId>org.apache.torque</groupId>
     <artifactId>torque-maven-parent</artifactId>
     <version>4.0-beta1-SNAPSHOT</version>
-    <relativePath>../torque-maven-parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -148,7 +148,7 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <configuration>
               <descriptors>
-                <descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
+                <descriptor>../src/main/assembly/bin-with-dependencies.xml</descriptor>
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>

Modified: db/torque/torque4/trunk/torque-site/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/pom.xml?rev=1382226&r1=1382225&r2=1382226&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/pom.xml (original)
+++ db/torque/torque4/trunk/torque-site/pom.xml Sat Sep  8 02:52:01 2012
@@ -22,7 +22,7 @@
     <groupId>org.apache.torque</groupId>
     <artifactId>torque-maven-parent</artifactId>
     <version>4.0-beta1-SNAPSHOT</version>
-    <relativePath>../torque-maven-parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml?rev=1382226&r1=1382225&r2=1382226&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml Sat
Sep  8 02:52:01 2012
@@ -54,8 +54,12 @@
       
       <subsection name="Eclipse integration">
         <p>
-          Change into the directory torque-maven-parent in your local copy
-          of the torque 4 trunk. Run 
+          Assuming you want to check out the project from eclipse:
+          Install the svn eclipse plugin of your choice (if you have not already done so)
(foollowing description for subclipse)
+          create the repository location https://svn.apache.org/repos/asf
+          browse into the directory db/torque/torque4/trunk
+          right-click and "checkout...", choose "checkout as new project in the workspace"
and name the project "torque4"
+          In command line, change into the torque4 directory you just checked out and run
""
           <code>mvn eclipse:configure-workspace install eclipse:clean eclipse:eclipse</code>.
           Change into ../torque-test and run 
           <code>mvn -Pmysql eclipse:clean eclipse:eclipse</code>.

Modified: db/torque/torque4/trunk/torque-templates/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/pom.xml?rev=1382226&r1=1382225&r2=1382226&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/pom.xml (original)
+++ db/torque/torque4/trunk/torque-templates/pom.xml Sat Sep  8 02:52:01 2012
@@ -22,7 +22,7 @@
     <groupId>org.apache.torque</groupId>
     <artifactId>torque-maven-parent</artifactId>
     <version>4.0-beta1-SNAPSHOT</version>
-    <relativePath>../torque-maven-parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -109,7 +109,7 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <configuration>
               <descriptors>
-                <descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
+                <descriptor>../src/main/assembly/bin-with-dependencies.xml</descriptor>
               </descriptors>
               <appendAssemblyId>false</appendAssemblyId>
               <tarLongFileMode>gnu</tarLongFileMode>

Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1382226&r1=1382225&r2=1382226&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Sat Sep  8 02:52:01 2012
@@ -25,7 +25,7 @@
     <groupId>org.apache.torque</groupId>
     <artifactId>torque-maven-parent</artifactId>
     <version>4.0-beta1-SNAPSHOT</version>
-    <relativePath>../torque-maven-parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message