db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g.@apache.org
Subject svn commit: r1873253 - in /db/torque/torque4/trunk: ./ torque-maven-plugin/src/test/resources/ torque-site/ torque-site/src/site/xdoc/ torque-site/src/site/xdoc/documentation/tutorial/orm/ torque-test/
Date Tue, 28 Jan 2020 13:52:00 GMT
Author: gk
Date: Tue Jan 28 13:52:00 2020
New Revision: 1873253

URL: http://svn.apache.org/viewvc?rev=1873253&view=rev
Log:
- site: fix format and update, update changes plugin version to 2.12.1
- plugin: add log4j2-test.xml
- test: ignore generated settings (not exported anywhere), update testcontainer version to
1.12.5.

Added:
    db/torque/torque4/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml
Modified:
    db/torque/torque4/trunk/pom.xml
    db/torque/torque4/trunk/torque-site/pom.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/status.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=1873253&r1=1873252&r2=1873253&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Tue Jan 28 13:52:00 2020
@@ -239,6 +239,16 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
+    <developer>
+      <name>Georg Kallidis</name>
+      <id>gk</id>
+      <email>gk@apache.org</email>
+      <organization />
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
   </developers>
 
   <contributors>

Added: db/torque/torque4/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml?rev=1873253&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml (added)
+++ db/torque/torque4/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml Tue Jan
28 13:52:00 2020
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn" name="Torque" packages="">
+     <Appenders>
+       <Console name="console" target="SYSTEM_OUT">
+          <PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
+      </Console>
+      <File name="torque" fileName="./target/torque-maven-plugin.log">
+          <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+      </File>
+    </Appenders>
+    <Loggers>
+          <Logger name="org.apache.torque" additivity="false" level="DEBUG">
+          <AppenderRef ref="torque" level="DEBUG"/>
+          <AppenderRef ref="console" level="INFO"/>
+      </Logger>
+      <Root level="INFO"><!-- log4j 1.2 has DEBUG -->
+          <AppenderRef ref="console"/>
+      </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-site/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/pom.xml?rev=1873253&r1=1873252&r2=1873253&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/pom.xml (original)
+++ db/torque/torque4/trunk/torque-site/pom.xml Tue Jan 28 13:52:00 2020
@@ -56,7 +56,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changes-plugin</artifactId>
-        <version>2.8</version>
+        <version>2.12.1</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -73,7 +73,8 @@
           </reportSet>
         </reportSets>
         <configuration>
-          <fixVersionIds>12312102,12323291</fixVersionIds>
+          <fixVersionIds>12312102,12323291,12324114</fixVersionIds>
+          <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version</columnNames>
           <statusIds>Resolved,Closed</statusIds>
           <sortColumnNames>Created DESC,Fix Version DESC</sortColumnNames>
           <maxEntries>300</maxEntries>

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml?rev=1873253&r1=1873252&r2=1873253&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml
(original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml
Tue Jan 28 13:52:00 2020
@@ -195,7 +195,7 @@
 
 <section name="Library set-up">
 <p>
-  For the Torque generator and SQL ant tasks to work correctly,
+  For the Torque generator/jdbc and SQL ant tasks to work correctly,
   you need to provide them with some additional libraries.
   This is done as follows:
 </p>
@@ -223,7 +223,7 @@
   </li>
   <li>To configure Logging (Log4j2) set e.g.
      <code>set ANT_OPTS=-Dlog4j.configurationFile=lib/ant/log4j2.xml</code>
-  <li>
+  </li>
   <li>
     Download the appropriate mysql driver jar, e.g. from
     <a href="http://repo1.maven.org/maven2/mysql/mysql-connector-java/">here</a>

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml?rev=1873253&r1=1873252&r2=1873253&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml
(original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml
Tue Jan 28 13:52:00 2020
@@ -39,7 +39,7 @@
   used to index these tables.
 </p>
 
-<p>If you already hava a database set up you can generate a base schema with the
+<p>If you already hava a database set up, you can generate a base schema with the
   following command in your top-level project directory:
 </p>
 
@@ -47,10 +47,11 @@
 ant jdbc
 ]]></source>
 
+<p>
  This will by default generate a <i>schema.xml</i> file. 
- By default or if you don not define defaultOutputDir it will be located in target/generated-schema.
+ By default or if you do not define <i>defaultOutputDir</i> it will be located
in <em>target/generated-schema</em>.
  
- <i>Hint</i>: Copy the generated schema to src/main/schema directory and rename
it to bookstore-schema.xml, 
+ <i>Hint</i>: Copy the generated schema to <em>src/main/schema</em>
directory and rename it to bookstore-schema.xml, 
  then add appropriate attributes e.g. 
  <li>defaultIdMethod to database element</li>
  <li>autoIncrement attribute to columns</li>
@@ -251,12 +252,12 @@ ant jdbc
   <a href="../../orm-reference/database-4-0-strict.xsd">strict Schema XSD</a>
   or the
   <a href="../../orm-reference/database-4-0.xsd">Schema XSD</a>
-  <li>
+  </li>
   <li>4.1 strict schema or default
   <a href="../../orm-reference/database-4-1-strict.xsd">strict Schema XSD</a>
   or the
   <a href="../../orm-reference/database-4-1.xsd">Schema XSD</a>
-  <li>
+  </li>
   for the database schema.  In addition, you should
   include the XML declaration and XML schema specification
   in your database schema file.

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml?rev=1873253&r1=1873252&r2=1873253&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml
(original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml
Tue Jan 28 13:52:00 2020
@@ -63,7 +63,7 @@
 torque.database.default = bookstore
 torque.database.bookstore.adapter = mysql
 
-torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPool2DataSourceFactory
 torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
 torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/bookstore
 torque.dsfactory.bookstore.connection.user = root
@@ -152,17 +152,18 @@ torque.dsfactory.bookstore.connection.pa
 
   <p>
     Torque uses
-    <a href="http://commons.apache.org/logging/">
-    commons-logging</a> as a logging interface.
+    <a href="https://logging.apache.org/log4j/log4j-2.0/index.html">
+    Log4j2</a> as a logging interface.
     To enable logging in your application, read the
-    <a href="http://commons.apache.org/logging/commons-logging-1.1.1/guide.html">
-    commons-logging user guide</a>.
+    <a href="https://logging.apache.org/log4j/2.x/manual/configuration.html">
+    configuration guide</a> or <a href="https://logging.apache.org/log4j/log4j-2.0/manual/index.html">Manual</a>.
   </p>
 
   <p>
     This example uses log4j as logging system and it is configured very simply
     so that only warnings and errors are printed.
-    In a serious application, you want to improve the logging configuration.
+    In a serious application, you want to improve the logging configuration 
+    (using <a href="https://logging.apache.org/log4j/log4j-2.0/log4j-1.2-api/index.html">Log4j-1.2
API Adapter</a>).
   </p>
 
 </subsection>

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml?rev=1873253&r1=1873252&r2=1873253&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml Tue Jan 28 13:52:00 2020
@@ -36,6 +36,14 @@
         Torque development.
         It is here that you'll find announcements related to Torque.
       </p>
+      
+      <subsection name="2020 - Torque-4.1 released">
+        <p>
+          This is the second production release of the Torque 4 branch.
+        </p>
+        For details, please check the 
+        <a href="jira-report.html">changes list</a>.
+      </subsection>
 
       <subsection name="December 2012 - Torque-4.0 released">
         <p>

Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1873253&r1=1873252&r2=1873253&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Tue Jan 28 13:52:00 2020
@@ -58,7 +58,7 @@
     <torque.test.oracle.version>10.2.0.3.0</torque.test.oracle.version>
     <torque.test.postgres.jdbc.version>42.2.9</torque.test.postgres.jdbc.version><!--
9.1-901.jdbc4, -->
     <torque.test.postgres.version>12.1</torque.test.postgres.version>
-    <torque.test.testcontainer.version>1.12.4</torque.test.testcontainer.version>
+    <torque.test.testcontainer.version>1.12.5</torque.test.testcontainer.version>
     <!-- -->
     <torque.test.idmethod>native</torque.test.idmethod>
   </properties>
@@ -570,6 +570,7 @@
             <exclude>derby.log</exclude>
             <exclude>src/main/generated-java/**/*</exclude>
             <exclude>docker-java.properties</exclude><!-- ignored, not template
-->
+            <exclude>**/torque.usersettings.properties</exclude>
           </excludes>
         </configuration>
         <executions>



---------------------------------------------------------------------
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