Author: mprudhom Date: Sat Sep 16 10:22:29 2006 New Revision: 446900 URL: http://svn.apache.org/viewvc?view=rev&rev=446900 Log: Fixed class names of references to tools
Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/jpa_tutorials.xml incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_integration.xml incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_pc.xml incubator/openjpa/trunk/openjpa-project/src/doc/manual/samples_guide.xml Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/jpa_tutorials.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/jpa_tutorials.xml?view=diff&rev=446900&r1=446899&r2=446900 ============================================================================== --- incubator/openjpa/trunk/openjpa-project/src/doc/manual/jpa_tutorials.xml (original) +++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/jpa_tutorials.xml Sat Sep 16 10:22:29 2006 @@ -168,10 +168,11 @@ <para> <indexterm> <primary> - openjpac + org.apache.openjpa.enhance.PCEnhancer </primary> </indexterm> -<command>openjpac</command>: Runs the OpenJPA enhancer against the specified +<command>org.apache.openjpa.enhance.PCEnhancer</command>: +Runs the OpenJPA enhancer against the specified classes. More information is available in <xref linkend="ref_guide_pc_enhance"/> of the Reference Guide. </para> @@ -180,10 +181,11 @@ <para> <indexterm> <primary> - mappingtool + org.apache.openjpa.jdbc.meta.MappingTool </primary> </indexterm> -<command>mappingtool</command>: A utility that can be used to create and +<command>org.apache.openjpa.jdbc.meta.MappingTool</command>: +A utility that can be used to create and maintain the object-relational mappings and schema of all persistent classes in a JDBC-compliant datastore. This functionality allows the underlying mappings and schema to be easily kept up-to-date with the Java classes in the system. See @@ -369,7 +371,7 @@ Enhance the persistent classes. </para> <programlisting> -openjpac -p persistence.xml Animal.java Dog.java +java org.apache.openjpa.enhance.PCEnhancer -p persistence.xml Animal.java Dog.java </programlisting> <para> This step runs the OpenJPA enhancer on the <filename>Animal.java</filename> and @@ -413,13 +415,13 @@ <para> <indexterm> <primary> - mappingtool + org.apache.openjpa.jdbc.meta.MappingTool </primary> </indexterm> Create the object-relational mappings and database schema. </para> <programlisting> -mappingtool -p persistence.xml Animal.java Dog.java +java org.apache.openjpa.jdbc.meta.MappingTool -p persistence.xml Animal.java Dog.java </programlisting> <para> This command propagates the necessary schema for the specified classes to the @@ -443,7 +445,7 @@ classes with OpenJPA's schema tool: </para> <programlisting> -schematool -p persistence.xml -a reflect -f tmp.schema +java org.apache.openjpa.jdbc.schema.SchemaTool -p persistence.xml -a reflect -f tmp.schema </programlisting> <para> This will create a <filename>tmp.schema</filename> file with an XML @@ -801,7 +803,7 @@ Enhance the <classname>Rabbit</classname> class. </para> <programlisting> -openjpac -p persistence.xml Rabbit.java +java org.apache.openjpa.enhance.PCEnhancer -p persistence.xml Rabbit.java </programlisting> </listitem> <listitem> @@ -809,7 +811,7 @@ Refresh the object-relational mappings and database schema. </para> <programlisting> -mappingtool -p persistence.xml Rabbit.java +java org.apache.openjpa.jdbc.meta.MappingTool -p persistence.xml Rabbit.java </programlisting> </listitem> </orderedlist> @@ -889,7 +891,7 @@ Enhance the class. </para> <programlisting> -openjpac -p persistence.xml Snake.java +java org.apache.openjpa.enhance.PCEnhancer -p persistence.xml Snake.java </programlisting> </listitem> <listitem> @@ -901,7 +903,7 @@ change the schema to match. So run the mapping tool: </para> <programlisting> -mappingtool -p persistence.xml Snake.java +java org.apache.openjpa.jdbc.meta.MappingTool -p persistence.xml Snake.java </programlisting> </listitem> <listitem> @@ -1101,7 +1103,7 @@ </para> <programlisting> javac Snake.java Rabbit.java -openjpac -p persistence.xml Snake.java Rabbit.java +java org.apache.openjpa.enhance.PCEnhancer -p persistence.xml Snake.java Rabbit.java </programlisting> </listitem> <listitem> @@ -1109,7 +1111,7 @@ Refresh the mappings and database. </para> <programlisting> -mappingtool -p persistence.xml Snake.java Rabbit.java +java org.apache.openjpa.jdbc.meta.MappingTool -p persistence.xml Snake.java Rabbit.java </programlisting> </listitem> </orderedlist> @@ -1302,7 +1304,7 @@ Enhance the Car class. </para> <programlisting> -openjpac -p persistence.xml Car.java +java org.apache.openjpa.enhance.PCEnhancer -p persistence.xml Car.java </programlisting> <para> Run the mapping tool; make sure that your <filename> META-INF/persistence.xml @@ -1315,7 +1317,7 @@ <config-property name="MetaDataFactory">Types=samples.persistence.j2ee.Car</config-property/> </programlisting> <programlisting> -mappingtool -p persistence.xml Car.java +java org.apache.openjpa.jdbc.meta.MappingTool -p persistence.xml Car.java </programlisting> <para> Build an J2EE application archive by running Ant against the <filename> Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml?view=diff&rev=446900&r1=446899&r2=446900 ============================================================================== --- incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml (original) +++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_conf.xml Sat Sep 16 10:22:29 2006 @@ -235,7 +235,7 @@ Code Formatting with the Reverse Mapping Tool </title> <programlisting> -reversemappingtool -cf.spaceBeforeParen true -cf.tabSpaces 4 +java org.apache.openjpa.jdbc.meta.ReverseMappingTool -cf.spaceBeforeParen true -cf.tabSpaces 4 </programlisting> </example> </section> Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml?view=diff&rev=446900&r1=446899&r2=446900 ============================================================================== --- incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml (original) +++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml Sat Sep 16 10:22:29 2006 @@ -4420,7 +4420,7 @@ document, but don't drop any data: </para> <programlisting> -schematool targetSchema.xml +java org.apache.openjpa.jdbc.schema.SchemaTool targetSchema.xml </programlisting> </example> <example id="ref_guide_schema_schematool_script"> @@ -4432,13 +4432,13 @@ database. Instead, write any planned changes to a SQL script: </para> <programlisting> -schematool -f script.sql targetSchema.xml +java org.apache.openjpa.jdbc.schema.SchemaTool -f script.sql targetSchema.xml </programlisting> <para> Write a SQL script that will re-create the current database: </para> <programlisting> -schematool -a createDB -f script.sql +java org.apache.openjpa.jdbc.schema.SchemaTool -a createDB -f script.sql </programlisting> </example> <example id="ref_guide_schema_schematool_drop"> @@ -4449,7 +4449,7 @@ Drop the current database: </para> <programlisting> -schematool -a dropDB +java org.apache.openjpa.jdbc.schema.SchemaTool -a dropDB </programlisting> </example> <example id="ref_guide_schema_schematool_reflect"> @@ -4472,7 +4472,7 @@ </filename>. </para> <programlisting> -schematool -a reflect -f schema.xml +java org.apache.openjpa.jdbc.schema.SchemaTool -a reflect -f schema.xml </programlisting> </example> </section> Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_integration.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_integration.xml?view=diff&rev=446900&r1=446899&r2=446900 ============================================================================== --- incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_integration.xml (original) +++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_integration.xml Sat Sep 16 10:22:29 2006 @@ -330,7 +330,7 @@ definitions, without needing to remember to invoke the mapping tool manually. The task's parameters correspond exactly to the long versions of the command-line arguments to the <link linkend="ref_guide_mapping_mappingtool"> -<literal> mappingtool</literal></link>. +<literal>mappingtool</literal></link>. </para> <para> The mapping tool task accepts a nested <literal>fileset</literal> tag to specify Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml?view=diff&rev=446900&r1=446899&r2=446900 ============================================================================== --- incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml (original) +++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml Sat Sep 16 10:22:29 2006 @@ -62,7 +62,7 @@ Using the Mapping Tool </title> <programlisting> -mappingtool Magazine.java +java org.apache.openjpa.jdbc.meta.MappingTool Magazine.java </programlisting> </example> <para> @@ -260,7 +260,7 @@ Creating the Relational Schema from Mappings </title> <programlisting> -mappingtool Magazine.java +java org.apache.openjpa.jdbc.meta.MappingTool Magazine.java </programlisting> </example> <para> @@ -272,7 +272,7 @@ Dropping Mappings and Association Schema </title> <programlisting> -mappingtool -sa drop Magazine.java +java org.apache.openjpa.jdbc.meta.MappingTool -sa drop Magazine.java </programlisting> </example> </section> @@ -309,7 +309,7 @@ writes the SQL to create that schema to <filename>create.sql</filename>. </para> <programlisting> -mappingtool -a buildSchema -sa build -sql create.sql Magazine.java +java org.apache.openjpa.jdbc.meta.MappingTool -a buildSchema -sa build -sql create.sql Magazine.java </programlisting> </example> <example id="ref_guid_mapping_ddl_part_ddl"> @@ -323,7 +323,7 @@ <filename>update.sql</filename>. </para> <programlisting> -mappingtool -a buildSchema -sql update.sql Magazine.java +java org.apache.openjpa.jdbc.meta.MappingTool -a buildSchema -sql update.sql Magazine.java </programlisting> </example> </section> @@ -381,7 +381,7 @@ The setting above corresponds to running the following command: </para> <programlisting> -mappingtool -a buildSchema -fk true +java org.apache.openjpa.jdbc.meta.MappingTool -a buildSchema -fk true </programlisting> </example> </section> @@ -446,7 +446,7 @@ Reflection with the Schema Tool </title> <programlisting> -schematool -a reflect -f schema.xml +java org.apache.openjpa.jdbc.schema.SchemaTool -a reflect -f schema.xml </programlisting> </example> </listitem> @@ -480,7 +480,7 @@ Using the Reverse Mapping Tool </title> <programlisting> -reversemappingtool -pkg com.xyz -d ~/src -cp customizer.properties schema.xml +java org.apache.openjpa.jdbc.meta.ReverseMappingTool -pkg com.xyz -d ~/src -cp customizer.properties schema.xml </programlisting> </example> <para> @@ -824,7 +824,7 @@ Customizing Reverse Mapping with Properties </title> <programlisting> -reversemappingtool -pkg com.xyz -cp custom.properties schema.xml +java org.apache.openjpa.jdbc.meta.ReverseMappingTool -pkg com.xyz -cp custom.properties schema.xml </programlisting> <para> Example <filename>custom.properties</filename>: @@ -894,7 +894,7 @@ Validating Mappings </title> <programlisting> -mappingtool -a validate Magazine.java +java org.apache.openjpa.jdbc.meta.MappingTool -a validate Magazine.java </programlisting> </example> <para> @@ -916,7 +916,7 @@ Creating the Relational Schema from Mappings </title> <programlisting> -mappingtool Magazine.java +java org.apache.openjpa.jdbc.meta.MappingTool Magazine.java </programlisting> </example> </section> Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_pc.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_pc.xml?view=diff&rev=446900&r1=446899&r2=446900 ============================================================================== --- incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_pc.xml (original) +++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_pc.xml Sat Sep 16 10:22:29 2006 @@ -138,9 +138,9 @@ </secondary> </indexterm> <para> -The enhancer can be invoked at build time via the included <literal>openjpac -</literal> script or via its Java class, <classname> -org.apache.openjpa.enhance.PCEnhancer</classname>. +The enhancer can be invoked at build time +via the Java tool, +<classname>org.apache.openjpa.enhance.PCEnhancer</classname>. </para> <note> <para> @@ -153,7 +153,7 @@ Using the OpenJPA Enhancer </title> <programlisting> -openjpac Magazine.java +java org.apache.openjpa.enhance.PCEnhancer Magazine.java </programlisting> </example> <para> @@ -513,8 +513,7 @@ class code, you can set the <literal>@IdClass</literal> annotation. </para> <para> -The application identity tool can be invoked via the included <literal> -appidtool</literal> shell/bat script or via its Java class, +The application identity tool can be invoked via the Java class, <ulink url="../apidocs/org/apache/openjpa/enhance/ApplicationIdTool"> <classname>org.apache.openjpa.enhance.ApplicationIdTool</classname></ulink>. </para> @@ -529,7 +528,7 @@ Using the Application Identity Tool </title> <programlisting> -appidtool -s Id Magazine.java +java org.apache.openjpa.enhance.ApplicationIdTool -s Id Magazine.java </programlisting> </example> <para> Modified: incubator/openjpa/trunk/openjpa-project/src/doc/manual/samples_guide.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/samples_guide.xml?view=diff&rev=446900&r1=446899&r2=446900 ============================================================================== --- incubator/openjpa/trunk/openjpa-project/src/doc/manual/samples_guide.xml (original) +++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/samples_guide.xml Sat Sep 16 10:22:29 2006 @@ -86,31 +86,23 @@ enhancer: </para> <para> -<userinput>openjpac -p persistence.xml Machine.java Crane.java Bulldozer.java -Operator.java</userinput> - </para> - <para> -or - </para> - <para> -<userinput>jdoc -p jdo.properties Machine.java Crane.java Bulldozer.java +<userinput>java org.apache.openjpa.enhance.PCEnhancer -p persistence.xml Machine.java Crane.java Bulldozer.java Operator.java</userinput> </para> </listitem> <listitem> <para> -Similarly, you should pass in the same argument to <literal>mappingtool -</literal>: +Similarly, you should pass in the same argument to <literal>org.apache.openjpa.jdbc.meta.MappingTool</literal>: </para> <para> -<userinput>mappingtool -p persistence.xml -a buildSchema Machine.java +<userinput>java org.apache.openjpa.jdbc.meta.MappingTool -p persistence.xml -a buildSchema Machine.java Crane.java Bulldozer.java Operator.java</userinput> </para> <para> or </para> <para> -<userinput>mappingtool -p jdo.properties -a buildSchema Machine.java Crane.java +<userinput>java org.apache.openjpa.jdbc.meta.MappingTool -p jdo.properties -a buildSchema Machine.java Crane.java Bulldozer.java Operator.java</userinput> </para> </listitem>