Author: tfischer
Date: Sun Sep 7 06:16:20 2008
New Revision: 692843
URL: http://svn.apache.org/viewvc?rev=692843&view=rev
Log:
changing to default maven 2 project structure
Added:
db/torque/torque4/trunk/torque-runtime/src/main/java/ (props changed)
- copied from r692830, db/torque/torque4/trunk/torque-runtime/src/java/
db/torque/torque4/trunk/torque-runtime/src/test/java/org/ (props changed)
- copied from r692830,
db/torque/torque4/trunk/torque-runtime/src/test/org/
db/torque/torque4/trunk/torque-runtime/src/test/resources/TestComponentConfig.xml
(contents, props changed)
- copied, changed from r692830,
db/torque/torque4/trunk/torque-runtime/src/test/TestComponentConfig.xml
db/torque/torque4/trunk/torque-runtime/src/test/resources/TestRoleConfig.xml
(props changed)
- copied unchanged from r692830,
db/torque/torque4/trunk/torque-runtime/src/test/TestRoleConfig.xml
db/torque/torque4/trunk/torque-runtime/src/test/resources/Torque.properties
(contents, props changed)
- copied, changed from r692830,
db/torque/torque4/trunk/torque-runtime/src/test/TurbineResources.properties
Removed:
db/torque/torque4/trunk/torque-runtime/src/java/
db/torque/torque4/trunk/torque-runtime/src/test/TestComponentConfig.xml
db/torque/torque4/trunk/torque-runtime/src/test/TestRoleConfig.xml
db/torque/torque4/trunk/torque-runtime/src/test/TurbineResources.properties
db/torque/torque4/trunk/torque-runtime/src/test/org/
Modified:
db/torque/torque4/trunk/torque-runtime/pom.xml
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java
Modified: db/torque/torque4/trunk/torque-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=692843&r1=692842&r2=692843&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/pom.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/pom.xml Sun Sep 7 06:16:20 2008
@@ -185,9 +185,6 @@
</dependencies>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Propchange: db/torque/torque4/trunk/torque-runtime/src/main/java/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: db/torque/torque4/trunk/torque-runtime/src/test/java/org/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java?rev=692843&r1=692830&r2=692843&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java
Sun Sep 7 06:16:20 2008
@@ -33,7 +33,7 @@
{
/** The path to the configuration file. */
protected static final String CONFIG_FILE
- = "src/test/TurbineResources.properties";
+ = "src/test/resources/Torque.properties";
/** Whether torque has been initialized. */
private static boolean hasInitialized = false;
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java?rev=692843&r1=692830&r2=692843&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java
Sun Sep 7 06:16:20 2008
@@ -43,6 +43,8 @@
public void setUp() throws Exception
{
+ setConfigurationFileName("src/test/resources/TestComponentConfig.xml");
+ setRoleFileName("src/test/resources/TestRoleConfig.xml");
super.setUp();
try
{
Copied:
db/torque/torque4/trunk/torque-runtime/src/test/resources/TestComponentConfig.xml
(from r692830,
db/torque/torque4/trunk/torque-runtime/src/test/TestComponentConfig.xml)
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/resources/TestComponentConfig.xml?p2=db/torque/torque4/trunk/torque-runtime/src/test/resources/TestComponentConfig.xml&p1=db/torque/torque4/trunk/torque-runtime/src/test/TestComponentConfig.xml&r1=692830&r2=692843&rev=692843&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/TestComponentConfig.xml
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/resources/TestComponentConfig.xml
Sun Sep 7 06:16:20 2008
@@ -18,6 +18,6 @@
-->
<componentConfig>
<TorqueComponent>
- <configfile>/src/test/TurbineResources.properties</configfile>
+ <configfile>/src/test/resources/Torque.properties</configfile>
</TorqueComponent>
</componentConfig>
Propchange:
db/torque/torque4/trunk/torque-runtime/src/test/resources/TestComponentConfig.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
db/torque/torque4/trunk/torque-runtime/src/test/resources/TestRoleConfig.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
db/torque/torque4/trunk/torque-runtime/src/test/resources/Torque.properties
(from r692830,
db/torque/torque4/trunk/torque-runtime/src/test/TurbineResources.properties)
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/resources/Torque.properties?p2=db/torque/torque4/trunk/torque-runtime/src/test/resources/Torque.properties&p1=db/torque/torque4/trunk/torque-runtime/src/test/TurbineResources.properties&r1=692830&r2=692843&rev=692843&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/test/TurbineResources.properties
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/test/resources/Torque.properties
Sun Sep 7 06:16:20 2008
@@ -16,53 +16,6 @@
# under the License.
-# -------------------------------------------------------------------
-#
-# L O G G I N G
-#
-# -------------------------------------------------------------------
-# We use Log4J for all Turbine logging and we embed the log4j
-# properties within our application configuration.
-#
-# NOTE:
-# The presence of ${webapp} in the logging configuration
-# is not a mistake. Internally the value of ${webapp}
-# is set so that you can use it with standard log4j
-# properties to get logs to appear in your
-# webapp space.
-# -------------------------------------------------------------------
-
-# This first category is required and the category
-# must be named 'default'. This is used for all logging
-# where an explicit category is not specified.
-
-log4j.category.default = ALL, default
-log4j.appender.default = org.apache.log4j.FileAppender
-log4j.appender.default.file = ./turbine.log
-log4j.appender.default.layout = org.apache.log4j.PatternLayout
-log4j.appender.default.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.default.append = false
-
-# This category is used in the BasePeer class. All
-# SQL generated will be logged if the category
-# priority is set to DEBUG
-
-log4j.category.sql = DEBUG, sql
-log4j.appender.sql = org.apache.log4j.FileAppender
-log4j.appender.sql.file = ./sql.log
-log4j.appender.sql.layout = org.apache.log4j.PatternLayout
-log4j.appender.sql.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.sql.append = false
-
-log4j.category.org.apache.torque = ALL, default
-
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E
-#
-# -------------------------------------------------------------------
-
torque.database.default = turbine
torque.database.turbine.adapter=mymysql
torque.database.turbine.adapter.mymysql.className=org.apache.torque.adapter.DBMM
Propchange:
db/torque/torque4/trunk/torque-runtime/src/test/resources/Torque.properties
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.7
Propchange:
db/torque/torque4/trunk/torque-runtime/src/test/resources/Torque.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
db/torque/torque4/trunk/torque-runtime/src/test/resources/Torque.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
db/torque/torque4/trunk/torque-runtime/src/test/resources/Torque.properties
------------------------------------------------------------------------------
svn:mergeinfo =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
