Revision: 3395
Author: [email protected]
Date: Wed Mar 24 15:38:38 2010
Log: Rolling back all moving of the .java classes as the last commit lost all revision history for all files.
http://code.google.com/p/power-architect/source/detail?r=3395

Added:
 /trunk/src/ca
 /trunk/src/icons
 /trunk/src/license_in_comment.txt
 /trunk/src/sounds
 /trunk/src/xsltStylesheets
Deleted:
 /trunk/src/main
Modified:
 /trunk/.classpath
 /trunk/build.xml
 /trunk/doc/PowerArchitectUserGuide.xml
Replaced:
 /trunk/src/ca/sqlpower
 /trunk/src/ca/sqlpower/architect
 /trunk/src/icons/.cvsignore
 /trunk/src/icons/Architect16.png
 /trunk/src/icons/DBProto.xcf
 /trunk/src/icons/Database_profiled16.png
 /trunk/src/icons/Information24.gif
 /trunk/src/icons/Power Architect.icns
 /trunk/src/icons/SQLRunner.svg
 /trunk/src/icons/Table_profiled16.png
 /trunk/src/icons/architect-small.ico
 /trunk/src/icons/architect.ico
 /trunk/src/icons/architect.png
 /trunk/src/icons/architect128.png
 /trunk/src/icons/architect_header_architect.png
 /trunk/src/icons/architect_header_bkgd.png
 /trunk/src/icons/architect_header_sqlpower.png
 /trunk/src/icons/architect_header_welcome.png
 /trunk/src/icons/architect_icon_bundle.ico
 /trunk/src/icons/arrow_refresh16.png
 /trunk/src/icons/auto_layout16.png
 /trunk/src/icons/chevrons_down1.png
 /trunk/src/icons/chevrons_up1.png
 /trunk/src/icons/compare_DM16.png
 /trunk/src/icons/database_connect.png
 /trunk/src/icons/database_refresh.png
 /trunk/src/icons/delete16.png
 /trunk/src/icons/disk16.png
 /trunk/src/icons/edit_column16.png
 /trunk/src/icons/edit_index16.png
 /trunk/src/icons/edit_relationship16.png
 /trunk/src/icons/edit_selected16.png
 /trunk/src/icons/edit_table16.png
 /trunk/src/icons/famfamfam
 /trunk/src/icons/famfamfam/error.png
 /trunk/src/icons/famfamfam/folder_error.png
 /trunk/src/icons/famfamfam/folder_wrench.png
 /trunk/src/icons/famfamfam/wrench.png
 /trunk/src/icons/folder16.png
 /trunk/src/icons/fwdSQL16.png
 /trunk/src/icons/help16.png
 /trunk/src/icons/new_column16.png
 /trunk/src/icons/new_id_relationship16.png
 /trunk/src/icons/new_index16.png
 /trunk/src/icons/new_nonid_relationship16.png
 /trunk/src/icons/new_project16.png
 /trunk/src/icons/new_table16.png
 /trunk/src/icons/parts
 /trunk/src/icons/parts/Index_generic_unbadged.png
 /trunk/src/icons/parts/edit_badge.png
 /trunk/src/icons/parts/noAccess.png
 /trunk/src/icons/printer16.png
 /trunk/src/icons/query16.png
 /trunk/src/icons/redo_arrow16.png
 /trunk/src/icons/save_as16.png
 /trunk/src/icons/search_replace16.png
 /trunk/src/icons/stop16.png
 /trunk/src/icons/undo_arrow16.png
 /trunk/src/icons/uninstall.ico
 /trunk/src/icons/world16.png
 /trunk/src/icons/zoom_fit16.png
 /trunk/src/icons/zoom_in16.png
 /trunk/src/icons/zoom_out16.png
 /trunk/src/icons/zoom_reset16.png
 /trunk/src/sounds/boingoingoingoingoing.wav
 /trunk/src/xsltStylesheets/architect2html.xslt

=======================================
--- /dev/null
+++ /trunk/src/license_in_comment.txt   Wed Mar 24 15:38:38 2010
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2008, SQL Power Group Inc.
+ *
+ * This file is part of Power*Architect.
+ *
+ * Power*Architect is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Power*Architect is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
=======================================
--- /trunk/.classpath   Wed Mar 24 14:07:56 2010
+++ /trunk/.classpath   Wed Mar 24 15:38:38 2010
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="regress"/>
        <classpathentry kind="src" path="jdbc_drivers"/>
        <classpathentry kind="src" path="ext-tools-home/resgen/src"/>
        <classpathentry kind="src" path="example_code"/>
        <classpathentry kind="src" path="generated"/>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/sqlpower_library"/>
        <classpathentry kind="lib" path="buildlib/ant.jar"/>
=======================================
--- /trunk/build.xml    Wed Mar 24 14:07:56 2010
+++ /trunk/build.xml    Wed Mar 24 15:38:38 2010
@@ -15,13 +15,7 @@
        <property file="build.properties" />

        <!-- The directory where the Java source files are -->
-       <property name="src" value="src/main/java"/>
-
-       <!-- The directory where resources are located (images, sounds, etc) -->
-       <property name="resources" value="src/main/resources"/>
-
-       <!-- The directory where the Java source files are -->
-       <property name="src.apt" value="${sqlpower.library.home}/src/apt/java"/>
+       <property name="src" value="src"/>

        <!-- The directory with all the JAR files that are required
             by the Architect at runtime -->
@@ -405,7 +399,6 @@
        <!-- Compiles the application source files -->
<target name="compile" depends="init, copyfiles, build.sqlpower.library, copy.sqlpower.library">
                <mkdir dir="${build_tmp}"/>
- <javac srcdir="${src.apt}" destdir="${build}" classpathref="compile.classpath" debug="true"/> <javac srcdir="${src}" destdir="${build}" classpathref="compile.classpath" debug="true"/>
                <apt srcdir="${src}"
             destdir="${build_tmp}"
@@ -420,13 +413,13 @@
             <fileset dir="${build_tmp}"/>
         </move>
         <copy todir="${build}">
-            <fileset dir="${resources}">
+            <fileset dir="${src}">
                 <include name="**/*.png"/>
                 <include name="xsltStylesheets/**"/>
             </fileset>
         </copy>
         <copy todir="${build}/">
-            <fileset dir="${resources}">
+            <fileset dir="src">
                 <include name="**/messages*.properties"/>
             </fileset>
            </copy>
@@ -452,7 +445,7 @@
        <target name="copyfiles" depends="init, architect.version.properties"
description="Copies non-source files that need to be in the architect.jar">
         <copy todir="${build}">
-                       <fileset dir="${resources}/">
+                       <fileset dir="src/">
                                <include name="**"/>
                                <exclude name="**/*.java"/>
                                <exclude name="**/*.html"/>
@@ -525,11 +518,11 @@

        <!-- Build MondrianModel -->
                <target name="mondrianModel">
- <delete file="${src}/ca/sqlpower/architect/olap/MondrianModel.java"></delete> + <delete file="src/ca/sqlpower/architect/olap/MondrianModel.java"></delete>
                        <xslt
-                               
style="${src}/ca/sqlpower/architect/olap/xml-to-java-classes.xsl"
-                               
in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
-                               
out="${src}/ca/sqlpower/architect/olap/MondrianModel.java"
+                               
style="src/ca/sqlpower/architect/olap/xml-to-java-classes.xsl"
+                               in="src/ca/sqlpower/architect/olap/Mondrian.xml"
+                               
out="src/ca/sqlpower/architect/olap/MondrianModel.java"
                                classpathref="docbookclasspath">
                        </xslt>
                </target>
@@ -538,8 +531,8 @@
         <target name="mondrianNewValueMaker">
<delete file="regress/ca/sqlpower/architect/util/MondrianNewValueMaker.java"></delete>
             <xslt
- style="${src}/ca/sqlpower/architect/olap/xml-to-new-value-maker.xsl"
-                in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
+ style="src/ca/sqlpower/architect/olap/xml-to-new-value-maker.xsl"
+                in="src/ca/sqlpower/architect/olap/Mondrian.xml"
out="regress/ca/sqlpower/architect/util/MondrianNewValueMaker.java"
                 classpathref="docbookclasspath">
             </xslt>
@@ -549,8 +542,8 @@
         <target name="mondrianPersistenceTests">
<delete file="regress/ca/sqlpower/architect/olap/MondrianModelTest.java"></delete>
             <xslt
- style="${src}/ca/sqlpower/architect/olap/xml-to-persister-tests.xsl"
-                in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
+ style="src/ca/sqlpower/architect/olap/xml-to-persister-tests.xsl"
+                in="src/ca/sqlpower/architect/olap/Mondrian.xml"
out="regress/ca/sqlpower/architect/olap/MondrianModelTest.java"
                 classpathref="docbookclasspath">
             </xslt>
@@ -558,22 +551,22 @@

        <!-- Build MondrianXMLReader -->
                <target name="mondrianParser">
- <delete file="${src}/ca/sqlpower/architect/olap/MondrianXMLReader.java"></delete> + <delete file="src/ca/sqlpower/architect/olap/MondrianXMLReader.java"></delete>
                        <xslt
-                               
style="${src}/ca/sqlpower/architect/olap/xml-to-parser.xsl"
-                               
in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
-                               
out="${src}/ca/sqlpower/architect/olap/MondrianXMLReader.java"
+                               
style="src/ca/sqlpower/architect/olap/xml-to-parser.xsl"
+                               in="src/ca/sqlpower/architect/olap/Mondrian.xml"
+                               
out="src/ca/sqlpower/architect/olap/MondrianXMLReader.java"
                                classpathref="docbookclasspath">
                        </xslt>
                </target>

        <!-- Build MondrianXMLWriter -->
        <target name="mondrianFormatter">
- <delete file="${src}/ca/sqlpower/architect/olap/MondrianXMLWriter.java"></delete> + <delete file="src/ca/sqlpower/architect/olap/MondrianXMLWriter.java"></delete>
                <xslt
-                       
style="${src}/ca/sqlpower/architect/olap/xml-to-formatter.xsl"
-                       in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
-                       
out="${src}/ca/sqlpower/architect/olap/MondrianXMLWriter.java"
+                       
style="src/ca/sqlpower/architect/olap/xml-to-formatter.xsl"
+                       in="src/ca/sqlpower/architect/olap/Mondrian.xml"
+                       
out="src/ca/sqlpower/architect/olap/MondrianXMLWriter.java"
                        classpathref="docbookclasspath">
                </xslt>
        </target>
@@ -634,9 +627,9 @@
                        </fileset>
                </copy>

-               <mkdir dir="${build}/help/${resources}/icons"/>
-               <copy todir="${build}/help/${resources}/icons" overwrite="true">
-                       <fileset dir="${resources}/icons">
+               <mkdir dir="${build}/help/src/icons"/>
+               <copy todir="${build}/help/src/icons" overwrite="true">
+                       <fileset dir="src/icons">
                                <include name="*.gif"/>
                                <include name="*.png"/>
                        </fileset>
@@ -666,9 +659,9 @@
                                <include name="*.png"/>
                        </fileset>
                </copy>
-               <mkdir dir="${build}/ca/sqlpower/architect/doc/${resources}/icons" 
/>
- <copy todir="${build}/ca/sqlpower/architect/doc/${resources}/icons" overwrite="true">
-                       <fileset dir="${resources}/icons">
+               <mkdir dir="${build}/ca/sqlpower/architect/doc/src/icons" />
+ <copy todir="${build}/ca/sqlpower/architect/doc/src/icons" overwrite="true">
+                       <fileset dir="src/icons">
                                <include name="*.gif"/>
                                <include name="*.png"/>
                        </fileset>
@@ -771,7 +764,7 @@
                                        
supporturl="http://www.sqlpower.ca/forum";
                                        customprocname="false"
                                        stayalive="false"
-                                       icon="${resources}/icons/architect.ico">
+                                       icon="src/icons/architect.ico">
                                <jre minVersion="1.5.0"
                                         maxHeapSize="600"
                                />
@@ -800,7 +793,7 @@

                <copy todir="${staging.dir}/jdbc">
                    <fileset dir="jdbc_drivers" includes="*.jar"/>
-                       <fileset dir="${src}" 
includes="default_database_types.ini"/>
+                       <fileset dir="src" 
includes="default_database_types.ini"/>
            </copy>
        <copy todir="${staging.dir}/doc" file="doc/ReleaseNotes.txt"/>

@@ -948,7 +941,7 @@
                                        <langpack iso3="eng"/>
                                </locale>
                                <resources>
- <res id="Installer.image" src="../src/main/resources/icons/architect.png"/>
+                                       <res id="Installer.image" 
src="../src/icons/architect.png"/>
                                        <res src="ArchitectShortcut.xml" 
id="shortcutSpec.xml"/>
                                        <res id="LicencePanel.licence" 
src="../LICENSE" />
                                        <res src="RegistrySpec.xml" 
id="RegistrySpec.xml"/>
@@ -986,7 +979,7 @@
                                                <fileset dir="../staging/" 
targetdir="$INSTALL_PATH">
                                                        <include 
name="LICENSE"/>
                                                </fileset>
-                                               <fileset dir="../src/main/resources/icons" 
targetdir="$INSTALL_PATH">
+                                               <fileset dir="../src/icons" 
targetdir="$INSTALL_PATH">
                                                        <include name="*.ico"/>
                                                </fileset>
                                        </pack>
@@ -1029,7 +1022,7 @@
                                                <langpack iso3="eng"/>
                                        </locale>
                                        <resources>
- <res id="Installer.image" src="../src/main/resources/icons/architect.png"/>
+                                               <res id="Installer.image" 
src="../src/icons/architect.png"/>
                                                <res src="ArchitectShortcut.xml" 
id="shortcutSpec.xml"/>
                                                <res id="LicencePanel.licence" 
src="../LICENSE" />
                                                <res src="RegistrySpec.xml" 
id="RegistrySpec.xml"/>
@@ -1068,7 +1061,7 @@
                                                        <fileset dir="../staging/" 
targetdir="$INSTALL_PATH">
                                                                <include 
name="LICENSE"/>
                                                        </fileset>
- <fileset dir="../src/main/resources/icons" targetdir="$INSTALL_PATH">
+                                                       <fileset dir="../src/icons" 
targetdir="$INSTALL_PATH">
                                                                <include 
name="*.ico"/>
                                                        </fileset>
                                                        <fileset dir="../staging/" 
targetdir="$INSTALL_PATH/uninstaller">
@@ -1103,7 +1096,7 @@
                                        
supporturl="http://www.sqlpower.ca/forum";
                                        customprocname="false"
                                        stayalive="false"
-                                       icon="${resources}/icons/architect.ico">
+                                       icon="src/icons/architect.ico">
                                <singleInstance
                                        mutexName="SQL Power Architect 
Installer"
                                        windowTitle="SQL Power Architect 
Installer"
@@ -1127,7 +1120,7 @@
                                        
supporturl="http://www.sqlpower.ca/forum";
                                        customprocname="false"
                                        stayalive="false"
-                                       icon="${resources}/icons/architect.ico">
+                                       icon="src/icons/architect.ico">
                                <singleInstance
                                        mutexName="SQL Power Architect 
Installer"
                                        windowTitle="SQL Power Architect 
Installer"
@@ -1157,7 +1150,7 @@
            name="Power Architect"
            version="${app.version}"
            mainclass="ca.sqlpower.architect.swingui.ArchitectFrame"
-           icon="${resources}/icons/Power Architect.icns"
+           icon="src/icons/Power Architect.icns"
            jvmversion="1.5+"
            shortname="Architect"
            stubfile="osx_packaging_utils/PowerArchitectStub"
@@ -1183,7 +1176,7 @@
            name="Power Architect JDBC"
            version="${app.version}.jdbc"
            mainclass="ca.sqlpower.architect.swingui.ArchitectFrame"
-           icon="${resources}/icons/Power Architect.icns"
+           icon="src/icons/Power Architect.icns"
            jvmversion="1.5+"
            shortname="Architect"
            stubfile="osx_packaging_utils/PowerArchitectStub"
@@ -1365,8 +1358,8 @@
                        <tarfileset dir="."
                                prefix="architect-src-only-${app.version}"
                                includes="${src}/**/*.java,
-                                         ${resources}/**/*.png,
-                                         ${resources}/**/*.gif,
+                                         ${src}/**/*.png,
+                                         ${src}/**/*.gif,
                                          regress/**/*.java,
                                          build.xml,
                                          build.properties.example,
@@ -1500,15 +1493,17 @@

<target name="build.sqlpower.library" depends="check.sqlpower.library.dir" if="buildSQLPowerLibrary">
                <echo message="Attempting to build sqlpower-library 
project..."/>
-               <ant inheritall="false" dir="${sqlpower.library.home}" 
target="clean">
+               <ant dir="${sqlpower.library.home}" target="clean">
+                       <property name="build" 
value="${sqlpower.library.home}/build"/>
                </ant>
-               <ant inheritall="false" dir="${sqlpower.library.home}" 
target="jar">
+               <ant dir="${sqlpower.library.home}" target="jar">
+                       <property name="build" 
value="${sqlpower.library.home}/build"/>
+                       <property name="dist.dir" 
value="${sqlpower.library.home}/dist"/>
                </ant>
        </target>

        <target name="copy.sqlpower.library" 
depends="check.sqlpower.library.dir">
<copy file="${sqlpower.library.home}/dist/sqlpower_library.jar" todir="${lib}"/> - <copy file="${sqlpower.library.home}/dist/sqlpower_library-tests.jar" todir="${build.tests}"/>
        </target>

        <target name="architect.version.properties" depends="init">
=======================================
--- /trunk/doc/PowerArchitectUserGuide.xml      Wed Mar 24 14:07:56 2010
+++ /trunk/doc/PowerArchitectUserGuide.xml      Wed Mar 24 15:38:38 2010
@@ -409,77 +409,77 @@

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/Database16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/Database16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Database</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/Catalog16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/Catalog16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Catalogue</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/Schema16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/Schema16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Schema</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/Owner16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/Owner16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Owner</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/Table16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/Table16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Table</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/Column16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/Column16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Column</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/Index_key16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/Index_key16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Primary Key</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/ExportedKey16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/ExportedKey16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Exported Key</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/ImportedKey16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/ImportedKey16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Imported Key</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/Index16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/Index16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Index</para>

         <para><inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/ca/sqlpower/architect/swingui/dbtree/icons/Index_unique16.png" + <imagedata fileref="src/ca/sqlpower/architect/swingui/dbtree/icons/Index_unique16.png"
                          format="PNG" />
             </imageobject>
           </inlinemediaobject> Unique Index</para>
@@ -777,7 +777,7 @@
           <listitem>
             <para>Click <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/new_table16.png" format="PNG" /> + <imagedata fileref="src/icons/new_table16.png" format="PNG" />
                 </imageobject>
</inlinemediaobject> in the side toolbar. The cursor changes to
             a +.</para>
@@ -886,7 +886,7 @@
           <listitem>
<para>Click a table in the playpen, then click <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/edit_column16.png"
+                  <imagedata fileref="src/icons/edit_column16.png"
                              format="PNG" />
                 </imageobject>
               </inlinemediaobject> in the side toolbar.</para>
@@ -969,7 +969,7 @@
           <listitem>
             <para>Click <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/new_column16.png" format="PNG" /> + <imagedata fileref="src/icons/new_column16.png" format="PNG" />
                 </imageobject>
</inlinemediaobject> in the side toolbar. The Column Properties
             dialog box appears.</para>
@@ -1168,7 +1168,7 @@
           <listitem>
             <para>Click a column, then click <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/edit_column16.png"
+                  <imagedata fileref="src/icons/edit_column16.png"
                              format="PNG" />
                 </imageobject>
               </inlinemediaobject> in the side toolbar.</para>
@@ -1410,7 +1410,7 @@
                 <para>To define an identifying relationship, click
                 <inlinemediaobject>
                     <imageobject>
- <imagedata fileref="src/main/resources/icons/new_id_relationship16.png" + <imagedata fileref="src/icons/new_id_relationship16.png"
                                  format="PNG" />
                     </imageobject>
                   </inlinemediaobject> in the side toolbar, or press R. The
@@ -1421,7 +1421,7 @@
                 <para>To define a non-identifying relationship, click
                 <inlinemediaobject>
                     <imageobject>
- <imagedata fileref="src/main/resources/icons/new_nonid_relationship16.png" + <imagedata fileref="src/icons/new_nonid_relationship16.png"
                                  format="PNG" />
                     </imageobject>
</inlinemediaobject> in the side toolbar, or press SHIFT+R.
@@ -1509,7 +1509,7 @@
             <para>Click a relationship link in the playpen, then click
             <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/edit_relationship16.png"
+                  <imagedata fileref="src/icons/edit_relationship16.png"
                              format="PNG" />
                 </imageobject>
               </inlinemediaobject> in the side toolbar. The Relationship
@@ -1829,7 +1829,7 @@
           <listitem>
<para>Select a table in the playpen, then click <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/new_index16.png" format="PNG" /> + <imagedata fileref="src/icons/new_index16.png" format="PNG" />
                 </imageobject>
</inlinemediaobject> in the side toolbar. The Index Properties
             dialog box appears.</para>
@@ -2083,14 +2083,14 @@

         <para>To undo an action, click <inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/icons/undo_arrow16.png" format="PNG" /> + <imagedata fileref="src/icons/undo_arrow16.png" format="PNG" />
             </imageobject>
</inlinemediaobject> in the top toolbar. You can also select Edit »
         Undo or press CTRL+Z.</para>

         <para>To redo an action, click <inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/icons/redo_arrow16.png" format="PNG" /> + <imagedata fileref="src/icons/redo_arrow16.png" format="PNG" />
             </imageobject>
</inlinemediaobject> in the top toolbar. You can also select Edit »
         Redo or press CTRL+Y.</para>
@@ -2129,7 +2129,7 @@
         the playpen, select one or more objects in the playpen, then click
         <inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/icons/delete16.png" format="PNG" />
+              <imagedata fileref="src/icons/delete16.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> in the side toolbar.</para>

@@ -2196,7 +2196,7 @@
         <para>To automatically arrange tables, select several tables in the
         playpen, then click <inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/icons/auto_layout16.png" format="PNG" /> + <imagedata fileref="src/icons/auto_layout16.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> in the top toolbar.</para>

@@ -2229,7 +2229,7 @@
           <listitem>
             <para><inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/zoom_in16.png" format="PNG" /> + <imagedata fileref="src/icons/zoom_in16.png" format="PNG" />
                 </imageobject>
               </inlinemediaobject> Zoom in</para>
           </listitem>
@@ -2237,7 +2237,7 @@
           <listitem>
             <para><inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/zoom_out16.png" format="PNG" /> + <imagedata fileref="src/icons/zoom_out16.png" format="PNG" />
                 </imageobject>
               </inlinemediaobject> Zoom out</para>
           </listitem>
@@ -2245,7 +2245,7 @@
           <listitem>
             <para><inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/zoom_reset16.png" format="PNG" /> + <imagedata fileref="src/icons/zoom_reset16.png" format="PNG" />
                 </imageobject>
</inlinemediaobject> Reset the zoom to the default level</para>
           </listitem>
@@ -2253,7 +2253,7 @@
           <listitem>
             <para><inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/zoom_fit16.png" format="PNG" /> + <imagedata fileref="src/icons/zoom_fit16.png" format="PNG" />
                 </imageobject>
               </inlinemediaobject> Zoom to fit</para>
           </listitem>
@@ -2312,7 +2312,7 @@
         the Playpen Database in the Database Tree and clicking on 'Zoom to
         fit' <inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/icons/zoom_fit16.png" format="PNG" />
+              <imagedata fileref="src/icons/zoom_fit16.png" format="PNG" />
             </imageobject>
           </inlinemediaobject>in the Playpen Zoom tools on the right
         side.</para>
@@ -2425,7 +2425,7 @@
           <listitem>
             <para>Click on <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="../sqlpower_library/src/main/resources/ca/sqlpower/swingui/olap/cubeAdd.png" + <imagedata fileref="../sqlpower_library/src/ca/sqlpower/swingui/olap/cubeAdd.png"
                              format="PNG" width="" />
                 </imageobject>
               </inlinemediaobject> to create a new cube. You can also press
@@ -2546,7 +2546,7 @@
           <listitem>
             <para>Click on<inlinemediaobject>
                 <imageobject>
- <imagedata fileref="../sqlpower_library/src/main/resources/ca/sqlpower/swingui/olap/measureAdd.png" + <imagedata fileref="../sqlpower_library/src/ca/sqlpower/swingui/olap/measureAdd.png"
                              format="PNG" width="" />
                 </imageobject>
               </inlinemediaobject> to add a measure to the cube.</para>
@@ -2631,7 +2631,7 @@
           <listitem>
             <para>Click on<inlinemediaobject>
                 <imageobject>
- <imagedata fileref="../sqlpower_library/src/main/resources/ca/sqlpower/swingui/olap/formulaAdd.png" + <imagedata fileref="../sqlpower_library/src/ca/sqlpower/swingui/olap/formulaAdd.png"
                              format="PNG" width="" />
                 </imageobject>
               </inlinemediaobject> to add a calculated member to the
@@ -2740,7 +2740,7 @@
           <listitem>
             <para>Click on <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="../sqlpower_library/src/main/resources/ca/sqlpower/swingui/olap/dimensionAdd.png" + <imagedata fileref="../sqlpower_library/src/ca/sqlpower/swingui/olap/dimensionAdd.png"
                              format="PNG" width="" />
                 </imageobject>
               </inlinemediaobject> to create a new dimension.</para>
@@ -2819,7 +2819,7 @@
           <listitem>
             <para>Click on <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="../sqlpower_library/src/main/resources/ca/sqlpower/swingui/olap/dimensionUsageAdd.png" + <imagedata fileref="../sqlpower_library/src/ca/sqlpower/swingui/olap/dimensionUsageAdd.png"
                              format="PNG" width="" />
                 </imageobject>
               </inlinemediaobject> to create a new dimension usage</para>
@@ -4468,7 +4468,7 @@
       <listitem>
         <para>Click <inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/icons/fwdSQL16.png" format="PNG" />
+              <imagedata fileref="src/icons/fwdSQL16.png" format="PNG" />
             </imageobject>
</inlinemediaobject> on the top toolbar, or select Tools » Forward
         Engineering. The Forward Engineer SQL Script dialog box
@@ -4594,7 +4594,7 @@
         <listitem>
           <para>Click <inlinemediaobject>
               <imageobject>
- <imagedata fileref="src/main/resources/icons/compare_DM16.png" format="PNG" /> + <imagedata fileref="src/icons/compare_DM16.png" format="PNG" />
               </imageobject>
</inlinemediaobject> on the top toolbar, or select Tools » Compare
           DM. The Compare Data Models dialog box appears.</para>
@@ -4806,7 +4806,7 @@
           <listitem>
             <para>Click <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/Table_profiled16.png"
+                  <imagedata fileref="src/icons/Table_profiled16.png"
                              format="PNG" />
                 </imageobject>
               </inlinemediaobject> in the top toolbar.</para>
@@ -4847,7 +4847,7 @@
         <para>Note: To create a new profile of the same table, select the
         table in the Table Profiles window and click <inlinemediaobject>
             <imageobject>
- <imagedata fileref="src/main/resources/icons/arrow_refresh16.png" format="PNG" /> + <imagedata fileref="src/icons/arrow_refresh16.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> . The previous profile will be retained as
well. (Power*Architect will connect to the source database to create
@@ -4978,7 +4978,7 @@
           <listitem>
             <para>To delete a profile, click <inlinemediaobject>
                 <imageobject>
- <imagedata fileref="src/main/resources/icons/delete16.png" format="PNG" /> + <imagedata fileref="src/icons/delete16.png" format="PNG" />
                 </imageobject>
</inlinemediaobject> beside the profile or press delete.</para>
           </listitem>
=======================================
--- /trunk/src/icons/Architect16.png    Thu Jun 15 13:21:39 2006
+++ /trunk/src/icons/Architect16.png    Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/DBProto.xcf        Mon Feb 16 16:35:57 2004
+++ /trunk/src/icons/DBProto.xcf        Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/Database_profiled16.png    Mon Mar 26 18:58:20 2007
+++ /trunk/src/icons/Database_profiled16.png    Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/Information24.gif  Thu Sep 21 13:49:50 2006
+++ /trunk/src/icons/Information24.gif  Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/Power Architect.icns       Wed May  3 12:38:19 2006
+++ /trunk/src/icons/Power Architect.icns       Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/Table_profiled16.png       Mon Mar 26 18:58:20 2007
+++ /trunk/src/icons/Table_profiled16.png       Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/architect-small.ico        Wed May  3 13:42:44 2006
+++ /trunk/src/icons/architect-small.ico        Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/architect.ico      Wed May  3 13:42:44 2006
+++ /trunk/src/icons/architect.ico      Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/architect.png      Wed May  3 13:42:44 2006
+++ /trunk/src/icons/architect.png      Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/architect128.png   Mon Jan  8 15:23:57 2007
+++ /trunk/src/icons/architect128.png   Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/architect_header_architect.png     Thu Jan 28 07:24:21 2010
+++ /trunk/src/icons/architect_header_architect.png     Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/architect_header_bkgd.png  Thu Apr 23 13:42:29 2009
+++ /trunk/src/icons/architect_header_bkgd.png  Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/architect_header_sqlpower.png      Thu Apr 23 13:42:29 2009
+++ /trunk/src/icons/architect_header_sqlpower.png      Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/architect_header_welcome.png       Thu Apr 23 13:42:29 2009
+++ /trunk/src/icons/architect_header_welcome.png       Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/architect_icon_bundle.ico  Wed Jun 14 09:54:45 2006
+++ /trunk/src/icons/architect_icon_bundle.ico  Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/arrow_refresh16.png        Thu May 17 08:16:17 2007
+++ /trunk/src/icons/arrow_refresh16.png        Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/auto_layout16.png  Mon May 28 14:04:12 2007
+++ /trunk/src/icons/auto_layout16.png  Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/chevrons_down1.png Thu Mar 20 09:14:50 2008
+++ /trunk/src/icons/chevrons_down1.png Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/chevrons_up1.png   Thu Mar 20 09:14:50 2008
+++ /trunk/src/icons/chevrons_up1.png   Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/compare_DM16.png   Mon May 28 14:04:12 2007
+++ /trunk/src/icons/compare_DM16.png   Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/database_refresh.png       Mon Feb 23 13:43:12 2009
+++ /trunk/src/icons/database_refresh.png       Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/delete16.png       Wed May 21 14:44:25 2008
+++ /trunk/src/icons/delete16.png       Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/edit_column16.png  Mon May 28 14:04:12 2007
+++ /trunk/src/icons/edit_column16.png  Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/edit_index16.png   Thu Mar 20 12:51:30 2008
+++ /trunk/src/icons/edit_index16.png   Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/edit_relationship16.png    Mon May 28 14:04:12 2007
+++ /trunk/src/icons/edit_relationship16.png    Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/edit_selected16.png        Mon May 26 08:50:22 2008
+++ /trunk/src/icons/edit_selected16.png        Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/edit_table16.png   Mon May 26 08:50:22 2008
+++ /trunk/src/icons/edit_table16.png   Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/famfamfam/error.png        Fri May 11 11:54:21 2007
+++ /trunk/src/icons/famfamfam/error.png        Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/famfamfam/folder_error.png Fri May 11 11:54:21 2007
+++ /trunk/src/icons/famfamfam/folder_error.png Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
--- /trunk/src/icons/fwdSQL16.png       Mon May 28 14:04:12 2007
+++ /trunk/src/icons/fwdSQL16.png       Wed Mar 24 15:38:38 2010
Binary file, no diff available.
=======================================
***Additional files exist in this changeset.***

To unsubscribe from this group, send email to 
architect-commits+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Reply via email to