Author: gk
Date: Tue Oct 6 08:50:57 2020
New Revision: 1882268
URL: http://svn.apache.org/viewvc?rev=1882268&view=rev
Log:
- update loggingAdapter default to Log4j2LoggingAdapter
- fix site
- add tool (still used?)
Modified:
db/torque/trunk/torque-generator/pom.xml
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java
db/torque/trunk/torque-site/pom.xml
db/torque/trunk/torque-site/src/site/site.xml
db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml
db/torque/trunk/torque-site/src/site/xdoc/tools.xml
Modified: db/torque/trunk/torque-generator/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1882268&r1=1882267&r2=1882268&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Tue Oct 6 08:50:57 2020
@@ -67,6 +67,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java?rev=1882268&r1=1882267&r2=1882268&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java (original)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java Tue Oct 6 08:50:57 2020
@@ -101,6 +101,9 @@ public class Configuration
/**
* Reads the configuration.
+ *
+ * If a {@link UnitDescriptor} does not provide a loglevel,
+ * {@link Loglevel#getCurrentLoglevel()} will be applied (which is the root log level of the provided adapter).
*
* @throws ConfigurationException if an error occurs during reading the
* configuration.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java?rev=1882268&r1=1882267&r2=1882268&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java (original)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java Tue Oct 6 08:50:57 2020
@@ -43,8 +43,8 @@ public enum Loglevel
/** The key of the loglevel. */
private String key;
- /** The logging adapter to use. */
- private static LoggingAdapter loggingAdapter = new Log4jLoggingAdapter();
+ /** The default logging adapter to use. */
+ private static LoggingAdapter loggingAdapter = new Log4j2LoggingAdapter();
/**
* Constructor.
Modified: db/torque/trunk/torque-site/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/pom.xml?rev=1882268&r1=1882267&r2=1882268&view=diff
==============================================================================
--- db/torque/trunk/torque-site/pom.xml (original)
+++ db/torque/trunk/torque-site/pom.xml Tue Oct 6 08:50:57 2020
@@ -81,7 +81,12 @@
<useJql>true</useJql>
</configuration>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ </plugins>
</reporting>
<build>
Modified: db/torque/trunk/torque-site/src/site/site.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/site.xml?rev=1882268&r1=1882267&r2=1882268&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/site.xml (original)
+++ db/torque/trunk/torque-site/src/site/site.xml Tue Oct 6 08:50:57 2020
@@ -40,7 +40,7 @@
<item name="Changes" href="/jira-report.html"/>
<item name="Wiki" href="http://wiki.apache.org/DBTORQUE/" target="_blank"/>
<item name="Issue tracker" href="https://issues.apache.org/jira/projects/TORQUE/" target="_blank"/>
- <item name="Mailing lists" href="/mail-lists.html"/>
+ <item name="Mailing lists" href="/mailing-lists.html"/>
<item name="SCM" href="/scm.html" />
<item name="License" href="http://www.apache.org/licenses/" target="_blank"/>
<item name="Team" href="/team.html"/>
@@ -168,6 +168,7 @@
</item>
<item name="Old Changes" href="/changes-report.html"/>
<item name="Addons" href="/addons.html"/>
+ <item name="Tools" href="/tools.html"/>
<item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html"/>
<item name="Security" href="http://www.apache.org/security/"/>
<item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
Modified: db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml?rev=1882268&r1=1882267&r2=1882268&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml Tue Oct 6 08:50:57 2020
@@ -120,7 +120,7 @@
is normally running. The ability to set the loglevel is not provided by
commons-logging, therefore an adapter (an implementation of
<code>org.apache.torque.generator.configuration.controller.LoggingAdapter</code>)
- is used.
+ is used.
</p>
<p>
Natively, the Torque generator contains two implementations:
@@ -141,7 +141,7 @@
The adapter can be changed at runtime by calling the static method
<code>setLoggingAdapter(LoggingAdapter)</code> of the class
<code>org.apache.torque.generator.configuration.controller.Loglevel</code>.
- By default, the <code>Log4j2LoggingAdapter</code> is used.
+ By default, the <code>Log4jLoggingAdapter</code> is used in Torque 5.0 and <code>Log4j2LoggingAdapter</code> in Torque 5.1-SNAPSHOT.
</p>
</section>
</body>
Modified: db/torque/trunk/torque-site/src/site/xdoc/tools.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/tools.xml?rev=1882268&r1=1882267&r2=1882268&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/tools.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/tools.xml Tue Oct 6 08:50:57 2020
@@ -48,7 +48,7 @@
<p>
DBDesigner is no longer actively being developed. It's successor,
<a href="http://dev.mysql.com/downloads/workbench/">MySQL Workbench</a>,
- is currently in Beta status. As far as we can see, the format of the
+ is as far as we can see, ready, but the format of the
model files will need adjustment when it's ready.
</p>
</section>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.