Changeset 1365

Show
Ignore:
Timestamp:
07/18/08 10:11:12 (4 years ago)
Author:
eitan
Message:

replacing @Persist annotation with javax.persistence.@Entity; adding support for javax.persistence.@Table(name)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • jmatter-complet/branches/TRY-JPA/AppBrowser/AppBrowser.iml

    r980 r1365  
    2626    <orderEntry type="library" name="JUnit" level="project" /> 
    2727    <orderEntry type="module" module-name="ds-swing" /> 
     28    <orderEntry type="module-library"> 
     29      <library> 
     30        <CLASSES> 
     31          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/jfreereport-0.8.7.jar!/" /> 
     32          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/statemap.jar!/" /> 
     33          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/commons-pool-1.2.jar!/" /> 
     34          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/xpp3.jar!/" /> 
     35          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/iText.jar!/" /> 
     36          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/hibernate3.jar!/" /> 
     37          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/jibx-run.jar!/" /> 
     38          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/jibx-extras.jar!/" /> 
     39          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/commons-lang-2.3.jar!/" /> 
     40          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/json.jar!/" /> 
     41          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/jdbc/mysql-connector-java-5.0.8-bin.jar!/" /> 
     42          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/jdbc/hsqldb.jar!/" /> 
     43          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/jdbc/postgresql-8.3-603.jdbc3.jar!/" /> 
     44          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/jdbc/h2.jar!/" /> 
     45          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/groovy-all-1.5.6.jar!/" /> 
     46          <root url="jar://$MODULE_DIR$/../jmatter/lib/runtime/ejb3-persistence.jar!/" /> 
     47        </CLASSES> 
     48        <JAVADOC /> 
     49        <SOURCES /> 
     50      </library> 
     51    </orderEntry> 
    2852    <orderEntryProperties /> 
    2953  </component> 
  • jmatter-complet/branches/TRY-JPA/AppBrowser/src/com/u2d/appbrowser/AppBookmark.java

    r998 r1365  
    66import com.u2d.type.atom.URI; 
    77import com.u2d.type.atom.TextEO; 
    8 import com.u2d.persist.Persist; 
    98import com.u2d.reflection.Cmd; 
    109import com.u2d.element.CommandInfo; 
    1110import com.u2d.view.swing.AppLoader; 
     11import javax.persistence.Entity; 
    1212import java.net.URL; 
    1313import java.io.IOException; 
    1414 
    15 @Persist 
     15@Entity 
    1616public class AppBookmark 
    1717      extends AbstractComplexEObject 
  • jmatter-complet/branches/TRY-JPA/JMatter.ipr

    r1352 r1365  
    732732    <library name="Groovy"> 
    733733      <CLASSES> 
    734         <root url="jar://$PROJECT_DIR$/jmatter/lib/runtime/groovy-all-1.5.4.jar!/" /> 
     734        <root url="jar://$PROJECT_DIR$/jmatter/lib/runtime/groovy-all-1.5.6.jar!/" /> 
    735735      </CLASSES> 
    736736      <JAVADOC /> 
  • jmatter-complet/branches/TRY-JPA/JMatter.iws

    r1352 r1365  
    1717  <component name="ChangeListManager"> 
    1818    <list default="true" name="Default" comment=""> 
    19       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/resources/hibernate.properties" afterPath="$PROJECT_DIR$/demo-apps/Sympster/resources/hibernate.properties" /> 
     19      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Speaker.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Speaker.java" /> 
     20      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/lib/tools/jmatter-tools.jar" afterPath="$PROJECT_DIR$/jmatter/lib/tools/jmatter-tools.jar" /> 
     21      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/IssueMgr/IssueMgr.iml" afterPath="$PROJECT_DIR$/demo-apps/IssueMgr/IssueMgr.iml" /> 
     22      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/Sympster.iml" afterPath="$PROJECT_DIR$/demo-apps/Sympster/Sympster.iml" /> 
     23      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/AtomicMedley.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/AtomicMedley.java" /> 
     24      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/lib/runtime/ejb3-persistence.jar" /> 
     25      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Genre.java" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Genre.java" /> 
     26      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Self/src/com/u2d/self/Ball.java" afterPath="$PROJECT_DIR$/demo-apps/Self/src/com/u2d/self/Ball.java" /> 
     27      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/PKGen.java" /> 
     28      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/PKField.java" /> 
     29      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/BOF.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/BOF.java" /> 
     30      <change type="DELETED" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/Persist.java" afterPath="" /> 
     31      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Self/Self.iml" afterPath="$PROJECT_DIR$/demo-apps/Self/Self.iml" /> 
     32      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Campus.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Campus.java" /> 
     33      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/IssueMgr/src/com/u2d/issuemgr/IssueCategory.java" afterPath="$PROJECT_DIR$/demo-apps/IssueMgr/src/com/u2d/issuemgr/IssueCategory.java" /> 
     34      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/ContactMgr/src/com/u2d/contactmgr/PersonContact.java" afterPath="$PROJECT_DIR$/demo-apps/ContactMgr/src/com/u2d/contactmgr/PersonContact.java" /> 
     35      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Resource.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Resource.java" /> 
     36      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Meeting.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Meeting.java" /> 
    2037      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/HBMMaker.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/HBMMaker.java" /> 
     38      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/City.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/City.java" /> 
     39      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java" /> 
     40      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Room.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Room.java" /> 
     41      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JMatter.ipr" afterPath="$PROJECT_DIR$/JMatter.ipr" /> 
     42      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractComplexEObject.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractComplexEObject.java" /> 
    2143      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JMatter.iws" afterPath="$PROJECT_DIR$/JMatter.iws" /> 
    22       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JMatter.ipr" afterPath="$PROJECT_DIR$/JMatter.ipr" /> 
     44      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Painting.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Painting.java" /> 
     45      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/IssueMgr/src/com/u2d/issuemgr/Issue.java" afterPath="$PROJECT_DIR$/demo-apps/IssueMgr/src/com/u2d/issuemgr/Issue.java" /> 
     46      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/interaction/Instruction.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/interaction/Instruction.java" /> 
     47      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Album.java" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Album.java" /> 
     48      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Hotel.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Hotel.java" /> 
     49      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/ConferenceCenter.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/ConferenceCenter.java" /> 
     50      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/OrderItem.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/OrderItem.java" /> 
     51      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/TestVisit.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/TestVisit.java" /> 
     52      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Order.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Order.java" /> 
     53      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/tools/IDEA/ACO.java" afterPath="$PROJECT_DIR$/jmatter/tools/IDEA/ACO.java" /> 
     54      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Session.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Session.java" /> 
     55      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Self/src/com/u2d/self/Space.java" afterPath="$PROJECT_DIR$/demo-apps/Self/src/com/u2d/self/Space.java" /> 
     56      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/PKGenStrategy.java" /> 
     57      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Event.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Event.java" /> 
     58      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Symposium.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Symposium.java" /> 
     59      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Talk.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Talk.java" /> 
     60      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Venue.java" afterPath="$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Venue.java" /> 
     61      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AppBrowser/AppBrowser.iml" afterPath="$PROJECT_DIR$/AppBrowser/AppBrowser.iml" /> 
     62      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/ReverseEngineer.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/persist/ReverseEngineer.java" /> 
     63      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/MyTunes.iml" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/MyTunes.iml" /> 
     64      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Artist.java" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Artist.java" /> 
     65      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/Core.iml" afterPath="$PROJECT_DIR$/jmatter/Core.iml" /> 
     66      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Song.java" afterPath="$PROJECT_DIR$/demo-apps/MyTunes/src/com/u2d/mytunes/Song.java" /> 
     67      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AppBrowser/src/com/u2d/appbrowser/AppBookmark.java" afterPath="$PROJECT_DIR$/AppBrowser/src/com/u2d/appbrowser/AppBookmark.java" /> 
     68      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Shipment.java" afterPath="$PROJECT_DIR$/test-app/src/com/u2d/domain/Shipment.java" /> 
     69      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/jmatter-tools/src/com/u2d/tools/AntPersistClassesMaker.java" afterPath="$PROJECT_DIR$/modules/jmatter-tools/src/com/u2d/tools/AntPersistClassesMaker.java" /> 
     70      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java" afterPath="$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java" /> 
    2371    </list> 
    2472    <ignored path="JMatter.iws" /> 
     
    86134      <property name="method_breakpoints_groupByClasses" value="true" /> 
    87135      <property name="exception_breakpoints_viewId" value="TABLE" /> 
     136      <property name="exception_breakpoints_groupByClasses" value="true" /> 
    88137      <property name="field_breakpoints_viewId" value="TABLE" /> 
    89       <property name="exception_breakpoints_groupByClasses" value="true" /> 
    90138      <property name="method_breakpoints_groupByMethods" value="false" /> 
    91139    </ui_properties> 
     
    107155  </component> 
    108156  <component name="FileEditorManager"> 
    109     <leaf /> 
     157    <leaf> 
     158      <file leaf-file-name="HBMMaker.java" pinned="false" current="true" current-in-tab="true"> 
     159        <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/HBMMaker.java"> 
     160          <provider selected="true" editor-type-id="text-editor"> 
     161            <state line="658" column="3" selection-start="21624" selection-end="21624" vertical-scroll-proportion="0.3109843"> 
     162              <folding /> 
     163            </state> 
     164          </provider> 
     165        </entry> 
     166      </file> 
     167    </leaf> 
    110168  </component> 
    111169  <component name="FindManager"> 
     
    137195        </PATH_ELEMENT> 
    138196        <PATH_ELEMENT> 
    139           <option name="myItemId" value="swingvm" /> 
     197          <option name="myItemId" value="Sympster" /> 
    140198          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> 
    141199        </PATH_ELEMENT> 
     
    147205        </PATH_ELEMENT> 
    148206        <PATH_ELEMENT> 
    149           <option name="myItemId" value="swingvm" /> 
     207          <option name="myItemId" value="Sympster" /> 
    150208          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> 
    151209        </PATH_ELEMENT> 
    152210        <PATH_ELEMENT> 
    153           <option name="myItemId" value="com.u2d.view.swing.restrict" /> 
     211          <option name="myItemId" value="com.u2d.sympster" /> 
     212          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> 
     213        </PATH_ELEMENT> 
     214      </PATH> 
     215      <PATH> 
     216        <PATH_ELEMENT> 
     217          <option name="myItemId" value="JMatter" /> 
     218          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> 
     219        </PATH_ELEMENT> 
     220        <PATH_ELEMENT> 
     221          <option name="myItemId" value="Core" /> 
     222          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> 
     223        </PATH_ELEMENT> 
     224      </PATH> 
     225      <PATH> 
     226        <PATH_ELEMENT> 
     227          <option name="myItemId" value="JMatter" /> 
     228          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> 
     229        </PATH_ELEMENT> 
     230        <PATH_ELEMENT> 
     231          <option name="myItemId" value="Core" /> 
     232          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> 
     233        </PATH_ELEMENT> 
     234        <PATH_ELEMENT> 
     235          <option name="myItemId" value="com.u2d.persist" /> 
     236          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> 
     237        </PATH_ELEMENT> 
     238      </PATH> 
     239      <PATH> 
     240        <PATH_ELEMENT> 
     241          <option name="myItemId" value="JMatter" /> 
     242          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> 
     243        </PATH_ELEMENT> 
     244        <PATH_ELEMENT> 
     245          <option name="myItemId" value="Core" /> 
     246          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> 
     247        </PATH_ELEMENT> 
     248        <PATH_ELEMENT> 
     249          <option name="myItemId" value="com.u2d.model" /> 
     250          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> 
     251        </PATH_ELEMENT> 
     252      </PATH> 
     253      <PATH> 
     254        <PATH_ELEMENT> 
     255          <option name="myItemId" value="JMatter" /> 
     256          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> 
     257        </PATH_ELEMENT> 
     258        <PATH_ELEMENT> 
     259          <option name="myItemId" value="ContactMgr" /> 
     260          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> 
     261        </PATH_ELEMENT> 
     262      </PATH> 
     263      <PATH> 
     264        <PATH_ELEMENT> 
     265          <option name="myItemId" value="JMatter" /> 
     266          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> 
     267        </PATH_ELEMENT> 
     268        <PATH_ELEMENT> 
     269          <option name="myItemId" value="ContactMgr" /> 
     270          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> 
     271        </PATH_ELEMENT> 
     272        <PATH_ELEMENT> 
     273          <option name="myItemId" value="com.u2d.contactmgr" /> 
    154274          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> 
    155275        </PATH_ELEMENT> 
     
    465585    <property name="TEMP_MODULE_EXPLODED_DIR_FOR_Sympster/web/Web2" value="/tmp/webExplodedDir56734tmp" /> 
    466586    <property name="TEMP_MODULE_EXPLODED_DIR_FOR_ContactMgr/web/Web" value="/tmp/webExplodedDir56729tmp" /> 
     587    <property name="GoToClass.includeJavaFiles" value="false" /> 
    467588    <property name="TEMP_MODULE_EXPLODED_DIR_FOR_MyTunes/web/Web" value="/private/tmp/webExplodedDir7160tmp" /> 
    468     <property name="GoToClass.includeJavaFiles" value="false" /> 
    469589    <property name="MemberChooser.copyJavadoc" value="false" /> 
    470590    <property name="TEMP_MODULE_EXPLODED_DIR_FOR_IssueMgr/web/Web" value="/tmp/webExplodedDir9433tmp" /> 
     
    543663      </method> 
    544664    </configuration> 
    545     <configuration default="true" type="Remote" factoryName="Remote"> 
    546       <option name="USE_SOCKET_TRANSPORT" value="true" /> 
    547       <option name="SERVER_MODE" value="false" /> 
    548       <option name="SHMEM_ADDRESS" value="javadebug" /> 
    549       <option name="HOST" value="localhost" /> 
    550       <option name="PORT" value="5005" /> 
     665    <configuration default="true" type="Applet" factoryName="Applet"> 
     666      <module name="" /> 
     667      <option name="MAIN_CLASS_NAME" /> 
     668      <option name="HTML_FILE_NAME" /> 
     669      <option name="HTML_USED" value="false" /> 
     670      <option name="WIDTH" value="400" /> 
     671      <option name="HEIGHT" value="300" /> 
     672      <option name="POLICY_FILE" value="/opt/idea-5766/bin/appletviewer.policy" /> 
     673      <option name="VM_PARAMETERS" /> 
     674      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> 
     675      <option name="ALTERNATIVE_JRE_PATH" /> 
    551676    </configuration> 
    552677    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> 
     
    566691      </method> 
    567692    </configuration> 
    568     <configuration default="true" type="Applet" factoryName="Applet"> 
    569       <module name="" /> 
    570       <option name="MAIN_CLASS_NAME" /> 
    571       <option name="HTML_FILE_NAME" /> 
    572       <option name="HTML_USED" value="false" /> 
    573       <option name="WIDTH" value="400" /> 
    574       <option name="HEIGHT" value="300" /> 
    575       <option name="POLICY_FILE" value="/opt/idea-5766/bin/appletviewer.policy" /> 
    576       <option name="VM_PARAMETERS" /> 
    577       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> 
    578       <option name="ALTERNATIVE_JRE_PATH" /> 
     693    <configuration default="true" type="Remote" factoryName="Remote"> 
     694      <option name="USE_SOCKET_TRANSPORT" value="true" /> 
     695      <option name="SERVER_MODE" value="false" /> 
     696      <option name="SHMEM_ADDRESS" value="javadebug" /> 
     697      <option name="HOST" value="localhost" /> 
     698      <option name="PORT" value="5005" /> 
    579699    </configuration> 
    580700    <configuration default="false" name="Self" type="Application" factoryName="Application" enabled="false" merge="false"> 
     
    826946  </component> 
    827947  <component name="ToolWindowManager"> 
    828     <frame x="0" y="25" width="1440" height="850" extended-state="1" /> 
     948    <frame x="0" y="25" width="1448" height="853" extended-state="0" /> 
    829949    <editor active="true" /> 
    830950    <layout> 
     
    838958      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3237705" order="9" /> 
    839959      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> 
    840       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27548808" order="1" /> 
     960      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27548808" order="1" /> 
    841961      <window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> 
    842962      <window_info id="JProfiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32921812" order="10" /> 
    843963      <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" /> 
    844       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28109273" order="0" /> 
     964      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28037384" order="0" /> 
    845965      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="11" /> 
    846966      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24981897" order="2" /> 
     
    10121132  </component> 
    10131133  <component name="editorHistoryManager"> 
    1014     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/HBMGenerator.java"> 
    1015       <provider selected="true" editor-type-id="text-editor"> 
    1016         <state line="71" column="0" selection-start="1967" selection-end="1967" vertical-scroll-proportion="1.1289399"> 
    1017           <folding /> 
    1018         </state> 
    1019       </provider> 
    1020     </entry> 
    1021     <entry file="file:///home/eitan/work/thirdparty/hibernate-3.2/src/org/hibernate/tool/hbm2ddl/SchemaExport.java"> 
    1022       <provider selected="true" editor-type-id="text-editor"> 
    1023         <state line="155" column="17" selection-start="4630" selection-end="4630" vertical-scroll-proportion="0.22492836"> 
    1024           <folding /> 
    1025         </state> 
    1026       </provider> 
    1027     </entry> 
    1028     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/HibernatePersistor.java"> 
    1029       <provider selected="true" editor-type-id="text-editor"> 
    1030         <state line="445" column="13" selection-start="12638" selection-end="12638" vertical-scroll-proportion="0.48280802"> 
    1031           <folding /> 
    1032         </state> 
    1033       </provider> 
    1034     </entry> 
    1035     <entry file="file://$PROJECT_DIR$/demo-apps/ContactMgr/test/com/u2d/contactmgr/CommandTest.java"> 
    1036       <provider selected="true" editor-type-id="text-editor"> 
    1037         <state line="40" column="27" selection-start="1362" selection-end="1362" vertical-scroll-proportion="0.6952596"> 
    1038           <folding /> 
    1039         </state> 
    1040       </provider> 
    1041     </entry> 
    1042     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/app/Role.java"> 
    1043       <provider selected="true" editor-type-id="text-editor"> 
    1044         <state line="134" column="91" selection-start="4025" selection-end="4033" vertical-scroll-proportion="0.33182845"> 
     1134    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/PKGen.java"> 
     1135      <provider selected="true" editor-type-id="text-editor"> 
     1136        <state line="11" column="0" selection-start="276" selection-end="276" vertical-scroll-proportion="0.23638968"> 
     1137          <folding> 
     1138            <element signature="imports" expanded="true" /> 
     1139          </folding> 
     1140        </state> 
     1141      </provider> 
     1142    </entry> 
     1143    <entry file="file://$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Speaker.java"> 
     1144      <provider selected="true" editor-type-id="text-editor"> 
     1145        <state line="39" column="22" selection-start="1405" selection-end="1405" vertical-scroll-proportion="0.53724927"> 
     1146          <folding /> 
     1147        </state> 
     1148      </provider> 
     1149    </entry> 
     1150    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/PKGenStrategy.java"> 
     1151      <provider selected="true" editor-type-id="text-editor"> 
     1152        <state line="13" column="0" selection-start="217" selection-end="217" vertical-scroll-proportion="0.27936962"> 
     1153          <folding /> 
     1154        </state> 
     1155      </provider> 
     1156    </entry> 
     1157    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/PKField.java"> 
     1158      <provider selected="true" editor-type-id="text-editor"> 
     1159        <state line="9" column="18" selection-start="268" selection-end="268" vertical-scroll-proportion="0.19340974"> 
     1160          <folding> 
     1161            <element signature="imports" expanded="true" /> 
     1162          </folding> 
     1163        </state> 
     1164      </provider> 
     1165    </entry> 
     1166    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java"> 
     1167      <provider selected="true" editor-type-id="text-editor"> 
     1168        <state line="485" column="0" selection-start="13650" selection-end="13650" vertical-scroll-proportion="0.59169054"> 
     1169          <folding /> 
     1170        </state> 
     1171      </provider> 
     1172    </entry> 
     1173    <entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/EOPanel.java"> 
     1174      <provider selected="true" editor-type-id="text-editor"> 
     1175        <state line="213" column="21" selection-start="6243" selection-end="6243" vertical-scroll-proportion="0.5349887"> 
     1176          <folding /> 
     1177        </state> 
     1178      </provider> 
     1179    </entry> 
     1180    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/EObjectUserTypeDelegate.java"> 
     1181      <provider selected="true" editor-type-id="text-editor"> 
     1182        <state line="113" column="75" selection-start="3485" selection-end="3485" vertical-scroll-proportion="0.33182845"> 
     1183          <folding /> 
     1184        </state> 
     1185      </provider> 
     1186    </entry> 
     1187    <entry file="file://$PROJECT_DIR$/demo-apps/IssueMgr/src/com/u2d/issuemgr/Issue.java"> 
     1188      <provider selected="true" editor-type-id="text-editor"> 
     1189        <state line="131" column="44" selection-start="3919" selection-end="3919" vertical-scroll-proportion="0.33182845"> 
     1190          <folding /> 
     1191        </state> 
     1192      </provider> 
     1193    </entry> 
     1194    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/inequalities/ContainsInequality.java"> 
     1195      <provider selected="true" editor-type-id="text-editor"> 
     1196        <state line="47" column="69" selection-start="1344" selection-end="1344" vertical-scroll-proportion="0.33182845"> 
     1197          <folding /> 
     1198        </state> 
     1199      </provider> 
     1200    </entry> 
     1201    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/element/Member.java"> 
     1202      <provider selected="true" editor-type-id="text-editor"> 
     1203        <state line="152" column="10" selection-start="4673" selection-end="4673" vertical-scroll-proportion="0.66139954"> 
     1204          <folding /> 
     1205        </state> 
     1206      </provider> 
     1207    </entry> 
     1208    <entry file="file://$PROJECT_DIR$/demo-apps/Sympster/src/com/u2d/sympster/Talk.java"> 
     1209      <provider selected="true" editor-type-id="text-editor"> 
     1210        <state line="20" column="13" selection-start="569" selection-end="569" vertical-scroll-proportion="0.3338109"> 
    10451211          <folding /> 
    10461212        </state> 
     
    10491215    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/model/AbstractComplexEObject.java"> 
    10501216      <provider selected="true" editor-type-id="text-editor"> 
    1051         <state line="853" column="17" selection-start="25039" selection-end="25044" vertical-scroll-proportion="1.2102804"> 
    1052           <folding /> 
    1053         </state> 
    1054       </provider> 
    1055     </entry> 
    1056     <entry file="file://$PROJECT_DIR$/demo-apps/IssueMgr/src/com/u2d/issuemgr/Issue.java"> 
    1057       <provider selected="true" editor-type-id="text-editor"> 
    1058         <state line="131" column="44" selection-start="3919" selection-end="3919" vertical-scroll-proportion="0.33182845"> 
    1059           <folding /> 
    1060         </state> 
    1061       </provider> 
    1062     </entry> 
    1063     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/find/inequalities/ContainsInequality.java"> 
    1064       <provider selected="true" editor-type-id="text-editor"> 
    1065         <state line="47" column="69" selection-start="1344" selection-end="1344" vertical-scroll-proportion="0.33182845"> 
    1066           <folding /> 
    1067         </state> 
    1068       </provider> 
    1069     </entry> 
    1070     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/element/Member.java"> 
    1071       <provider selected="true" editor-type-id="text-editor"> 
    1072         <state line="155" column="1" selection-start="4722" selection-end="4722" vertical-scroll-proportion="0.7629797"> 
    1073           <folding /> 
    1074         </state> 
    1075       </provider> 
    1076     </entry> 
    1077     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/InMemoryPersistor.java"> 
    1078       <provider selected="true" editor-type-id="text-editor"> 
    1079         <state line="24" column="0" selection-start="557" selection-end="557" vertical-scroll-proportion="0.27936962"> 
    1080           <folding /> 
    1081         </state> 
    1082       </provider> 
    1083     </entry> 
    1084     <entry file="file://$PROJECT_DIR$/modules/swingvm/src/com/u2d/view/swing/EOPanel.java"> 
    1085       <provider selected="true" editor-type-id="text-editor"> 
    1086         <state line="207" column="27" selection-start="6068" selection-end="6068" vertical-scroll-proportion="0.35530087"> 
    1087           <folding /> 
    1088         </state> 
    1089       </provider> 
    1090     </entry> 
    1091     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/EObjectUserTypeDelegate.java"> 
    1092       <provider selected="true" editor-type-id="text-editor"> 
    1093         <state line="115" column="0" selection-start="3504" selection-end="3504" vertical-scroll-proportion="0.48424068"> 
     1217        <state line="860" column="15" selection-start="25375" selection-end="25375" vertical-scroll-proportion="0.95607615"> 
     1218          <folding /> 
     1219        </state> 
     1220      </provider> 
     1221    </entry> 
     1222    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexEObject.java"> 
     1223      <provider selected="true" editor-type-id="text-editor"> 
     1224        <state line="86" column="19" selection-start="2613" selection-end="2618" vertical-scroll-proportion="1.0"> 
     1225          <folding /> 
     1226        </state> 
     1227      </provider> 
     1228    </entry> 
     1229    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/model/ComplexType.java"> 
     1230      <provider selected="true" editor-type-id="text-editor"> 
     1231        <state line="181" column="0" selection-start="5268" selection-end="5268" vertical-scroll-proportion="0.5408163"> 
     1232          <folding /> 
     1233        </state> 
     1234      </provider> 
     1235    </entry> 
     1236    <entry file="file://$PROJECT_DIR$/demo-apps/ContactMgr/src/com/u2d/contactmgr/PersonContact.java"> 
     1237      <provider selected="true" editor-type-id="text-editor"> 
     1238        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> 
    10941239          <folding /> 
    10951240        </state> 
     
    10981243    <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/persist/HBMMaker.java"> 
    10991244      <provider selected="true" editor-type-id="text-editor"> 
    1100         <state line="26" column="0" selection-start="762" selection-end="762" vertical-scroll-proportion="0.5157593"> 
    1101           <folding /> 
    1102         </state> 
    1103       </provider> 
    1104     </entry> 
    1105     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/reflection/Fld.java"> 
    1106       <provider selected="true" editor-type-id="text-editor"> 
    1107         <state line="36" column="23" selection-start="883" selection-end="890" vertical-scroll-proportion="0.70916903"> 
    1108           <folding /> 
    1109         </state> 
    1110       </provider> 
    1111     </entry> 
    1112     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/element/Command.java"> 
    1113       <provider selected="true" editor-type-id="text-editor"> 
    1114         <state line="72" column="8" selection-start="1976" selection-end="1976" vertical-scroll-proportion="0.21060172"> 
    1115           <folding /> 
    1116         </state> 
    1117       </provider> 
    1118     </entry> 
    1119     <entry file="file://$PROJECT_DIR$/jmatter/src/com/u2d/element/Field.java"> 
    1120       <provider selected="true" editor-type-id="text-editor"> 
    1121         <state line="443" column="21" selection-start="12238" selection-end="12245" vertical-scroll-proportion="0.2320917"> 
     1245        <state line="658" column="3" selection-start="21624" selection-end="21624" vertical-scroll-proportion="0.3109843"> 
    11221246          <folding /> 
    11231247        </state> 
  • jmatter-complet/branches/TRY-JPA/demo-apps/ContactMgr/src/com/u2d/contactmgr/PersonContact.java

    r972 r1365  
    33import com.u2d.element.CommandInfo; 
    44import com.u2d.model.ComplexType; 
    5 import com.u2d.persist.Persist; 
    65import com.u2d.reflection.Cmd; 
    76import com.u2d.reporting.ReportFormat; 
     
    109import com.u2d.wizard.details.Wizard; 
    1110import javax.swing.table.TableModel; 
     11import javax.persistence.Entity; 
    1212import java.util.Properties; 
    1313 
    14 @Persist 
     14@Entity 
    1515public class PersonContact extends Person 
    1616{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/CustomUI/src/com/u2d/customui/Contact.java

    r728 r1365  
    44import com.u2d.model.Title; 
    55import com.u2d.type.composite.Name; 
    6 import com.u2d.persist.Persist
     6import javax.persistence.Entity
    77import com.u2d.reflection.Cmd; 
    88import com.u2d.element.CommandInfo; 
     
    1717 * Time: 2:10:02 PM 
    1818 */ 
    19 @Persist 
     19@Entity 
    2020public class Contact extends AbstractComplexEObject 
    2121{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/IssueMgr/IssueMgr.iml

    r1266 r1365  
    22<module relativePaths="true" type="JAVA_MODULE" version="4"> 
    33  <component name="FacetManager"> 
    4     <facet type="Spring" name="Spring" implicit="true"
     4    <facet type="Spring" name="Spring"
    55      <configuration> 
    66        <options> 
     
    5050    <orderEntry type="sourceFolder" forTests="false" /> 
    5151    <orderEntry type="module" module-name="Core" /> 
     52    <orderEntry type="module-library"> 
     53      <library> 
     54        <CLASSES> 
     55          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jfreereport-0.8.7.jar!/" /> 
     56          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/statemap.jar!/" /> 
     57          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/commons-pool-1.2.jar!/" /> 
     58          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/xpp3.jar!/" /> 
     59          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/iText.jar!/" /> 
     60          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/hibernate3.jar!/" /> 
     61          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jibx-run.jar!/" /> 
     62          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jibx-extras.jar!/" /> 
     63          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/commons-lang-2.3.jar!/" /> 
     64          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/json.jar!/" /> 
     65          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/mysql-connector-java-5.0.8-bin.jar!/" /> 
     66          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/hsqldb.jar!/" /> 
     67          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/postgresql-8.3-603.jdbc3.jar!/" /> 
     68          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/h2.jar!/" /> 
     69          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/groovy-all-1.5.6.jar!/" /> 
     70          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/ejb3-persistence.jar!/" /> 
     71        </CLASSES> 
     72        <JAVADOC /> 
     73        <SOURCES /> 
     74      </library> 
     75    </orderEntry> 
    5276    <orderEntryProperties /> 
    5377  </component> 
  • jmatter-complet/branches/TRY-JPA/demo-apps/IssueMgr/src/com/u2d/issuemgr/Issue.java

    r1264 r1365  
    1818import com.u2d.reflection.Cmd; 
    1919import com.u2d.reflection.Arg; 
    20 import com.u2d.persist.Persist
     20import javax.persistence.Entity
    2121 
    2222/** 
     
    2626 * Time: 8:54:01 PM 
    2727 */ 
    28 @Persist 
     28@Entity 
    2929public class Issue extends AbstractComplexEObject 
    3030{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/IssueMgr/src/com/u2d/issuemgr/IssueCategory.java

    r330 r1365  
    1212import com.u2d.find.inequalities.IdentityInequality; 
    1313import com.u2d.reflection.Cmd; 
    14 import com.u2d.persist.Persist
     14import javax.persistence.Entity
    1515 
    1616/** 
     
    2020 * Time: 6:17:21 PM 
    2121 */ 
    22 @Persist 
     22@Entity 
    2323public class IssueCategory extends AbstractComplexEObject 
    2424{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/MovieLib/src/com/u2d/movielib/Actor.java

    r330 r1365  
    66import com.u2d.list.RelationalList; 
    77import com.u2d.app.PersistenceMechanism; 
    8 import com.u2d.persist.Persist; 
    9  
     8import javax.persistence.Entity; 
    109import javax.swing.*; 
    1110 
     
    1615 * Time: 4:40:22 PM 
    1716 */ 
    18 @Persist 
     17@Entity 
    1918public class Actor extends AbstractComplexEObject 
    2019{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/MovieLib/src/com/u2d/movielib/Genre.java

    r330 r1365  
    44import com.u2d.model.Title; 
    55import com.u2d.type.atom.StringEO; 
    6 import com.u2d.persist.Persist
     6import javax.persistence.Entity
    77 
    88/** 
     
    1212 * Time: 4:40:25 PM 
    1313 */ 
    14 @Persist 
     14@Entity 
    1515public class Genre extends AbstractComplexEObject 
    1616{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/MovieLib/src/com/u2d/movielib/Movie.java

    r330 r1365  
    66import com.u2d.list.RelationalList; 
    77import com.u2d.app.PersistenceMechanism; 
    8 import com.u2d.persist.Persist
     8import javax.persistence.Entity
    99 
    1010/** 
     
    1414 * Time: 4:40:18 PM 
    1515 */ 
    16 @Persist 
     16@Entity 
    1717public class Movie extends AbstractComplexEObject 
    1818{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/MyTunes/MyTunes.iml

    r1330 r1365  
    4242      </library> 
    4343    </orderEntry> 
     44    <orderEntry type="module-library"> 
     45      <library> 
     46        <CLASSES> 
     47          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jfreereport-0.8.7.jar!/" /> 
     48          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/statemap.jar!/" /> 
     49          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/commons-pool-1.2.jar!/" /> 
     50          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/xpp3.jar!/" /> 
     51          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/iText.jar!/" /> 
     52          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/hibernate3.jar!/" /> 
     53          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jibx-run.jar!/" /> 
     54          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jibx-extras.jar!/" /> 
     55          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/commons-lang-2.3.jar!/" /> 
     56          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/json.jar!/" /> 
     57          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/mysql-connector-java-5.0.8-bin.jar!/" /> 
     58          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/hsqldb.jar!/" /> 
     59          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/postgresql-8.3-603.jdbc3.jar!/" /> 
     60          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/h2.jar!/" /> 
     61          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/groovy-all-1.5.6.jar!/" /> 
     62          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/ejb3-persistence.jar!/" /> 
     63        </CLASSES> 
     64        <JAVADOC /> 
     65        <SOURCES /> 
     66      </library> 
     67    </orderEntry> 
    4468    <orderEntryProperties /> 
    4569  </component> 
  • jmatter-complet/branches/TRY-JPA/demo-apps/MyTunes/src/com/u2d/mytunes/Album.java

    r1060 r1365  
    77import com.u2d.model.Title; 
    88import com.u2d.list.RelationalList; 
    9 import com.u2d.persist.Persist; 
     9import javax.swing.*; 
     10import javax.persistence.Entity; 
    1011 
    11 import javax.swing.*; 
    12  
    13 @Persist 
     12@Entity 
    1413public class Album extends AbstractComplexEObject 
    1514{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/MyTunes/src/com/u2d/mytunes/Artist.java

    r330 r1365  
    55import com.u2d.type.atom.StringEO; 
    66import com.u2d.type.atom.TextEO; 
    7 import com.u2d.persist.Persist
     7import javax.persistence.Entity
    88 
    9 @Persist 
     9@Entity 
    1010public class Artist extends AbstractComplexEObject 
    1111{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/MyTunes/src/com/u2d/mytunes/Genre.java

    r717 r1365  
    33import com.u2d.type.AbstractChoiceEO; 
    44import com.u2d.type.atom.StringEO; 
    5 import com.u2d.model.ComplexType; 
    6 import com.u2d.persist.Persist; 
     5import javax.persistence.Entity; 
    76 
    8 @Persist 
     7@Entity 
    98public class Genre extends AbstractChoiceEO 
    109{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/MyTunes/src/com/u2d/mytunes/Song.java

    r1330 r1365  
    88import com.u2d.element.CommandInfo; 
    99import com.u2d.persist.HBMSingleSession; 
    10 import com.u2d.persist.Persist; 
    1110import com.u2d.reflection.Cmd; 
    1211import com.u2d.reflection.Arg; 
     
    2928import org.hibernate.Session; 
    3029import org.hibernate.Query; 
    31  
    32 @Persist 
     30import javax.persistence.Entity; 
     31 
     32@Entity 
    3333public class Song extends AbstractComplexEObject 
    3434{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Self/Self.iml

    r950 r1365  
    2626    <orderEntry type="library" name="JUnit" level="project" /> 
    2727    <orderEntry type="module" module-name="ds-swing" /> 
     28    <orderEntry type="module-library"> 
     29      <library> 
     30        <CLASSES> 
     31          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jfreereport-0.8.7.jar!/" /> 
     32          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/statemap.jar!/" /> 
     33          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/commons-pool-1.2.jar!/" /> 
     34          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/xpp3.jar!/" /> 
     35          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/iText.jar!/" /> 
     36          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/hibernate3.jar!/" /> 
     37          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jibx-run.jar!/" /> 
     38          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jibx-extras.jar!/" /> 
     39          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/commons-lang-2.3.jar!/" /> 
     40          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/json.jar!/" /> 
     41          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/mysql-connector-java-5.0.8-bin.jar!/" /> 
     42          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/hsqldb.jar!/" /> 
     43          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/postgresql-8.3-603.jdbc3.jar!/" /> 
     44          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/h2.jar!/" /> 
     45          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/groovy-all-1.5.6.jar!/" /> 
     46          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/ejb3-persistence.jar!/" /> 
     47        </CLASSES> 
     48        <JAVADOC /> 
     49        <SOURCES /> 
     50      </library> 
     51    </orderEntry> 
    2852    <orderEntryProperties /> 
    2953  </component> 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Self/src/com/u2d/self/Ball.java

    r555 r1365  
    66import com.u2d.type.atom.ColorEO; 
    77import com.u2d.type.atom.BooleanEO; 
    8 import com.u2d.persist.Persist
     8import javax.persistence.Entity
    99 
    10 @Persist 
     10@Entity 
    1111public class Ball 
    1212      extends AbstractComplexEObject 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Self/src/com/u2d/self/Space.java

    r555 r1365  
    44import com.u2d.model.Title; 
    55import com.u2d.type.atom.IntEO; 
    6 import com.u2d.persist.Persist; 
    76import com.u2d.list.RelationalList; 
    87import com.u2d.reflection.Cmd; 
    98import com.u2d.element.CommandInfo; 
    109import com.u2d.view.View; 
     10import javax.persistence.Entity; 
    1111 
    12 import javax.swing.*; 
    13  
    14 @Persist 
     12@Entity 
    1513public class Space 
    1614      extends AbstractComplexEObject 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/Sympster.iml

    r1261 r1365  
    4848    </orderEntry> 
    4949    <orderEntry type="library" name="Hibernate" level="project" /> 
     50    <orderEntry type="module-library"> 
     51      <library> 
     52        <CLASSES> 
     53          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jfreereport-0.8.7.jar!/" /> 
     54          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/statemap.jar!/" /> 
     55          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/commons-pool-1.2.jar!/" /> 
     56          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/xpp3.jar!/" /> 
     57          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/iText.jar!/" /> 
     58          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/hibernate3.jar!/" /> 
     59          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jibx-run.jar!/" /> 
     60          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jibx-extras.jar!/" /> 
     61          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/commons-lang-2.3.jar!/" /> 
     62          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/json.jar!/" /> 
     63          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/mysql-connector-java-5.0.8-bin.jar!/" /> 
     64          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/hsqldb.jar!/" /> 
     65          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/postgresql-8.3-603.jdbc3.jar!/" /> 
     66          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/jdbc/h2.jar!/" /> 
     67          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/groovy-all-1.5.6.jar!/" /> 
     68          <root url="jar://$MODULE_DIR$/../../jmatter/lib/runtime/ejb3-persistence.jar!/" /> 
     69        </CLASSES> 
     70        <JAVADOC /> 
     71        <SOURCES /> 
     72      </library> 
     73    </orderEntry> 
    5074    <orderEntryProperties /> 
    5175  </component> 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/BOF.java

    r329 r1365  
    55import com.u2d.type.atom.StringEO; 
    66import com.u2d.list.RelationalList; 
    7 import com.u2d.persist.Persist
     7import javax.persistence.Entity
    88 
    9 @Persist 
     9@Entity 
    1010public class BOF 
    1111      extends AbstractComplexEObject implements Event 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Campus.java

    r329 r1365  
    11package com.u2d.sympster; 
    22 
    3 import com.u2d.persist.Persist
     3import javax.persistence.Entity
    44 
    5 @Persist 
     5@Entity 
    66public class Campus extends Venue 
    77{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/City.java

    r880 r1365  
    44import com.u2d.model.Title; 
    55import com.u2d.type.atom.StringEO; 
    6 import com.u2d.persist.Persist
     6import javax.persistence.Entity
    77 
    8 @Persist 
    9 public class City 
    10       extends AbstractComplexEObject 
     8@Entity 
     9public class City extends AbstractComplexEObject 
    1110{ 
    1211   private final StringEO name = new StringEO(); 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/ConferenceCenter.java

    r329 r1365  
    11package com.u2d.sympster; 
    22 
    3 import com.u2d.persist.Persist
     3import javax.persistence.Entity
    44 
    5 @Persist 
     5@Entity 
    66public class ConferenceCenter extends Venue 
    77{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Event.java

    r365 r1365  
    22 
    33import com.u2d.model.ComplexEObject; 
    4 import com.u2d.persist.Persist; 
    54import com.u2d.type.atom.StringEO; 
     5import javax.persistence.Entity; 
    66 
    77/** 
     
    1111 * Time: 5:06:00 PM 
    1212 */ 
    13 @Persist 
     13@Entity 
    1414public interface Event extends ComplexEObject 
    1515{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Hotel.java

    r1322 r1365  
    11package com.u2d.sympster; 
    22 
    3 import com.u2d.persist.Persist; 
    43import com.u2d.type.composite.USAddress; 
     4import javax.persistence.Entity; 
    55 
    6 @Persist 
     6@Entity 
    77public class Hotel extends Venue 
    88{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Room.java

    r329 r1365  
    55import com.u2d.type.atom.ColorEO; 
    66import com.u2d.calendar.ScheduleEO; 
    7 import com.u2d.persist.Persist
     7import javax.persistence.Entity
    88import java.awt.Color; 
    99 
    10 @Persist 
     10@Entity 
    1111public class Room extends ScheduleEO 
    1212{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Session.java

    r1345 r1365  
    55import com.u2d.type.atom.TimeSpan; 
    66import com.u2d.calendar.CalEvent; 
    7 import com.u2d.persist.Persist; 
    87import com.u2d.view.EView; 
    98import com.u2d.view.swing.CustomReadView; 
    109import com.u2d.view.swing.AlternateView; 
    11  
     10import javax.persistence.Entity; 
    1211import java.awt.Color; 
    1312 
    14 @Persist 
     13@Entity 
    1514public class Session extends CalEvent 
    1615{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Speaker.java

    r1340 r1365  
    1212import com.u2d.reflection.Cmd; 
    1313import com.u2d.reflection.Fld; 
    14 import com.u2d.persist.Persist; 
    1514import com.u2d.view.EView; 
    1615import javax.swing.Icon; 
     16import javax.persistence.Entity; 
    1717import java.awt.Color; 
    1818 
    19 @Persist 
     19@Entity 
    2020public class Speaker extends AbstractComplexEObject 
    2121{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Symposium.java

    r1106 r1365  
    77import com.u2d.type.atom.USDollar; 
    88import com.u2d.calendar.CalendarEO; 
    9 import com.u2d.persist.Persist; 
    109import com.u2d.reflection.Cmd; 
    1110import com.u2d.element.CommandInfo; 
     
    3029import net.sf.jasperreports.engine.export.JRPdfExporter; 
    3130import org.hibernate.Query; 
     31import javax.persistence.Entity; 
    3232 
    33 @Persist 
     33@Entity 
    3434public class Symposium extends CalendarEO 
    3535{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Talk.java

    r1346 r1365  
    66import com.u2d.type.atom.TextEO; 
    77import com.u2d.reflection.Fld; 
    8 import com.u2d.persist.Persist
     8import javax.persistence.Entity
    99import java.awt.Color; 
    1010 
    11 @Persist 
     11@Entity 
    1212public class Talk extends AbstractComplexEObject implements Event 
    1313{ 
  • jmatter-complet/branches/TRY-JPA/demo-apps/Sympster/src/com/u2d/sympster/Venue.java

    r1105 r1365  
    66import com.u2d.type.atom.StringEO; 
    77import com.u2d.list.RelationalList; 
    8 import com.u2d.persist.Persist
     8import javax.persistence.Entity
    99 
    1010/* 
     
    1414 * need another way to mark type abstract, as shown below.. 
    1515 */ 
    16 @Persist 
     16@Entity 
    1717public class Venue extends AbstractComplexEObject 
    1818{ 
  • jmatter-complet/branches/TRY-JPA/jmatter/Core.iml

    r1327 r1365  
    2727          <root url="file://$MODULE_DIR$/lib/runtime/jdbc" /> 
    2828          <root url="jar://$MODULE_DIR$/lib/runtime/groovy-all-1.5.6.jar!/" /> 
     29          <root url="jar://$MODULE_DIR$/lib/runtime/ejb3-persistence.jar!/" /> 
    2930        </CLASSES> 
    3031        <JAVADOC /> 
  • jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/interaction/Instruction.java

    r1307 r1365  
    22 
    33import com.u2d.model.*; 
    4 import com.u2d.persist.Persist; 
    54import com.u2d.element.Command; 
    65import com.u2d.element.CommandInfo; 
     
    109import com.u2d.list.SimpleListEO; 
    1110import com.u2d.field.Association; 
     11import javax.persistence.Entity; 
    1212import java.util.*; 
    1313import java.lang.reflect.InvocationTargetException; 
    1414 
    15 @Persist 
     15@Entity 
    1616public class Instruction 
    1717      extends AbstractComplexEObject 
  • jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/model/ComplexType.java

    r1312 r1365  
    1313import javax.swing.tree.TreeModel; 
    1414import javax.swing.tree.TreePath; 
     15import javax.persistence.Table; 
    1516import org.hibernate.Criteria; 
    1617import org.hibernate.HibernateException; 
     
    167168   } 
    168169 
     170   public String tableName() 
     171   { 
     172      if (_clazz.isAnnotationPresent(Table.class)) 
     173      { 
     174         Table annotation = (Table) _clazz.getAnnotation(Table.class); 
     175         return annotation.name(); 
     176      } 
     177      else 
     178      { 
     179         return null; 
     180      } 
     181   } 
     182 
    169183   private void harvest() 
    170184   { 
  • jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/persist/HBMMaker.java

    r1315 r1365  
    610610       
    611611      String name = _type.name().toLowerCase(); 
    612       if (isReservedWord(name)) 
     612      if (!StringEO.isEmpty(_type.tableName())) 
     613      { 
     614         classElem.addAttribute("table", _type.tableName()); 
     615      } 
     616      else if (isReservedWord(name)) 
     617      { 
    613618         classElem.addAttribute("table", name+"s"); 
    614        
     619      } 
     620 
    615621      if (_type.getJavaClass().isInterface()) 
    616622         return classElem; 
  • jmatter-complet/branches/TRY-JPA/jmatter/src/com/u2d/persist/ReverseEngineer.java

    r889 r1365  
    33import com.u2d.type.atom.StringEO; 
    44 
     5import javax.persistence.Entity; 
    56import java.io.*; 
    67import java.sql.*; 
     
    448449    out.write("import com.u2d.list.RelationalList;"); 
    449450    out.write("import com.u2d.reflection.Fld;"); 
    450     out.write("import com.u2d.persist.Persist;"); 
     451    out.write("import javax.persistence.Entity;"); 
    451452    out.write(""); 
    452453    out.write("/**"); 
     
    456457    out.write(" * @created %s", new java.util.Date()); 
    457458    out.write(" */"); 
    458     out.write("@Persist"); 
     459    out.write("@Entity"); 
    459460    out.write("public class %s extends AbstractComplexEObject {", table.className); 
    460461    out.write(""); 
  • jmatter-complet/branches/TRY-JPA/jmatter/tools/IDEA/ACO.java

    r331 r1365  
    44import com.u2d.model.Title; 
    55import com.u2d.type.atom.StringEO; 
    6 import com.u2d.persist.Persist; 
     6import javax.persistence.Entity 
    77 
    8 @Persist 
     8@Entity 
    99public class ${NAME} extends AbstractComplexEObject 
    1010{ 
  • jmatter-complet/branches/TRY-JPA/modules/jmatter-tools/src/com/u2d/tools/AntPersistClassesMaker.java

    r447 r1365  
    6666            ClassLoader loader = new AntClassLoader(getProject(), _path); 
    6767            Class cls = loader.loadClass(className); 
    68             Class annotation = loader.loadClass("com.u2d.persist.Persist"); 
     68            Class annotation = loader.loadClass("javax.persistence.Entity"); 
    6969            if (cls.isAnnotationPresent(annotation)) 
    7070            { 
  • jmatter-complet/branches/TRY-JPA/test-app/src/com/u2d/domain/AtomicMedley.java

    r725 r1365  
    99import com.u2d.type.Sex; 
    1010import com.u2d.type.atom.*; 
    11 import com.u2d.persist.Persist
     11import javax.persistence.Entity
    1212 
    1313/** 
    1414 * @author Eitan Suez 
    1515 */ 
    16 @Persist 
     16@Entity 
    1717public class AtomicMedley extends AbstractComplexEObject  
    1818{ 
  • jmatter-complet/branches/TRY-JPA/test-app/src/com/u2d/domain/Meeting.java

    r725 r1365  
    77import com.u2d.model.Title; 
    88import com.u2d.type.atom.*; 
    9 import com.u2d.persist.Persist
     9import javax.persistence.Entity
    1010 
    1111/** 
    1212 * @author Eitan Suez 
    1313 */ 
    14 @Persist 
     14@Entity 
    1515public class Meeting extends CalEvent 
    1616{ 
  • jmatter-complet/branches/TRY-JPA/test-app/src/com/u2d/domain/Order.java

    r725 r1365  
    99import com.u2d.type.atom.*; 
    1010import com.u2d.type.composite.*; 
    11 import com.u2d.persist.Persist
     11import javax.persistence.Entity
    1212 
    1313/** 
    1414 * @author Eitan Suez 
    1515 */ 
    16 @Persist 
     16@Entity 
    1717public class Order extends AbstractComplexEObject 
    1818{ 
  • jmatter-complet/branches/TRY-JPA/test-app/src/com/u2d/domain/OrderItem.java

    r725 r1365  
    77import com.u2d.model.Title; 
    88import com.u2d.type.atom.*; 
    9 import com.u2d.persist.Persist
     9import javax.persistence.Entity
    1010 
    1111/** 
    1212 * @author Eitan Suez 
    1313 */ 
    14 @Persist 
     14@Entity 
    1515public class OrderItem extends AbstractComplexEObject 
    1616{ 
  • jmatter-complet/branches/TRY-JPA/test-app/src/com/u2d/domain/Painting.java

    r1197 r1365  
    44import com.u2d.model.Title; 
    55import com.u2d.type.atom.StringEO; 
    6 import com.u2d.persist.Persist
     6import javax.persistence.Entity
    77 
    8 @Persist 
     8@Entity 
    99public class Painting extends AbstractComplexEObject 
    1010{ 
  • jmatter-complet/branches/TRY-JPA/test-app/src/com/u2d/domain/Resource.java

    r725 r1365  
    1111import com.u2d.model.Title; 
    1212import com.u2d.reflection.Cmd; 
    13 import com.u2d.persist.Persist
     13import javax.persistence.Entity
    1414 
    1515/** 
    1616 * @author Eitan Suez 
    1717 */ 
    18 @Persist 
     18@Entity 
    1919public class Resource extends AbstractComplexEObject implements Schedulable 
    2020{ 
  • jmatter-complet/branches/TRY-JPA/test-app/src/com/u2d/domain/Shipment.java

    r725 r1365  
    88import com.u2d.type.atom.*; 
    99import com.u2d.type.composite.*; 
    10 import com.u2d.persist.Persist
     10import javax.persistence.Entity
    1111 
    1212/** 
     
    1515 * @author Eitan Suez 
    1616 */ 
    17 @Persist 
     17@Entity 
    1818public class Shipment extends AbstractComplexEObject 
    1919{ 
  • jmatter-complet/branches/TRY-JPA/test-app/src/com/u2d/domain/TestVisit.java

    r725 r1365  
    99import com.u2d.pattern.*; 
    1010import com.u2d.type.atom.*; 
    11 import com.u2d.persist.Persist
     11import javax.persistence.Entity
    1212 
    1313/** 
    1414 * @author Eitan Suez 
    1515 */ 
    16 @Persist 
     16@Entity 
    1717public class TestVisit extends CalEvent 
    1818{