svn commit: r1917233 - in /db/torque/trunk/torque-runtime: ./ src/main/java/org/apache/torque/ src/main/java/org/apache/torque/dsfactory/ src/main/java/org/apache/torque/manager/ src/test/java/org/apa
Author: tv
Date: Sun Apr 21 11:37:11 2024
New Revision: 1917233
URL: http://svn.apache.org/viewvc?rev=1917233=rev
Log:
Update deprecated code, update JCS to 3.2
Removed:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java
Modified:
db/torque/trunk/torque-runtime/pom.xml
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java
Modified: db/torque/trunk/torque-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/pom.xml?rev=1917233=1917232=1917233=diff
==
--- db/torque/trunk/torque-runtime/pom.xml (original)
+++ db/torque/trunk/torque-runtime/pom.xml Sun Apr 21 11:37:11 2024
@@ -50,12 +50,6 @@
-commons-dbcp
-commons-dbcp
-true
-
-
-
org.apache.commons
commons-dbcp2
@@ -67,7 +61,7 @@
org.apache.commons
-commons-jcs-core
+commons-jcs3-core
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1917233=1917232=1917233=diff
==
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
(original)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Sun Apr 21 11:37:11 2024
@@ -36,10 +36,10 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.builder.fluent.Parameters;
import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs3.JCS;
import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.adapter.Adapter;
import org.apache.torque.adapter.AdapterFactory;
import org.apache.torque.adapter.IDMethod;
@@ -458,7 +458,7 @@ public class TorqueInstance
String handle = key.substring(0, key.indexOf('.'));
log.debug("handle: {} DataSourceFactory: {}", handle,
classname);
Class dsfClass = Class.forName(classname);
-DataSourceFactory dsf = (DataSourceFactory)
dsfClass.getDeclaredConstructor( null ).newInstance();
+DataSourceFactory dsf = (DataSourceFactory)
dsfClass.getDeclaredConstructor().newInstance();
Configuration subConf = c.subset(handle);
dsf.initialize(subConf);
@@ -584,7 +584,7 @@ public class TorqueInstance
try
{
Configuration configuration;
-if (!configFile.endsWith("xml"))
+if (!configFile.endsWith("xml"))
{
FileBasedConfigurationBuilder
propertiesBuilder = new FileBasedConfigurationBuilder<>(
@@ -674,7 +674,7 @@ public class TorqueInstance
if (!managers.containsKey(managedClassKey))
{
String managerClass = conf.getString(key);
-log.info("Added Manager for Class: {} -> {}",
+log.info("Added Manager for Class: {} -> {}",
managedClassKey, managerClass);
try
{
@@ -711,7 +711,7 @@ public class TorqueInstance
{
try
{
-return (AbstractBaseManager)
Class.forName(className).newInstance();
+return (AbstractBaseManager)
Class.forName(className).getDeclaredConstructor().newInstance();
}
catch (Exception e)
{
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java?rev=1917233=1917232=1917233=diff
svn commit: r1917234 - in /db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om: FindHelper.java OMColumnTransformer.java
Author: tv
Date: Sun Apr 21 11:41:18 2024
New Revision: 1917234
URL: http://svn.apache.org/viewvc?rev=1917234=rev
Log:
Organize imports
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java?rev=1917234=1917233=1917234=diff
==
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java
Sun Apr 21 11:41:18 2024
@@ -19,7 +19,6 @@ package org.apache.torque.templates.tran
* under the License.
*/
-import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java?rev=1917234=1917233=1917234=diff
==
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
Sun Apr 21 11:41:18 2024
@@ -1,12 +1,29 @@
package org.apache.torque.templates.transformer.om;
+/*
+ * 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.
+ */
+
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.processor.string.WrapReservedJavaWords;
import org.apache.torque.generator.source.SourceElement;
@@ -22,25 +39,6 @@ import org.apache.torque.templates.typem
import org.apache.torque.templates.typemapping.SqlType;
import org.apache.torque.templates.typemapping.TypeMap;
-/*
- * 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.
- */
-
/**
* Sets the class names and packages for the OM model.
* The id method attribute must already be set on the parent table element
@@ -48,8 +46,6 @@ import org.apache.torque.templates.typem
*/
public class OMColumnTransformer
{
-private static Logger log =
LogManager.getLogger(OMColumnTransformer.class);
-
/** The transformer for inheritance elements. */
private static OMInheritanceTransformer inheritanceTransformer
= new OMInheritanceTransformer();
@@ -60,7 +56,7 @@ public class OMColumnTransformer
/** Prevents reserved java words. */
private static WrapReservedJavaWords reservedJavaWordsWrapper
= new WrapReservedJavaWords();
-
+
protected OMColumnJavaTransformer javaTransformer = new
OMColumnJavaTransformer();
static
svn commit: r1917235 - /db/torque/trunk/NOTICE
Author: tv Date: Sun Apr 21 11:42:04 2024 New Revision: 1917235 URL: http://svn.apache.org/viewvc?rev=1917235=rev Log: Update NOTICE Modified: db/torque/trunk/NOTICE Modified: db/torque/trunk/NOTICE URL: http://svn.apache.org/viewvc/db/torque/trunk/NOTICE?rev=1917235=1917234=1917235=diff == --- db/torque/trunk/NOTICE (original) +++ db/torque/trunk/NOTICE Sun Apr 21 11:42:04 2024 @@ -1,5 +1,5 @@ Apache DB Torque -Copyright 2001-2020 The Apache Software Foundation. +Copyright 2001-2024 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
svn commit: r1917236 - /db/torque/trunk/pom.xml
Author: tv Date: Sun Apr 21 11:42:39 2024 New Revision: 1917236 URL: http://svn.apache.org/viewvc?rev=1917236=rev Log: Remove deprecated code, update JCS to 3.2 Modified: db/torque/trunk/pom.xml Modified: db/torque/trunk/pom.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1917236=1917235=1917236=diff == --- db/torque/trunk/pom.xml (original) +++ db/torque/trunk/pom.xml Sun Apr 21 11:42:39 2024 @@ -352,12 +352,6 @@ -commons-dbcp -commons-dbcp -1.4 - - - org.apache.commons commons-dbcp2 2.12.0 @@ -365,8 +359,8 @@ org.apache.commons -commons-jcs-core -2.2.1 +commons-jcs3-core +3.2 - To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
svn commit: r1917241 [2/2] - in /db/torque/trunk/torque-generator/src: main/java/org/apache/torque/generator/configuration/ main/java/org/apache/torque/generator/configuration/controller/ main/java/or
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java?rev=1917241=1917240=1917241=diff
==
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
Sun Apr 21 13:29:41 2024
@@ -22,7 +22,6 @@ package org.apache.torque.generator.merg
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.Charset;
-import java.nio.charset.UnsupportedCharsetException;
import org.apache.torque.generator.GeneratorException;
import org.eclipse.jgit.diff.RawText;
@@ -54,24 +53,11 @@ public class ThreeWayMerger
String base,
String generated,
String edited,
-String charsetName)
+Charset charSet)
throws GeneratorException
{
MergeAlgorithm mergeAlgorithm = new MergeAlgorithm();
-MergeResult mergeResult;
-Charset charSet;
-try
-{
-charSet = Charset.forName(charsetName);
-}
-catch (UnsupportedCharsetException e)
-{
-throw new GeneratorException(
-"unknown character set " + charsetName,
-e);
-}
-
-mergeResult = mergeAlgorithm.merge(
+MergeResult mergeResult = mergeAlgorithm.merge(
RawTextComparator.DEFAULT,
new RawText(base.getBytes(charSet)),
new RawText(generated.getBytes(charSet)),
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java?rev=1917241=1917240=1917241=diff
==
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java
Sun Apr 21 13:29:41 2024
@@ -1,5 +1,7 @@
package org.apache.torque.generator.option;
+import java.util.Objects;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -30,12 +32,12 @@ public class OptionImpl implements Optio
/**
* The qualified name of the option, including the name and the context.
*/
-private QualifiedName qualifiedName;
+private final QualifiedName qualifiedName;
/**
* The value of the option.
*/
-private Object value;
+private final Object value;
/**
* Constructs an optionImpl from a namespace, a name and a value.
@@ -127,13 +129,7 @@ public class OptionImpl implements Optio
@Override
public int hashCode()
{
-final int prime = 31;
-int result = 1;
-result = prime * result
-+ ((qualifiedName == null) ? 0 : qualifiedName.hashCode());
-result = prime * result
-+ ((value == null) ? 0 : value.hashCode());
-return result;
+return Objects.hash(qualifiedName, value);
}
@Override
@@ -143,35 +139,17 @@ public class OptionImpl implements Optio
{
return true;
}
-if (obj == null)
-{
-return false;
-}
-if (getClass() != obj.getClass())
+if ((obj == null) || (getClass() != obj.getClass()))
{
return false;
}
final OptionImpl other = (OptionImpl) obj;
-if (qualifiedName == null)
-{
-if (other.qualifiedName != null)
-{
-return false;
-}
-}
-else if (!qualifiedName.equals(other.qualifiedName))
+if (!Objects.equals(qualifiedName, other.qualifiedName))
{
return false;
}
-if (value == null)
-{
-if (other.value != null)
-{
-return false;
-}
-}
-else if (!value.equals(other.value))
+if (!Objects.equals(value, other.value))
{
return false;
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/DebuggingOutletWrapper.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/DebuggingOutletWrapper.java?rev=1917241=1917240=1917241=diff
==
---
svn commit: r1917241 [1/2] - in /db/torque/trunk/torque-generator/src: main/java/org/apache/torque/generator/configuration/ main/java/org/apache/torque/generator/configuration/controller/ main/java/or
Author: tv Date: Sun Apr 21 13:29:41 2024 New Revision: 1917241 URL: http://svn.apache.org/viewvc?rev=1917241=rev Log: Eclipse cleanup, use Charset where appropriate Modified: 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/ConfigurationHandlers.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4j2LoggingAdapter.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2JarProjectPaths.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactory.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java
svn commit: r1917243 - /db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
Author: tv
Date: Sun Apr 21 13:30:43 2024
New Revision: 1917243
URL: http://svn.apache.org/viewvc?rev=1917243=rev
Log:
Use Charset where appropriate
Modified:
db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
Modified:
db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java?rev=1917243=1917242=1917243=diff
==
---
db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
(original)
+++
db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
Sun Apr 21 13:30:43 2024
@@ -22,6 +22,7 @@ package org.apache.torque.generator.mave
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -601,6 +602,7 @@ public class TorqueGeneratorMojo extends
encoding = project.getProperties().getProperty(
"project.build.sourceEncoding");
}
+Charset charSet = Charset.forName(encoding);
UnitDescriptor unitDescriptor = new UnitDescriptor(
packaging,
projectPaths,
@@ -608,7 +610,7 @@ public class TorqueGeneratorMojo extends
unitDescriptor.setOverrideSourceProvider(fileSourceProvider);
unitDescriptor.setOverrideOptions(optionConfiguration);
unitDescriptor.setLoglevel(convertedLoglevel);
-unitDescriptor.setDefaultOutputEncoding(encoding);
+unitDescriptor.setDefaultOutputEncoding(charSet);
unitDescriptor.setAddDebuggingInfoToOutput(addDebuggingInfoToOutput);
unitDescriptor.setRunOnlyOnSourceChange(runOnlyOnSourceChange);
getLog().debug("unit descriptor created");
@@ -626,7 +628,7 @@ public class TorqueGeneratorMojo extends
parentUnitDescriptor.setOverrideSourceProvider(fileSourceProvider);
parentUnitDescriptor.setOverrideOptions(optionConfiguration);
parentUnitDescriptor.setLoglevel(convertedLoglevel);
-parentUnitDescriptor.setDefaultOutputEncoding(encoding);
+parentUnitDescriptor.setDefaultOutputEncoding(charSet);
parentUnitDescriptor.setAddDebuggingInfoToOutput(addDebuggingInfoToOutput);
parentUnitDescriptor.setRunOnlyOnSourceChange(runOnlyOnSourceChange);
getLog().debug("child unit descriptor created from directory");
@@ -646,7 +648,7 @@ public class TorqueGeneratorMojo extends
parentUnitDescriptor.setOverrideSourceProvider(fileSourceProvider);
parentUnitDescriptor.setOverrideOptions(optionConfiguration);
parentUnitDescriptor.setLoglevel(convertedLoglevel);
-parentUnitDescriptor.setDefaultOutputEncoding(encoding);
+parentUnitDescriptor.setDefaultOutputEncoding(charSet);
parentUnitDescriptor.setAddDebuggingInfoToOutput(addDebuggingInfoToOutput);
parentUnitDescriptor.setRunOnlyOnSourceChange(runOnlyOnSourceChange);
getLog().debug("child unit descriptor created from package");
-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
svn commit: r1917242 - /db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java
Author: tv
Date: Sun Apr 21 13:30:19 2024
New Revision: 1917242
URL: http://svn.apache.org/viewvc?rev=1917242=rev
Log:
Use Charset where appropriate
Modified:
db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java
Modified:
db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java?rev=1917242=1917241=1917242=diff
==
---
db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java
(original)
+++
db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java
Sun Apr 21 13:30:19 2024
@@ -20,6 +20,7 @@ package org.apache.torque.ant.task;
*/
import java.io.File;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -150,7 +151,7 @@ public class TorqueGeneratorTask extends
* The encoding which should be used for the files which do not have an
* output encoding set in the templates.
*/
-private String defaultOutputEncoding;
+private Charset defaultOutputCharset;
/**
* Whether all source files should be combined into one source tree.
@@ -343,7 +344,7 @@ public class TorqueGeneratorTask extends
unitDescriptor.setLoglevel(convertedLoglevel);
unitDescriptor.setRunOnlyOnSourceChange(runOnlyOnSourceChange);
unitDescriptor.setAddDebuggingInfoToOutput(addDebuggingInfoToOutput);
-unitDescriptor.setDefaultOutputEncoding(defaultOutputEncoding);
+unitDescriptor.setDefaultOutputEncoding(defaultOutputCharset);
log("unit descriptor created", Project.MSG_DEBUG);
if (overrideConfigDir != null)
{
@@ -359,8 +360,7 @@ public class TorqueGeneratorTask extends
parentUnitDescriptor.setOverrideSourceProvider(fileSourceProvider);
parentUnitDescriptor.setOverrideOptions(optionConfiguration);
parentUnitDescriptor.setLoglevel(convertedLoglevel);
-parentUnitDescriptor.setDefaultOutputEncoding(
-defaultOutputEncoding);
+
parentUnitDescriptor.setDefaultOutputEncoding(defaultOutputCharset);
log("child unit descriptor created",Project.MSG_DEBUG);
unitDescriptor = parentUnitDescriptor;
}
@@ -525,13 +525,13 @@ public class TorqueGeneratorTask extends
* Sets the encoding which should be used for the files which do not have
* an output encoding set in the templates.
*
- * @param defaultOutputEncoding the default output encoding,
+ * @param defaultOutputCharset the default output encoding,
*or null to use the generator default
*(the platform default encoding).
*/
-public void setDefaultOutputEncoding(final String defaultOutputEncoding)
+public void setDefaultOutputEncoding(final Charset defaultOutputCharset)
{
-this.defaultOutputEncoding = defaultOutputEncoding;
+this.defaultOutputCharset = defaultOutputCharset;
}
/**
-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
svn commit: r1917245 - in /db/torque/trunk/torque-runtime/src: main/java/org/apache/torque/ main/java/org/apache/torque/adapter/ main/java/org/apache/torque/avalon/ main/java/org/apache/torque/criteri
Author: tv Date: Sun Apr 21 14:06:23 2024 New Revision: 1917245 URL: http://svn.apache.org/viewvc?rev=1917245=rev Log: Eclipse cleanup Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/IDMethod.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/JoinType.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPartImpl.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/converters/DurationConverter.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodCacheKey.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/om/ObjectKey.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/OrderBy.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/WhereClauseExpression.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/AbstractPeerImpl.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/AvgHelper.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/ExceptionMapperImpl.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/ResultsetSpliterator.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/TransactionManagerImpl.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/MockBaseTestCase.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/NumberKeyTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java
svn commit: r1917231 - /db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
Author: tv
Date: Sun Apr 21 10:19:05 2024
New Revision: 1917231
URL: http://svn.apache.org/viewvc?rev=1917231=rev
Log:
Update deprecated code
Modified:
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
Modified:
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java?rev=1917231=1917230=1917231=diff
==
---
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
(original)
+++
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
Sun Apr 21 10:19:05 2024
@@ -43,9 +43,9 @@ import org.xmlunit.diff.DefaultNodeMatch
import org.xmlunit.diff.Diff;
import org.xmlunit.diff.ElementSelectors;
-public class TorqueGeneratorTaskTest
+public class TorqueGeneratorTaskTest
{
-
+
@Test
public void testExecute() throws Exception
{
@@ -64,14 +64,14 @@ public class TorqueGeneratorTaskTest
assertTrue(generatedJavaFile.exists());
File expectedJavaFile = new File(
"src/test/resources/org/apache/torque/ant/PropertyKeys.java");
-
+
assertTrue(FileUtils.contentEquals(generatedJavaFile,
expectedJavaFile), "The files differ!");
}
-
+
/**
* compare org.apache.torque.templates.jdbc2schema.Jdbc2SchemaTest.java in
torque-templates
- *
+ *
* @throws Exception
*/
@Test
@@ -79,7 +79,7 @@ public class TorqueGeneratorTaskTest
{
//
try {
-
Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
+
Class.forName("org.apache.derby.jdbc.EmbeddedDriver").getDeclaredConstructor().newInstance();
BasicConfigurator.configure();
Connection connection =
DriverManager.getConnection("jdbc:derby:memory:myDb;create=true");
InputStream inputStream = getClass().getResourceAsStream(
@@ -122,18 +122,18 @@ public class TorqueGeneratorTaskTest
} catch (SQLException | IOException e) {
fail();
}
-
+
File target = new File("target/generated-schema");
FileUtils.deleteDirectory(target);
Torque4JDBCTransformTask task = new Torque4JDBCTransformTask();
task.setDbUrl("jdbc:derby:memory:myDb;create=true");
task.setDbDriver("org.apache.derby.jdbc.EmbeddedDriver");
-
+
task.setPackaging("directory");
-//task.setProjectRootDir(new
File("src/test/torqueJDBC2SchemaTaskTest/src/main/jdbc2schema"));
+//task.setProjectRootDir(new
File("src/test/torqueJDBC2SchemaTaskTest/src/main/jdbc2schema"));
//task.setPackaging("classpath");
//task.setConfigPackage("org.apache.torque.templates.jdbc2schema");
-
+
task.setProjectRootDir(new File("src/test/torqueJDBC2SchemaTaskTest"));
task.setDefaultOutputDir(target);
try {
@@ -152,7 +152,7 @@ public class TorqueGeneratorTaskTest
// "src/test/schema/schema.xml"
"src/test/schema/expected-schema.xml"
);
-
+
Diff myDiffSimilar =
DiffBuilder.compare(expectedSchemaFile).ignoreComments().withTest(generatedSchemaFile)
.withNodeMatcher(new
DefaultNodeMatcher(ElementSelectors.byName))
.checkForSimilar()
-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
svn commit: r1917240 - in /db/torque/trunk/torque-templates/src: main/java/org/apache/torque/templates/ main/java/org/apache/torque/templates/model/ main/java/org/apache/torque/templates/platform/ mai
Author: tv Date: Sun Apr 21 13:22:54 2024 New Revision: 1917240 URL: http://svn.apache.org/viewvc?rev=1917240=rev Log: Eclipse cleanup Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaInheritance.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaJavaType.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/UniqueColumn.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMJoinGetterTransformer.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SqlAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/JavaType.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/ResultSetGetter.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SchemaType.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java db/torque/trunk/torque-templates/src/test/java/a/b/SomeEnum.java db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
svn commit: r1917239 - /db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
Author: tv
Date: Sun Apr 21 13:22:05 2024
New Revision: 1917239
URL: http://svn.apache.org/viewvc?rev=1917239=rev
Log:
Eclipse cleanup
Modified:
db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
Modified:
db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java?rev=1917239=1917238=1917239=diff
==
---
db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
(original)
+++
db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
Sun Apr 21 13:22:05 2024
@@ -95,7 +95,7 @@ public class TorqueGeneratorMojo extends
*
* @param key the key for the enum.
*/
-private OutputDirUsage(final String key)
+OutputDirUsage(final String key)
{
this.key = key;
}
@@ -234,7 +234,7 @@ public class TorqueGeneratorMojo extends
* ${project.build.directory}/src/main/generated-java
*/
@Parameter
-private Map outputDirMap = new HashMap<>();
+private final Map outputDirMap = new HashMap<>();
/**
* The work directory for e.g. merge sources.
@@ -313,7 +313,7 @@ public class TorqueGeneratorMojo extends
* Default is to map the key "modifiable" to compile
*/
@Parameter
-private Map outputDirUsageMap = new HashMap<>();
+private final Map outputDirUsageMap = new HashMap<>();
/**
* The config directory of the project overriding the settings.
@@ -387,8 +387,8 @@ public class TorqueGeneratorMojo extends
*/
@Parameter( defaultValue = "${project}", required = true, readonly = true )
private MavenProject project;
-
-
+
+
/**
* Specifies whether the execution should be skipped.
*/
@@ -401,16 +401,16 @@ public class TorqueGeneratorMojo extends
@Override
public void execute() throws MojoExecutionException
{
-
+
if ( skip)
{
getLog().info( "Skipping Torque execution" );
return;
}
-
+
Controller controller = new Controller();
List unitDescriptors = new ArrayList<>();
-
+
// Do conversion here so illegal values are discovered before
generation
OutputDirUsage defaultOutputDirUsageConverted
= OutputDirUsage.get(defaultOutputDirUsage);
-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
svn commit: r1917244 - in /db/torque/trunk/torque-maven-plugin/src: main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java test/resources/log4j2-test.xml
Author: tv Date: Sun Apr 21 13:54:24 2024 New Revision: 1917244 URL: http://svn.apache.org/viewvc?rev=1917244=rev Log: Handle null-encoding, make tests less chatty Modified: db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml Modified: db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java?rev=1917244=1917243=1917244=diff == --- db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java (original) +++ db/torque/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java Sun Apr 21 13:54:24 2024 @@ -602,7 +602,7 @@ public class TorqueGeneratorMojo extends encoding = project.getProperties().getProperty( "project.build.sourceEncoding"); } -Charset charSet = Charset.forName(encoding); +Charset charSet = (encoding == null) ? Charset.defaultCharset() : Charset.forName(encoding); UnitDescriptor unitDescriptor = new UnitDescriptor( packaging, projectPaths, Modified: db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml?rev=1917244=1917243=1917244=diff == --- db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml (original) +++ db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml Sun Apr 21 13:54:24 2024 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + - To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
svn commit: r1917232 - in /db/torque/trunk/torque-generator/src: main/java/org/apache/torque/generator/configuration/ main/java/org/apache/torque/generator/control/ main/java/org/apache/torque/generat
Author: tv Date: Sun Apr 21 10:21:37 2024 New Revision: 1917232 URL: http://svn.apache.org/viewvc?rev=1917232=rev Log: Update deprecated code, add charset objects where appropriate Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/CombinedFileSourceTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/SourceToXmlTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java?rev=1917232=1917231=1917232=diff == --- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java (original) +++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java Sun Apr 21 10:21:37 2024 @@ -1,7 +1,5 @@ package org.apache.torque.generator.configuration; -import java.lang.reflect.InvocationTargetException; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java?rev=1917232=1917231=1917232=diff == --- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java (original) +++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java Sun Apr 21 10:21:37 2024 @@ -21,6 +21,7 @@ package org.apache.torque.generator.cont import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -43,9 +44,6 @@ public class Checksums /** Array containing the 16 hex characters. */ private static final char[]
svn commit: r1917238 - /db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/Torque4JDBCTransformTask.java
Author: tv
Date: Sun Apr 21 13:21:14 2024
New Revision: 1917238
URL: http://svn.apache.org/viewvc?rev=1917238=rev
Log:
Eclipse cleanup
Modified:
db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/Torque4JDBCTransformTask.java
Modified:
db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/Torque4JDBCTransformTask.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/Torque4JDBCTransformTask.java?rev=1917238=1917237=1917238=diff
==
---
db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/Torque4JDBCTransformTask.java
(original)
+++
db/torque/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/Torque4JDBCTransformTask.java
Sun Apr 21 13:21:14 2024
@@ -2,13 +2,13 @@ package org.apache.torque.ant.task;
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -45,18 +45,18 @@ import org.apache.torque.generator.contr
*/
public class Torque4JDBCTransformTask extends Task
{
-
+
/**
- * The packaging type of the generation unit, either "directory"
+ * The packaging type of the generation unit, either "directory"
* or "classpath". Default is "classpath".
*/
private String packaging = "classpath";
-
+
/**
* The target directory for files which are generated each time anew.
* Default is "target/generated-sources"
*/
-private File defaultOutputDir = new File("target/generated-schema");
+private File defaultOutputDir = new File("target/generated-schema");
/**
* The root directory of the project.
@@ -64,10 +64,10 @@ public class Torque4JDBCTransformTask ex
* Default is ".".
*/
private File projectRootDir = new File(".");
-
+
/** Name of XML database schema produced. */
protected String xmlSchema = "schema.xml";
-
+
/**
* The Loglevel to use in the generation process. Must be one of
* trace, debug, info, warn or error.
@@ -86,12 +86,12 @@ public class Torque4JDBCTransformTask ex
/** JDBC password. */
protected String dbPassword;
-
+
/**
* The configuration package of the generation unit.
*/
private String configPackage;
-
+
/**
* The configuration directory of the generation unit.
* Has no effect if packaging is "classpath".
@@ -156,17 +156,17 @@ public class Torque4JDBCTransformTask ex
// Attemtp to connect to a database.
//Connection con = DriverManager.getConnection(dbUrl, dbUser,
dbPassword);
//log("DB connection established", Project.MSG_INFO);
-
+
Controller controller = new Controller();
List unitDescriptors = new ArrayList<>();
-
+
Map overrideOptions = new HashMap<>();
overrideOptions.put("torque.jdbc2schema.url", dbUrl);
overrideOptions.put("torque.jdbc2schema.driver", dbDriver);
overrideOptions.put("torque.jdbc2schema.user", dbUser);
overrideOptions.put("torque.jdbc2schema.password", dbPassword);
-
+
UnitDescriptor.Packaging packaging;
if ("directory".equals(this.packaging))
{
@@ -183,7 +183,7 @@ public class Torque4JDBCTransformTask ex
+ ", must be jar, directory or classpath");
}
log("Packaging is " + packaging, Project.MSG_DEBUG);
-
+
ProjectPaths defaultProjectPaths;
if (UnitDescriptor.Packaging.DIRECTORY == packaging)
{
@@ -199,11 +199,11 @@ public class Torque4JDBCTransformTask ex
{
throw new IllegalStateException("Unknown packaging" + packaging);
}
-
+
CustomProjectPaths projectPaths
= new CustomProjectPaths(defaultProjectPaths);
-
+
if (UnitDescriptor.Packaging.CLASSPATH == packaging)
{
if (configPackage == null)
@@ -223,7 +223,7 @@ public class Torque4JDBCTransformTask ex
Project.MSG_DEBUG);
}
}
-
+
if (defaultOutputDir != null)
{
projectPaths.setOutputDirectory(null, defaultOutputDir);
@@ -231,15 +231,15 @@ public class Torque4JDBCTransformTask ex
+ defaultOutputDir.getAbsolutePath(),
Project.MSG_DEBUG);
}
-
+
log("ProjectPaths = " + projectPaths);
svn commit: r1917246 - in /db/torque/trunk: torque-ant-tasks/src/test/resources/log4j2-test.xml torque-templates/src/test/resources/log4j2-test.xml torque-test/src/test/resources/log4j2-test.xml
Author: tv Date: Sun Apr 21 14:12:07 2024 New Revision: 1917246 URL: http://svn.apache.org/viewvc?rev=1917246=rev Log: Make test logs less chatty Modified: db/torque/trunk/torque-ant-tasks/src/test/resources/log4j2-test.xml db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml db/torque/trunk/torque-test/src/test/resources/log4j2-test.xml Modified: db/torque/trunk/torque-ant-tasks/src/test/resources/log4j2-test.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/src/test/resources/log4j2-test.xml?rev=1917246=1917245=1917246=diff == --- db/torque/trunk/torque-ant-tasks/src/test/resources/log4j2-test.xml (original) +++ db/torque/trunk/torque-ant-tasks/src/test/resources/log4j2-test.xml Sun Apr 21 14:12:07 2024 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + Modified: db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml?rev=1917246=1917245=1917246=diff == --- db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml (original) +++ db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml Sun Apr 21 14:12:07 2024 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + Modified: db/torque/trunk/torque-test/src/test/resources/log4j2-test.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/test/resources/log4j2-test.xml?rev=1917246=1917245=1917246=diff == --- db/torque/trunk/torque-test/src/test/resources/log4j2-test.xml (original) +++ db/torque/trunk/torque-test/src/test/resources/log4j2-test.xml Sun Apr 21 14:12:07 2024 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + @@ -42,7 +42,7 @@ - + - To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
