Author: tfischer
Date: Sun May 16 16:41:19 2010
New Revision: 944882
URL: http://svn.apache.org/viewvc?rev=944882&view=rev
Log:
Adjusted to refactoring in the generator (Step 1).
Added:
db/torque/torque4/trunk/torque-test/src/main/torque-gen/
- copied from r919577,
db/torque/torque4/trunk/torque-test/src/main/torque-gf/
db/torque/torque4/trunk/torque-test/src/main/torque-gen/outlets/
- copied from r919577,
db/torque/torque4/trunk/torque-test/src/main/torque-gf/generatorDefs/
Removed:
db/torque/torque4/trunk/torque-test/src/main/torque-gen/generatorDefs/
db/torque/torque4/trunk/torque-test/src/main/torque-gf/
Modified:
db/torque/torque4/trunk/torque-test/pom.xml
db/torque/torque4/trunk/torque-test/src/main/torque-gen/conf/control.xml
db/torque/torque4/trunk/torque-test/src/main/torque-gen/outlets/peer.xml
Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=944882&r1=944881&r2=944882&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Sun May 16 16:41:19 2010
@@ -150,7 +150,7 @@
<packaging>classpath</packaging>
<configPackage>org.apache.torque.templates.om</configPackage>
<sourceDir>target/torque/test/schema</sourceDir>
- <overrideConfigDir>src/main/torque-gf</overrideConfigDir>
+ <overrideConfigDir>src/main/torque-gen</overrideConfigDir>
<sourceExcludes>
<sourceExclude>ext*-schema.xml</sourceExclude>
<sourceExclude>id-table-schema.xml</sourceExclude>
Modified:
db/torque/torque4/trunk/torque-test/src/main/torque-gen/conf/control.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/torque-gen/conf/control.xml?rev=944882&r1=919577&r2=944882&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/torque-gen/conf/control.xml
(original)
+++ db/torque/torque4/trunk/torque-test/src/main/torque-gen/conf/control.xml
Sun May 16 16:41:19 2010
@@ -19,8 +19,8 @@
-->
<control loglevel="info"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration
http://db.apache.org/torque/gf/4.0/configuration.xsd";
- xmlns="http://db.apache.org/torque/gf/4.0/configuration";>
+
xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration
http://db.apache.org/torque/4.0/generator/configuration.xsd";
+ xmlns="http://db.apache.org/torque/4.0/generator/configuration";>
<!-- no additional output, so this is empty -->
</control>
\ No newline at end of file
Modified:
db/torque/torque4/trunk/torque-test/src/main/torque-gen/outlets/peer.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/torque-gen/outlets/peer.xml?rev=944882&r1=919577&r2=944882&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/torque-gen/outlets/peer.xml
(original)
+++ db/torque/torque4/trunk/torque-test/src/main/torque-gen/outlets/peer.xml
Sun May 16 16:41:19 2010
@@ -17,17 +17,17 @@
specific language governing permissions and limitations
under the License.
-->
-<generators xmlns="http://db.apache.org/torque/gf/4.0/configuration";
- xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration
http://db.apache.org/torque/gf/4.0/generator.xsd";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<outlets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration
http://db.apache.org/torque/4.0/generator/configuration.xsd";
+ xmlns="http://db.apache.org/torque/4.0/generator/configuration";>
- <generator name="torque.om.peer.base.classAnnotations"
- xsi:type="velocityGenerator"
+ <outlet name="torque.om.peer.base.classAnnotations"
+ xsi:type="velocityOutlet"
path="peer/base/classAnnotations.vm">
- </generator>
+ </outlet>
<mergepoint name="torque.om.basePeer.classJavadoc">
- <action xsi:type="applyAction"
generator="torque.om.peer.base.classJavadoc"/>
- <action xsi:type="applyAction"
generator="torque.om.peer.base.classAnnotations"/>
+ <action xsi:type="applyAction" outlet="torque.om.peer.base.classJavadoc"/>
+ <action xsi:type="applyAction"
outlet="torque.om.peer.base.classAnnotations"/>
</mergepoint>
-</generators>
\ No newline at end of file
+</outlets>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
