Commits

Anonymous committed 233adf8

Update idea files
Override setters for ejb3 since @TransactionAttribute doesnt seem to be deleted by Spring 2.5 unless it's on public methods

git-svn-id: http://svn.opensymphony.com/svn/propertyset/trunk@189bf3cbcdd-1c1a-0410-9a68-d6f521e3fa7b

Comments (0)

Files changed (9)

 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/java" />
     <exclude-output />
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="true">
+<project relativePaths="true" version="4">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
   </component>
       <entry name="?*.sql" />
     </wildcardResourcePatterns>
   </component>
-  <component name="DataSourceManagerImpl" />
   <component name="DependenciesAnalyzeManager">
     <option name="myForwardDirection" value="false" />
   </component>
-  <component name="DependencyValidationManager" />
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
   <component name="EclipseCompilerSettings">
     <option name="DEBUGGING_INFO" value="true" />
     <option name="GENERATE_NO_WARNINGS" value="true" />
     <option name="MAXIMUM_HEAP_SIZE" value="128" />
   </component>
   <component name="EntryPointsManager">
-    <entry_points />
+    <entry_points version="2.0" />
   </component>
   <component name="ExportToHTMLSettings">
     <option name="PRINT_LINE_NUMBERS" value="false" />
     <option name="OPEN_IN_BROWSER" value="false" />
     <option name="OUTPUT_DIRECTORY" />
   </component>
-  <component name="GUI Designer component loader factory" />
+  <component name="FacetAutodetectingManager">
+    <autodetection-disabled>
+      <facet-type id="jpa">
+        <modules>
+          <module name="propertyset" />
+        </modules>
+      </facet-type>
+    </autodetection-disabled>
+  </component>
   <component name="IdProvider" IDEtalkID="526BEE8F6146DB0903D4539C22891A81" />
   <component name="InspectionProjectProfileManager">
     <option name="PROJECT_PROFILE" value="Project Default" />
       <profile version="1.0" is_locked="false">
         <option name="myName" value="Project Default" />
         <option name="myLocal" value="false" />
-        <used_levels>
-          <error>
-            <option name="myName" value="ERROR" />
-            <option name="myVal" value="200" />
-          </error>
-          <warning>
-            <option name="myName" value="WARNING" />
-            <option name="myVal" value="100" />
-          </warning>
-          <information>
-            <option name="myName" value="INFO" />
-            <option name="myVal" value="100" />
-          </information>
-          <server>
-            <option name="myName" value="SERVER PROBLEM" />
-            <option name="myVal" value="100" />
-          </server>
-        </used_levels>
         <inspection_tool class="InfiniteLoopStatement" level="WARNING" enabled="false" />
         <inspection_tool class="ResultSetIndexZero" level="ERROR" enabled="true" />
         <inspection_tool class="RedundantTypeArguments" level="WARNING" enabled="false" />
         <inspection_tool class="SerializableWithUnconstructableAncestor" level="WARNING" enabled="true" />
         <inspection_tool class="ConstantConditions" level="WARNING" enabled="false">
           <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
+          <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
         </inspection_tool>
         <inspection_tool class="ReadResolveAndWriteReplaceProtected" level="WARNING" enabled="true" />
         <inspection_tool class="LengthOneStringsInConcatenation" level="WARNING" enabled="true" />
         <inspection_tool class="ThrowFromFinallyBlock" level="WARNING" enabled="false" />
         <inspection_tool class="AbstractMethodOverridesAbstractMethod" level="WARNING" enabled="true" />
         <inspection_tool class="FinalStaticMethod" level="WARNING" enabled="false" />
-        <inspection_tool class="SuspiciousMethodCalls" level="WARNING" enabled="false" />
+        <inspection_tool class="SuspiciousMethodCalls" level="WARNING" enabled="false">
+          <option name="REPORT_CONVERTIBLE_METHOD_CALLS" value="true" />
+        </inspection_tool>
         <inspection_tool class="ResultOfObjectAllocationIgnored" level="WARNING" enabled="true" />
         <inspection_tool class="UnnecessaryUnboxing" level="WARNING" enabled="false" />
         <inspection_tool class="NoExplicitFinalizeCalls" level="WARNING" enabled="false" />
         <inspection_tool class="EmptyCatchBlock" level="WARNING" enabled="false">
           <option name="m_includeComments" value="true" />
           <option name="m_ignoreTestCases" value="true" />
+          <option name="m_ignoreIgnoreParameter" value="true" />
         </inspection_tool>
         <inspection_tool class="SerializableHasSerialVersionUIDField" level="WARNING" enabled="true">
-          <option name="m_ignoreSerializableDueToInheritance" value="true" />
+          <option name="superClassString" value="java.awt.Component" />
+        </inspection_tool>
+        <inspection_tool class="ForCanBeForeach" level="WARNING" enabled="false">
+          <option name="REPORT_INDEXED_LOOP" value="true" />
         </inspection_tool>
-        <inspection_tool class="ForCanBeForeach" level="WARNING" enabled="false" />
         <inspection_tool class="TypeParameterExtendsObject" level="WARNING" enabled="false" />
         <inspection_tool class="FinalizeCallsSuperFinalize" level="WARNING" enabled="false">
           <option name="m_ignoreForObjectSubclasses" value="false" />
         <inspection_tool class="UnnecessaryModuleDependencyInspection" level="WARNING" enabled="true" />
       </profile>
     </profiles>
+    <list size="0" />
   </component>
   <component name="JavacSettings">
     <option name="DEBUGGING_INFO" value="true" />
       </item>
     </group>
   </component>
+  <component name="ProjectFileVersion" converted="true" />
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/providers/ejb/ejb.iml" filepath="$PROJECT_DIR$/providers/ejb/ejb.iml" />
       <module fileurl="file://$PROJECT_DIR$/src/test/tests.iml" filepath="$PROJECT_DIR$/src/test/tests.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="false" jdk-15="false" project-jdk-name="1.4" project-jdk-type="JavaSDK" />
-  <component name="ProjectRunConfigurationManager" />
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.4" project-jdk-type="JavaSDK" />
   <component name="RmicSettings">
     <option name="IS_EANABLED" value="false" />
     <option name="DEBUGGING_INFO" value="true" />
     <option name="GENERATE_IIOP_STUBS" value="false" />
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
   </component>
-  <component name="StarteamVcsAdapter" />
-  <component name="VssVcs" />
-  <component name="XSLT-Support.FileAssociationsManager" />
+  <component name="TeamCityRootDirectoryHolder">
+    <option name="myRelativeRootDirectory" />
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="svn" />
+  </component>
   <component name="com.intellij.jsf.UserDefinedFacesConfigs">
     <option name="USER_DEFINED_CONFIGS">
       <value>
       </value>
     </option>
   </component>
-  <component name="libraryTable" />
   <component name="uidesigner-configuration">
     <option name="INSTRUMENT_CLASSES" value="true" />
     <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
     <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
   </component>
-  <UsedPathMacros />
 </project>
 

providers/ejb/ejb.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build" />
     <exclude-output />

providers/ejb3/ejb3.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <datasource-mapping />
+        <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/META-INF/persistence.xml" optional="false" version="1.0" />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build" />
     <exclude-output />

providers/ejb3/src/com/opensymphony/module/propertyset/ejb3/EJBPropertySetImpl.java

 
     item = entityManager.find(PropertyEntry.class, pk);
 
-    boolean update = item != null;
-
     if(item == null)
     {
       item = new PropertyEntry();
         throw new PropertyException("type " + type + " not supported");
     }
 
-    if(update)
-    {
-      entityManager.merge(item);
-    }
-    else
-    {
-      entityManager.persist(item);
-    }
-
+    entityManager.merge(item);
     if(mustCommit)
     {
       entityManager.getTransaction().commit();
     }
   }
 
+  @TransactionAttribute
+  public void setAsActualType(String key, Object value) throws PropertyException {
+    super.setAsActualType(key, value);
+  }
+
+  @TransactionAttribute
+  public void setBoolean(String key, boolean value) {
+    super.setBoolean(key, value);
+  }
+
+  @TransactionAttribute
+  public void setDate(String key, Date value) {
+    super.setDate(key, value);
+  }
+
+  @TransactionAttribute
+  public void setData(String key, byte[] value) {
+    super.setData(key, value);
+  }
+
+  @TransactionAttribute
+  public void setDouble(String key, double value) {
+    super.setDouble(key, value);
+  }
+
+  @TransactionAttribute
+  public void setInt(String key, int value) {
+    super.setInt(key, value);
+  }
+
+  @TransactionAttribute
+  public void setLong(String key, long value) {
+    super.setLong(key, value);
+  }
+
+  @TransactionAttribute
+  public void setObject(String key, Object value) {
+    super.setObject(key, value);
+  }
+
+  @TransactionAttribute
+  public void setProperties(String key, Properties value) {
+    super.setProperties(key, value);
+  }
+
+  @TransactionAttribute
+  public void setText(String key, String value) {
+    super.setText(key, value);
+  }
+
+  @TransactionAttribute
+  public void setString(String key, String value) {
+    super.setString(key, value);
+  }
+
+  @TransactionAttribute
+  public void setXML(String key, Document value) {
+    super.setXML(key, value);
+  }
+
   protected Object get(int type, String key) throws PropertyException
   {
     return get(entityName, entityId, type, key);

providers/hibernate/hibenrate.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build" />
     <exclude-output />

providers/ofbiz/ofbiz.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build" />
     <exclude-output />

providers/ojb/ojb.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build" />
     <exclude-output />

src/test/tests.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../build/test" />
     <exclude-output />
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.