svn commit: r751448 [1/3] - in /portals/jetspeed-2/portal/branches/JPA_BRANCH: components/jetspeed-capability/src/test/resources/ components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/ components/jetspeed-page-manager/src/mai...

[rw...@apache.org]

Author: rwatler
Date: Sun Mar  8 15:45:21 2009
New Revision: 751448

URL: http://svn.apache.org/viewvc?rev=751448&view=rev
Log:
JPA Refinement Commits
-----------------------------------------
- add registry preferences performance test
- turn off verbose JPA/JTA related logging in test cases
- set JTA transaction timeouts
- correct definition of not-null bidirectional members and remove logic that nulled these members in list impls.


Added:
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletpreferences/TestOpenJPAPortletPreferencesPerformance.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletpreferences/TestPortletPreferencesPerformance.java
Modified:
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/jpa-capabilities.xml
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/log4j.properties
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMenuMetadataLocalizedFieldImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMetadataLocalizedFieldImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrder.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrderList.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintsRef.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceList.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValue.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValueList.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintsRef.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkMetadataLocalizedFieldImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintsRef.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/MetadataLocalizedFieldCollection.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMenuMetadataLocalizedFieldImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMetadataLocalizedFieldImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsDefList.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRef.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRefList.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityGlobalSecurityConstraintsRef.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecuritySecurityConstraintImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintDefList.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintList.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsDefImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsRefList.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManagerPerformance.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestOpenJPADatabasePageManagerPerformance.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/jpa-database-page-manager.xml
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/log4j.properties
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/jpa/RuleCriterionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/test/resources/log4j.properties
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/jpa/PortletEntityAccessComponentImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/jpa/DatabasePreference.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/jpa/DatabasePreferenceValue.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/jpa/DatabasePreferenceValueCollection.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/jpa/PortletPreferencesProviderImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/ContainerRuntimeOptionValueImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/CustomPortletModeDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/CustomPortletModeImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/CustomWindowStateDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/CustomWindowStateImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/EventAliasImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/EventDefinitionDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/EventDefinitionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/InitParamDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/InitParamImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/JetspeedServiceReferenceImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/LanguageImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/ParameterAliasImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletApplicationContainerRuntimeOptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletApplicationDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletApplicationDisplayNameImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletApplicationLocalizedFieldImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletDefinitionCollection.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletDefinitionContainerRuntimeOptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletDefinitionDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletDefinitionDisplayNameImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletDefinitionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletDefinitionList.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PortletDefinitionLocalizedFieldImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/ProcessingEventReferenceImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PublicRenderParameterDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PublicRenderParameterImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/PublishingEventReferenceImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/SecurityRoleDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/SecurityRoleImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/SecurityRoleRefDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/SecurityRoleRefImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/SupportedPublicRenderParameterImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/SupportsImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/UserAttributeDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/UserAttributeImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/UserAttributeRefDescriptionImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/jpa/UserAttributeRefImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/resources/jpa-registry.xml
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/resources/log4j.properties
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/resources/registry-test.xml
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueCollection.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueImpl.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/jpa-security.xml
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/log4j.properties
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/jpa-sso.xml
    portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/log4j.properties
    portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java
    portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jpa-jta.xml

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/jpa-capabilities.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/jpa-capabilities.xml?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/jpa-capabilities.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/jpa-capabilities.xml Sun Mar  8 15:45:21 2009
@@ -65,6 +65,7 @@
     </bean>
     <bean id="atomikosTransactionManager" class="com.atomikos.icatch.jta.UserTransactionManager" init-method="init" destroy-method="close" depends-on="atomikosUserTransactionService">
         <property name="forceShutdown" value="true"/>
+        <property name="transactionTimeout" value="60"/>
     </bean>
     <bean id="jtaTransactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
         <property name="transactionManager" ref="atomikosTransactionManager"/>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/log4j.properties?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/log4j.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-capability/src/test/resources/log4j.properties Sun Mar  8 15:45:21 2009
@@ -23,48 +23,64 @@
 
 log4j.rootCategory = ERROR, errorlogging
 
-#log4j.category.openjpa.Tool = INFO, infologging
-#log4j.category.openjpa.Runtime = INFO, infologging
-#log4j.category.openjpa.Remote = WARN, infologging
-#log4j.category.openjpa.DataCache = WARN, infologging
-#log4j.category.openjpa.MetaData = WARN, infologging
-#log4j.category.openjpa.Enhance = WARN, infologging
-#log4j.category.openjpa.Query = WARN, infologging
-#log4j.category.openjpa.jdbc.SQL = WARN, infologging
-#log4j.category.openjpa.jdbc.JDBC = WARN, infologging
-#log4j.category.openjpa.jdbc.Schema = WARN, infologging
-
-log4j.category.org.springframework = DEBUG, infologging
+log4j.category.org.springframework = ERROR, infologging
 log4j.additivity.org.springframework = false
 
-log4j.category.openjpa.Tool = TRACE, infologging
+log4j.category.openjpa.Tool = INFO, infologging
 log4j.additivity.openjpa.Tool = false
-log4j.category.openjpa.Runtime = TRACE, infologging
+log4j.category.openjpa.Runtime = INFO, infologging
 log4j.additivity.openjpa.Runtime = false
-log4j.category.openjpa.Remote = TRACE, infologging
+log4j.category.openjpa.Remote = WARN, infologging
 log4j.additivity.openjpa.Remote = false
-log4j.category.openjpa.DataCache = TRACE, infologging
+log4j.category.openjpa.DataCache = WARN, infologging
 log4j.additivity.openjpa.DataCache = false
-log4j.category.openjpa.MetaData = TRACE, infologging
+log4j.category.openjpa.MetaData = WARN, infologging
 log4j.additivity.openjpa.MetaData = false
-log4j.category.openjpa.Enhance = TRACE, infologging
+log4j.category.openjpa.Enhance = WARN, infologging
 log4j.additivity.openjpa.Enhance = false
-log4j.category.openjpa.Query = TRACE, infologging
+log4j.category.openjpa.Query = WARN, infologging
 log4j.additivity.openjpa.Query = false
-log4j.category.openjpa.jdbc.SQL = TRACE, infologging
+log4j.category.openjpa.jdbc.SQL = WARN, infologging
 log4j.additivity.openjpa.jdbc.SQL = false
-#log4j.category.openjpa.jdbc.JDBC = TRACE, infologging
-log4j.category.openjpa.jdbc.JDBC = DEBUG, infologging
+log4j.category.openjpa.jdbc.JDBC = WARN, infologging
 log4j.additivity.openjpa.jdbc.JDBC = false
-log4j.category.openjpa.jdbc.Schema = TRACE, infologging
+log4j.category.openjpa.jdbc.Schema = WARN, infologging
 log4j.additivity.openjpa.jdbc.Schema = false
 
+log4j.category.atomikos = WARN, infologging
+log4j.additivity.atomikos = false
+
+#log4j.category.org.springframework = DEBUG, infologging
+#log4j.additivity.org.springframework = false
+
+#log4j.category.openjpa.Tool = TRACE, infologging
+#log4j.additivity.openjpa.Tool = false
+#log4j.category.openjpa.Runtime = TRACE, infologging
+#log4j.additivity.openjpa.Runtime = false
+#log4j.category.openjpa.Remote = TRACE, infologging
+#log4j.additivity.openjpa.Remote = false
+#log4j.category.openjpa.DataCache = TRACE, infologging
+#log4j.additivity.openjpa.DataCache = false
+#log4j.category.openjpa.MetaData = TRACE, infologging
+#log4j.additivity.openjpa.MetaData = false
+#log4j.category.openjpa.Enhance = TRACE, infologging
+#log4j.additivity.openjpa.Enhance = false
+#log4j.category.openjpa.Query = TRACE, infologging
+#log4j.additivity.openjpa.Query = false
+#log4j.category.openjpa.jdbc.SQL = TRACE, infologging
+#log4j.additivity.openjpa.jdbc.SQL = false
+##log4j.category.openjpa.jdbc.JDBC = TRACE, infologging
+#log4j.category.openjpa.jdbc.JDBC = DEBUG, infologging
+#log4j.additivity.openjpa.jdbc.JDBC = false
+#log4j.category.openjpa.jdbc.Schema = TRACE, infologging
+#log4j.additivity.openjpa.jdbc.Schema = false
+
+#log4j.category.atomikos = DEBUG, infologging
+#log4j.additivity.atomikos = false
+
 log4j.category.org.apache.jetspeed = DEBUG, infologging
 log4j.additivity.org.apache.jetspeed = false
 
-log4j.category.atomikos = DEBUG, infologging
-log4j.additivity.atomikos = false
-
 log4j.appender.errorlogging = org.apache.log4j.FileAppender
 log4j.appender.errorlogging.file = ${basedir}/target/surefire-reports/tests-error.log
 log4j.appender.errorlogging.layout = org.apache.log4j.PatternLayout

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMenuMetadataLocalizedFieldImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMenuMetadataLocalizedFieldImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMenuMetadataLocalizedFieldImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMenuMetadataLocalizedFieldImpl.java Sun Mar  8 15:45:21 2009
@@ -40,7 +40,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=FolderBaseMenuDefinitionMetadata.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="MENU_ID", referencedColumnName="MENU_ID")
+    @JoinColumn (name="MENU_ID", referencedColumnName="MENU_ID", nullable=false)
     private FolderBaseMenuDefinitionMetadata menu;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMetadataLocalizedFieldImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMetadataLocalizedFieldImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMetadataLocalizedFieldImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderMetadataLocalizedFieldImpl.java Sun Mar  8 15:45:21 2009
@@ -40,7 +40,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=FolderImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="FOLDER_ID", referencedColumnName="FOLDER_ID")
+    @JoinColumn (name="FOLDER_ID", referencedColumnName="FOLDER_ID", nullable=false)
     private FolderImpl folder;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrder.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrder.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrder.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrder.java Sun Mar  8 15:45:21 2009
@@ -46,7 +46,7 @@
     @Column (name="JPA_VERSION")
     private int jpaVersion;
     @ManyToOne (targetEntity=FolderImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="FOLDER_ID", referencedColumnName="FOLDER_ID")
+    @JoinColumn (name="FOLDER_ID", referencedColumnName="FOLDER_ID", nullable=false)
     private FolderImpl folder;
     @Basic
     @Column (name="SORT_ORDER")

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrderList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrderList.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrderList.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderOrderList.java Sun Mar  8 15:45:21 2009
@@ -153,7 +153,6 @@
         FolderOrder removed = (FolderOrder)folder.accessFolderOrders().remove(index);
         if (removed != null)
         {
-            removed.setInverseRelationship(null);
             // save removed element 
             getRemovedFolderOrders().add(removed);
             // clear all cached folder ordering
@@ -173,7 +172,6 @@
         // set in underlying ordered list
         newFolderOrder.setInverseRelationship(folder);
         FolderOrder folderOrder = (FolderOrder)folder.accessFolderOrders().set(index, newFolderOrder);
-        folderOrder.setInverseRelationship(null);
         // set sort order in new element
         newFolderOrder.setSortOrder(folderOrder.getSortOrder());
         // save replaced element

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintImpl.java Sun Mar  8 15:45:21 2009
@@ -44,7 +44,7 @@
     // new class defined only to facilitate JPA table/class mapping
     
     @ManyToOne (targetEntity=FolderImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="FOLDER_ID", referencedColumnName="FOLDER_ID")
+    @JoinColumn (name="FOLDER_ID", referencedColumnName="FOLDER_ID", nullable=false)
     private FolderImpl folder;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintsRef.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintsRef.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintsRef.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/jpa/FolderSecurityConstraintsRef.java Sun Mar  8 15:45:21 2009
@@ -44,7 +44,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=FolderImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="FOLDER_ID", referencedColumnName="FOLDER_ID")
+    @JoinColumn (name="FOLDER_ID", referencedColumnName="FOLDER_ID", nullable=false)
     private FolderImpl folder;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceImpl.java Sun Mar  8 15:45:21 2009
@@ -56,7 +56,7 @@
     @Column (name="JPA_VERSION")
     private int jpaVersion;
     @ManyToOne (targetEntity=FragmentImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="FRAGMENT_ID", referencedColumnName="FRAGMENT_ID")
+    @JoinColumn (name="FRAGMENT_ID", referencedColumnName="FRAGMENT_ID", nullable=false)
     private FragmentImpl fragment;
     @Basic
     @Column (name="NAME")

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceList.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceList.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceList.java Sun Mar  8 15:45:21 2009
@@ -127,7 +127,6 @@
         FragmentPreferenceImpl removed = (FragmentPreferenceImpl)fragment.accessPreferences().remove(index);
         if (removed != null)
         {
-            removed.setInverseRelationship(null);
             getRemovedPreferences().add(removed);
         }
         return removed;
@@ -144,7 +143,6 @@
         // set in underlying ordered list
         newPreference.setInverseRelationship(fragment);
         FragmentPreferenceImpl preference = (FragmentPreferenceImpl)fragment.accessPreferences().set(index, newPreference);
-        preference.setInverseRelationship(null);
         // save replaced element
         getRemovedPreferences().add(preference);
         // return constraints ref

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValue.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValue.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValue.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValue.java Sun Mar  8 15:45:21 2009
@@ -46,7 +46,7 @@
     @Column (name="JPA_VERSION")
     private int jpaVersion;
     @ManyToOne (targetEntity=FragmentPreferenceImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="PREF_ID", referencedColumnName="PREF_ID")
+    @JoinColumn (name="PREF_ID", referencedColumnName="PREF_ID", nullable=false)
     private FragmentPreferenceImpl pref;
     @Basic
     @Column (name="VALUE_ORDER")

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValueList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValueList.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValueList.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentPreferenceValueList.java Sun Mar  8 15:45:21 2009
@@ -115,12 +115,7 @@
     public synchronized Object remove(int index)
     {
         // implement for modifiable AbstractList
-        FragmentPreferenceValue preferenceValue = (FragmentPreferenceValue)preference.accessValues().remove(index);
-        if (preferenceValue != null)
-        {
-            preferenceValue.setInverseRelationship(null);            
-        }
-        return preferenceValue;
+        return preference.accessValues().remove(index);
     }
 
     /* (non-Javadoc)
@@ -134,7 +129,6 @@
         // set in underlying ordered list
         newPreferenceValue.setInverseRelationship(preference);
         FragmentPreferenceValue preferenceValue = (FragmentPreferenceValue)preference.accessValues().set(index, newPreferenceValue);
-        preferenceValue.setInverseRelationship(null);
         // set value order in new element
         newPreferenceValue.setValueOrder(preferenceValue.getValueOrder());
         // return unwrapped preference value string

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintImpl.java Sun Mar  8 15:45:21 2009
@@ -42,7 +42,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=FragmentImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="FRAGMENT_ID", referencedColumnName="FRAGMENT_ID")
+    @JoinColumn (name="FRAGMENT_ID", referencedColumnName="FRAGMENT_ID", nullable=false)
     private FragmentImpl fragment;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintsRef.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintsRef.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintsRef.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/FragmentSecurityConstraintsRef.java Sun Mar  8 15:45:21 2009
@@ -42,7 +42,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=FragmentImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="FRAGMENT_ID", referencedColumnName="FRAGMENT_ID")
+    @JoinColumn (name="FRAGMENT_ID", referencedColumnName="FRAGMENT_ID", nullable=false)
     private FragmentImpl fragment;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkImpl.java Sun Mar  8 15:45:21 2009
@@ -71,7 +71,7 @@
     private boolean hidden;
 
     @ManyToOne (targetEntity=FolderImpl.class, fetch=FetchType.LAZY, optional=false, cascade=CascadeType.PERSIST)
-    @JoinColumn (name="PARENT_ID", referencedColumnName="FOLDER_ID")
+    @JoinColumn (name="PARENT_ID", referencedColumnName="FOLDER_ID", nullable=false)
     private FolderImpl parent;
     @OneToMany (targetEntity=LinkMetadataLocalizedFieldImpl.class, mappedBy="link", fetch=FetchType.LAZY, cascade=CascadeType.ALL)
     private Collection metadataFields;

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkMetadataLocalizedFieldImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkMetadataLocalizedFieldImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkMetadataLocalizedFieldImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkMetadataLocalizedFieldImpl.java Sun Mar  8 15:45:21 2009
@@ -38,7 +38,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=LinkImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="LINK_ID", referencedColumnName="LINK_ID")
+    @JoinColumn (name="LINK_ID", referencedColumnName="LINK_ID", nullable=false)
     private LinkImpl link;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintImpl.java Sun Mar  8 15:45:21 2009
@@ -42,7 +42,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=LinkImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="LINK_ID", referencedColumnName="LINK_ID")
+    @JoinColumn (name="LINK_ID", referencedColumnName="LINK_ID", nullable=false)
     private LinkImpl link;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintsRef.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintsRef.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintsRef.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/LinkSecurityConstraintsRef.java Sun Mar  8 15:45:21 2009
@@ -42,7 +42,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=LinkImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="LINK_ID", referencedColumnName="LINK_ID")
+    @JoinColumn (name="LINK_ID", referencedColumnName="LINK_ID", nullable=false)
     private LinkImpl link;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/MetadataLocalizedFieldCollection.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/MetadataLocalizedFieldCollection.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/MetadataLocalizedFieldCollection.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/MetadataLocalizedFieldCollection.java Sun Mar  8 15:45:21 2009
@@ -59,37 +59,7 @@
      */
     public Iterator iterator()
     {
-        return new Iterator()
-        {
-            private Iterator iter = collection.iterator();
-            private Object lastNext = null;
-
-            /* (non-Javadoc)
-             * @see java.util.Iterator#hasNext()
-             */
-            public boolean hasNext()
-            {
-                return iter.hasNext();
-            }
-
-            /* (non-Javadoc)
-             * @see java.util.Iterator#next()
-             */
-            public Object next()
-            {
-                return lastNext = iter.next();
-            }
-
-            /* (non-Javadoc)
-             * @see java.util.Iterator#remove()
-             */
-            public void remove()
-            {
-                iter.remove();
-                BaseMetadataLocalizedFieldImpl field = (BaseMetadataLocalizedFieldImpl)lastNext;
-                field.setInverseRelationship(null);
-            }            
-        };
+        return collection.iterator();
     }
 
     /* (non-Javadoc)
@@ -98,12 +68,7 @@
     public boolean remove(Object element)
     {
         BaseMetadataLocalizedFieldImpl field = (BaseMetadataLocalizedFieldImpl)element;
-        if (collection.remove(field))
-        {
-            field.setInverseRelationship(null);
-            return true;
-        }
-        return false;
+        return collection.remove(field);
     }
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageImpl.java Sun Mar  8 15:45:21 2009
@@ -81,7 +81,7 @@
     private boolean hidden;
 
     @ManyToOne (targetEntity=FolderImpl.class, fetch=FetchType.LAZY, optional=false, cascade=CascadeType.PERSIST)
-    @JoinColumn (name="PARENT_ID", referencedColumnName="FOLDER_ID")
+    @JoinColumn (name="PARENT_ID", referencedColumnName="FOLDER_ID", nullable=false)
     private FolderImpl parent;
     @OneToMany (targetEntity=PageMetadataLocalizedFieldImpl.class, mappedBy="page", fetch=FetchType.LAZY, cascade=CascadeType.ALL)
     private Collection metadataFields;

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMenuMetadataLocalizedFieldImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMenuMetadataLocalizedFieldImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMenuMetadataLocalizedFieldImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMenuMetadataLocalizedFieldImpl.java Sun Mar  8 15:45:21 2009
@@ -38,7 +38,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=PageBaseMenuDefinitionMetadata.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="MENU_ID", referencedColumnName="MENU_ID")
+    @JoinColumn (name="MENU_ID", referencedColumnName="MENU_ID", nullable=false)
     private PageBaseMenuDefinitionMetadata menu;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMetadataLocalizedFieldImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMetadataLocalizedFieldImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMetadataLocalizedFieldImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageMetadataLocalizedFieldImpl.java Sun Mar  8 15:45:21 2009
@@ -38,7 +38,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=PageImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="PAGE_ID", referencedColumnName="PAGE_ID")
+    @JoinColumn (name="PAGE_ID", referencedColumnName="PAGE_ID", nullable=false)
     private PageImpl page;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintImpl.java Sun Mar  8 15:45:21 2009
@@ -42,7 +42,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=PageImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="PAGE_ID", referencedColumnName="PAGE_ID")
+    @JoinColumn (name="PAGE_ID", referencedColumnName="PAGE_ID", nullable=false)
     private PageImpl page;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsDefList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsDefList.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsDefList.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsDefList.java Sun Mar  8 15:45:21 2009
@@ -127,7 +127,6 @@
         SecurityConstraintsDefImpl removed = (SecurityConstraintsDefImpl)pageSecurity.accessConstraintsDefs().remove(index);
         if (removed != null)
         {
-            removed.setInverseRelationship(null);
             // save removed element 
             getRemovedConstraintsDefs().add(removed);
             // clear cached security constraints definition map
@@ -147,7 +146,6 @@
         // set in underlying ordered list
         newConstraintsDef.setInverseRelationship(pageSecurity);
         SecurityConstraintsDefImpl constraintsDef = (SecurityConstraintsDefImpl)pageSecurity.accessConstraintsDefs().set(index, newConstraintsDef);
-        constraintsDef.setInverseRelationship(null);
         // save replaced element
         getRemovedConstraintsDefs().add(constraintsDef);
         // clear cached security constraints definition map

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRef.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRef.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRef.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRef.java Sun Mar  8 15:45:21 2009
@@ -42,7 +42,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=PageImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="PAGE_ID", referencedColumnName="PAGE_ID")
+    @JoinColumn (name="PAGE_ID", referencedColumnName="PAGE_ID", nullable=false)
     private PageImpl page;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRefList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRefList.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRefList.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityConstraintsRefList.java Sun Mar  8 15:45:21 2009
@@ -152,7 +152,6 @@
         PageSecurityGlobalSecurityConstraintsRef removed = (PageSecurityGlobalSecurityConstraintsRef)pageSecurity.accessGlobalConstraintsRefs().remove(index);
         if (removed != null)
         {
-            removed.setInverseRelationship(null);
             getRemovedConstraintsRefs().add(removed);
         }
         return removed;
@@ -169,7 +168,6 @@
         // set in underlying ordered list
         newConstraintsRef.setInverseRelationship(pageSecurity);
         PageSecurityGlobalSecurityConstraintsRef constraintsRef = (PageSecurityGlobalSecurityConstraintsRef)pageSecurity.accessGlobalConstraintsRefs().set(index, newConstraintsRef);
-        constraintsRef.setInverseRelationship(null);
         // set apply order in new element
         newConstraintsRef.setApplyOrder(constraintsRef.getApplyOrder());
         // save replaced element

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityGlobalSecurityConstraintsRef.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityGlobalSecurityConstraintsRef.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityGlobalSecurityConstraintsRef.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityGlobalSecurityConstraintsRef.java Sun Mar  8 15:45:21 2009
@@ -42,7 +42,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=PageSecurityImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="PAGE_SECURITY_ID", referencedColumnName="PAGE_SECURITY_ID")
+    @JoinColumn (name="PAGE_SECURITY_ID", referencedColumnName="PAGE_SECURITY_ID", nullable=false)
     private PageSecurityImpl pageSecurity;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecurityImpl.java Sun Mar  8 15:45:21 2009
@@ -64,7 +64,7 @@
 public class PageSecurityImpl extends DocumentImpl implements PageSecurity
 {
     @ManyToOne (targetEntity=FolderImpl.class, fetch=FetchType.LAZY, optional=false, cascade=CascadeType.PERSIST)
-    @JoinColumn (name="PARENT_ID", referencedColumnName="FOLDER_ID")
+    @JoinColumn (name="PARENT_ID", referencedColumnName="FOLDER_ID", nullable=false)
     private FolderImpl parent;
     @OneToMany (targetEntity=SecurityConstraintsDefImpl.class, mappedBy="pageSecurity", fetch=FetchType.LAZY, cascade=CascadeType.ALL)
     @OrderBy (value="name ASC")

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecuritySecurityConstraintImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecuritySecurityConstraintImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecuritySecurityConstraintImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/PageSecuritySecurityConstraintImpl.java Sun Mar  8 15:45:21 2009
@@ -42,7 +42,7 @@
     // new class defined only to facilitate JPA table/class mapping
 
     @ManyToOne (targetEntity=SecurityConstraintsDefImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="CONSTRAINTS_DEF_ID", referencedColumnName="CONSTRAINTS_DEF_ID")
+    @JoinColumn (name="CONSTRAINTS_DEF_ID", referencedColumnName="CONSTRAINTS_DEF_ID", nullable=false)
     private SecurityConstraintsDefImpl constraintsDef;
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintDefList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintDefList.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintDefList.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintDefList.java Sun Mar  8 15:45:21 2009
@@ -110,12 +110,7 @@
     public synchronized Object remove(int index)
     {
         // implement for modifiable AbstractList
-        PageSecuritySecurityConstraintImpl removed = (PageSecuritySecurityConstraintImpl)constraintsDef.accessConstraintDefs().remove(index);
-        if (removed != null)
-        {
-            removed.setInverseRelationship(null);
-        }
-        return removed;
+        return constraintsDef.accessConstraintDefs().remove(index);
     }
 
     /* (non-Javadoc)
@@ -129,7 +124,6 @@
         // set in underlying ordered list
         newConstraint.setInverseRelationship(constraintsDef);
         PageSecuritySecurityConstraintImpl constraint = (PageSecuritySecurityConstraintImpl)constraintsDef.accessConstraintDefs().set(index, newConstraint);
-        constraint.setInverseRelationship(null);
         // set apply order in new element
         newConstraint.setApplyOrder(constraint.getApplyOrder());
         // return constraint

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintList.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintList.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintList.java Sun Mar  8 15:45:21 2009
@@ -124,7 +124,6 @@
         BaseSecurityConstraintImpl removed = (BaseSecurityConstraintImpl)constraints.accessConstraints().remove(index);
         if (removed != null)
         {
-            removed.setInverseRelationship(null);
             // clear all cached security constraints
             constraints.clearAllSecurityConstraints();
         }
@@ -142,7 +141,6 @@
         // set in underlying ordered list
         newConstraint.setInverseRelationship(constraintsOwningObject);
         BaseSecurityConstraintImpl constraint = (BaseSecurityConstraintImpl)constraints.accessConstraints().set(index, newConstraint);
-        constraint.setInverseRelationship(null);
         // set apply order in new element
         newConstraint.setApplyOrder(constraint.getApplyOrder());
         // clear all cached security constraints

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsDefImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsDefImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsDefImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsDefImpl.java Sun Mar  8 15:45:21 2009
@@ -56,7 +56,7 @@
     @Column (name="JPA_VERSION")
     private int jpaVersion;
     @ManyToOne (targetEntity=PageSecurityImpl.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="PAGE_SECURITY_ID", referencedColumnName="PAGE_SECURITY_ID")
+    @JoinColumn (name="PAGE_SECURITY_ID", referencedColumnName="PAGE_SECURITY_ID", nullable=false)
     private PageSecurityImpl pageSecurity;
     @Basic
     @Column (name="NAME")

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsRefList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsRefList.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsRefList.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/jpa/SecurityConstraintsRefList.java Sun Mar  8 15:45:21 2009
@@ -175,7 +175,6 @@
         BaseSecurityConstraintsRef removed = (BaseSecurityConstraintsRef)constraints.accessConstraintsRefs().remove(index);
         if (removed != null)
         {
-            removed.setInverseRelationship(null);
             // save removed element 
             getRemovedConstraintsRefs().add(removed);
             // clear all cached security constraints
@@ -195,7 +194,6 @@
         // set in underlying ordered list
         newConstraintsRef.setInverseRelationship(constraintsOwningObject);
         BaseSecurityConstraintsRef constraintsRef = (BaseSecurityConstraintsRef)constraints.accessConstraintsRefs().set(index, newConstraintsRef);
-        constraintsRef.setInverseRelationship(null);
         // set apply order in new element
         newConstraintsRef.setApplyOrder(constraintsRef.getApplyOrder());
         // save replaced element

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java Sun Mar  8 15:45:21 2009
@@ -949,7 +949,7 @@
                 // wait until continue completed
                 try
                 {
-                    if (waitForTest)
+                    if (waitForTest && (sessionException == null))
                     {
                         wait();
                     }

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManagerPerformance.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManagerPerformance.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManagerPerformance.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManagerPerformance.java Sun Mar  8 15:45:21 2009
@@ -17,7 +17,6 @@
 package org.apache.jetspeed.page;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
@@ -27,22 +26,15 @@
 import org.apache.jetspeed.om.common.SecurityConstraint;
 import org.apache.jetspeed.om.common.SecurityConstraintsContext;
 import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.folder.FolderNotFoundException;
 import org.apache.jetspeed.om.folder.MenuDefinition;
 import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
 import org.apache.jetspeed.om.folder.MenuIncludeDefinition;
 import org.apache.jetspeed.om.folder.MenuOptionsDefinition;
 import org.apache.jetspeed.om.folder.MenuSeparatorDefinition;
 import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Link;
 import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.om.page.PageSecurity;
-import org.apache.jetspeed.om.page.SecurityConstraintsDef;
 import org.apache.jetspeed.om.portlet.GenericMetadata;
 import org.apache.jetspeed.om.preference.FragmentPreference;
-import org.apache.jetspeed.page.document.DocumentNotFoundException;
-import org.apache.jetspeed.page.document.FailedToUpdateDocumentException;
-import org.apache.jetspeed.page.document.Node;
 
 import junit.framework.Test;
 
@@ -56,7 +48,7 @@
 {
     private static final Log log = LogFactory.getLog(TestDatabasePageManagerPerformance.class);
 
-    private static final int N = 1;
+    private static final int N = 2;
 
     /**
      * Get ordered test suite.
@@ -65,7 +57,7 @@
      */
     public static Test suite()
     {
-        return createFixturedTestSuite(TestDatabasePageManagerPerformance.class, new String[]{"setupTest", "testPerformance", "teardownTest"});
+        return createFixturedTestSuite(TestDatabasePageManagerPerformance.class, new String[]{"setupTest", "testWritePerformance", "testReadPerformance", "testRemovePerformance", "teardownTest"});
     }
     
     /* (non-Javadoc)
@@ -95,60 +87,93 @@
     }
 
     /**
-     * Execute performance test for page manager.
+     * Execute write performance test for page manager.
      * 
      * @throws Exception
      */
-    public void testPerformance() throws Exception
+    public void testWritePerformance() throws Exception
     {
         PageManager pageManager = (PageManager)scm.getComponent("pageManager");
-        pageManager.reset();
 
+        Page rootPage = makeNewPage(pageManager, "/page0.psml");
+        pageManager.updatePage(rootPage);
+        Folder folder = makeNewFolder(pageManager, "/folder0");
+        pageManager.updateFolder(folder);
+        Page folderPage = makeNewPage(pageManager, "/folder0/page.psml");
+        pageManager.updatePage(folderPage);
         String msg = getClass().getSimpleName()+"."+getName()+" writing...";
         log.info(msg);
         System.out.println(msg);
         long startWrite = System.currentTimeMillis();
-        for (int i = 0; (i < N); i++)
+        for (int i = 1; (i < N); i++)
         {
-            Page rootPage = makeNewPage(pageManager, "/page"+i+".psml");
+            rootPage = makeNewPage(pageManager, "/page"+i+".psml");
             pageManager.updatePage(rootPage);
-            Folder folder = makeNewFolder(pageManager, "/folder"+i);
+            folder = makeNewFolder(pageManager, "/folder"+i);
             pageManager.updateFolder(folder);
-            Page folderPage = makeNewPage(pageManager, "/folder"+i+"/page.psml");
+            folderPage = makeNewPage(pageManager, "/folder"+i+"/page.psml");
             pageManager.updatePage(folderPage);
         }
         long endWrite = System.currentTimeMillis();
         msg = getClass().getSimpleName()+"."+getName()+" write time: "+(endWrite-startWrite);
         log.info(msg);
         System.out.println(msg);
+    }
 
-        msg = getClass().getSimpleName()+"."+getName()+" reading...";
+    /**
+     * Execute read performance test for page manager.
+     * 
+     * @throws Exception
+     */
+    public void testReadPerformance() throws Exception
+    {
+        PageManager pageManager = (PageManager)scm.getComponent("pageManager");
+        
+        Page rootPage = pageManager.getPage("/page0.psml");
+        Folder folder = pageManager.getFolder("/folder0");
+        Page folderPage = pageManager.getPage("/folder0/page.psml");
+        folder.getPages();
+        String msg = getClass().getSimpleName()+"."+getName()+" reading...";
         log.info(msg);
         System.out.println(msg);
         long startRead = System.currentTimeMillis();
         Folder rootFolder = pageManager.getFolder("/");
         rootFolder.getFolders();
-        for (int i = 0; (i < N); i++)
+        for (int i = 1; (i < N); i++)
         {
-            Page rootPage = pageManager.getPage("/page"+i+".psml");
-            Folder folder = pageManager.getFolder("/folder"+i);
-            Page folderPage = pageManager.getPage("/folder"+i+"/page.psml");
+            rootPage = pageManager.getPage("/page"+i+".psml");
+            folder = pageManager.getFolder("/folder"+i);
+            folderPage = pageManager.getPage("/folder"+i+"/page.psml");
             folder.getPages();
         }
         long endRead = System.currentTimeMillis();
         msg = getClass().getSimpleName()+"."+getName()+" read time: "+(endRead-startRead);
         log.info(msg);
         System.out.println(msg);
+    }
+
+    /**
+     * Execute remove performance test for page manager.
+     * 
+     * @throws Exception
+     */
+    public void testRemovePerformance() throws Exception
+    {
+        PageManager pageManager = (PageManager)scm.getComponent("pageManager");
 
-        msg = getClass().getSimpleName()+"."+getName()+" removing...";
+        Page rootPage = pageManager.getPage("/page0.psml");
+        pageManager.removePage(rootPage);
+        Folder folder = pageManager.getFolder("/folder0");
+        pageManager.removeFolder(folder);
+        String msg = getClass().getSimpleName()+"."+getName()+" removing...";
         log.info(msg);
         System.out.println(msg);
         long startRemove = System.currentTimeMillis();
-        for (int i = 0; (i < N); i++)
+        for (int i = 1; (i < N); i++)
         {
-            Page rootPage = pageManager.getPage("/page"+i+".psml");
+            rootPage = pageManager.getPage("/page"+i+".psml");
             pageManager.removePage(rootPage);
-            Folder folder = pageManager.getFolder("/folder"+i);
+            folder = pageManager.getFolder("/folder"+i);
             pageManager.removeFolder(folder);
         }
         long endRemove = System.currentTimeMillis();

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestOpenJPADatabasePageManagerPerformance.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestOpenJPADatabasePageManagerPerformance.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestOpenJPADatabasePageManagerPerformance.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestOpenJPADatabasePageManagerPerformance.java Sun Mar  8 15:45:21 2009
@@ -38,8 +38,7 @@
      */
     public static Test suite()
     {
-        // All methods starting with "test" will be executed in the test suite.
-        return createFixturedTestSuite(TestOpenJPADatabasePageManagerPerformance.class, new String[]{"setupTest", "testPerformance", "teardownTest"});
+        return createFixturedTestSuite(TestOpenJPADatabasePageManagerPerformance.class, new String[]{"setupTest", "testWritePerformance", "testReadPerformance", "testRemovePerformance", "teardownTest"});
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/jpa-database-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/jpa-database-page-manager.xml?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/jpa-database-page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/jpa-database-page-manager.xml Sun Mar  8 15:45:21 2009
@@ -65,6 +65,7 @@
     </bean>
     <bean id="atomikosTransactionManager" class="com.atomikos.icatch.jta.UserTransactionManager" init-method="init" destroy-method="close" depends-on="atomikosUserTransactionService">
         <property name="forceShutdown" value="true"/>
+        <property name="transactionTimeout" value="60"/>
     </bean>
     <bean id="jtaTransactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
         <property name="transactionManager" ref="atomikosTransactionManager"/>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/log4j.properties?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/log4j.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-page-manager/src/test/resources/log4j.properties Sun Mar  8 15:45:21 2009
@@ -23,48 +23,64 @@
 
 log4j.rootCategory = ERROR, errorlogging
 
-#log4j.category.openjpa.Tool = INFO, infologging
-#log4j.category.openjpa.Runtime = INFO, infologging
-#log4j.category.openjpa.Remote = WARN, infologging
-#log4j.category.openjpa.DataCache = WARN, infologging
-#log4j.category.openjpa.MetaData = WARN, infologging
-#log4j.category.openjpa.Enhance = WARN, infologging
-#log4j.category.openjpa.Query = WARN, infologging
-#log4j.category.openjpa.jdbc.SQL = WARN, infologging
-#log4j.category.openjpa.jdbc.JDBC = WARN, infologging
-#log4j.category.openjpa.jdbc.Schema = WARN, infologging
-
-log4j.category.org.springframework = DEBUG, infologging
+log4j.category.org.springframework = ERROR, infologging
 log4j.additivity.org.springframework = false
 
-log4j.category.openjpa.Tool = TRACE, infologging
+log4j.category.openjpa.Tool = INFO, infologging
 log4j.additivity.openjpa.Tool = false
-log4j.category.openjpa.Runtime = TRACE, infologging
+log4j.category.openjpa.Runtime = INFO, infologging
 log4j.additivity.openjpa.Runtime = false
-log4j.category.openjpa.Remote = TRACE, infologging
+log4j.category.openjpa.Remote = WARN, infologging
 log4j.additivity.openjpa.Remote = false
-log4j.category.openjpa.DataCache = TRACE, infologging
+log4j.category.openjpa.DataCache = WARN, infologging
 log4j.additivity.openjpa.DataCache = false
-log4j.category.openjpa.MetaData = TRACE, infologging
+log4j.category.openjpa.MetaData = WARN, infologging
 log4j.additivity.openjpa.MetaData = false
-log4j.category.openjpa.Enhance = TRACE, infologging
+log4j.category.openjpa.Enhance = WARN, infologging
 log4j.additivity.openjpa.Enhance = false
-log4j.category.openjpa.Query = TRACE, infologging
+log4j.category.openjpa.Query = WARN, infologging
 log4j.additivity.openjpa.Query = false
-log4j.category.openjpa.jdbc.SQL = TRACE, infologging
+log4j.category.openjpa.jdbc.SQL = WARN, infologging
 log4j.additivity.openjpa.jdbc.SQL = false
-#log4j.category.openjpa.jdbc.JDBC = TRACE, infologging
-log4j.category.openjpa.jdbc.JDBC = DEBUG, infologging
+log4j.category.openjpa.jdbc.JDBC = WARN, infologging
 log4j.additivity.openjpa.jdbc.JDBC = false
-log4j.category.openjpa.jdbc.Schema = TRACE, infologging
+log4j.category.openjpa.jdbc.Schema = WARN, infologging
 log4j.additivity.openjpa.jdbc.Schema = false
 
+log4j.category.atomikos = WARN, infologging
+log4j.additivity.atomikos = false
+
+#log4j.category.org.springframework = DEBUG, infologging
+#log4j.additivity.org.springframework = false
+
+#log4j.category.openjpa.Tool = TRACE, infologging
+#log4j.additivity.openjpa.Tool = false
+#log4j.category.openjpa.Runtime = TRACE, infologging
+#log4j.additivity.openjpa.Runtime = false
+#log4j.category.openjpa.Remote = TRACE, infologging
+#log4j.additivity.openjpa.Remote = false
+#log4j.category.openjpa.DataCache = TRACE, infologging
+#log4j.additivity.openjpa.DataCache = false
+#log4j.category.openjpa.MetaData = TRACE, infologging
+#log4j.additivity.openjpa.MetaData = false
+#log4j.category.openjpa.Enhance = TRACE, infologging
+#log4j.additivity.openjpa.Enhance = false
+#log4j.category.openjpa.Query = TRACE, infologging
+#log4j.additivity.openjpa.Query = false
+#log4j.category.openjpa.jdbc.SQL = TRACE, infologging
+#log4j.additivity.openjpa.jdbc.SQL = false
+##log4j.category.openjpa.jdbc.JDBC = TRACE, infologging
+#log4j.category.openjpa.jdbc.JDBC = DEBUG, infologging
+#log4j.additivity.openjpa.jdbc.JDBC = false
+#log4j.category.openjpa.jdbc.Schema = TRACE, infologging
+#log4j.additivity.openjpa.jdbc.Schema = false
+
+#log4j.category.atomikos = DEBUG, infologging
+#log4j.additivity.atomikos = false
+
 log4j.category.org.apache.jetspeed = DEBUG, infologging
 log4j.additivity.org.apache.jetspeed = false
 
-log4j.category.atomikos = DEBUG, infologging
-log4j.additivity.atomikos = false
-
 log4j.appender.errorlogging = org.apache.log4j.FileAppender
 log4j.appender.errorlogging.file = ${basedir}/target/surefire-reports/tests-error.log
 log4j.appender.errorlogging.layout = org.apache.log4j.PatternLayout

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/jpa/RuleCriterionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/jpa/RuleCriterionImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/jpa/RuleCriterionImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/profiler/rules/jpa/RuleCriterionImpl.java Sun Mar  8 15:45:21 2009
@@ -52,7 +52,7 @@
     @Column (name="JPA_VERSION")
     private int jpaVersion;
     @ManyToOne (targetEntity=AbstractProfilingRule.class, fetch=FetchType.LAZY, optional=false)
-    @JoinColumn (name="RULE_ID", referencedColumnName="RULE_ID")
+    @JoinColumn (name="RULE_ID", referencedColumnName="RULE_ID", nullable=false)
     private AbstractProfilingRule rule;
     @Basic
     @Column (name="REQUEST_TYPE")

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/test/resources/log4j.properties?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/test/resources/log4j.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/test/resources/log4j.properties Sun Mar  8 15:45:21 2009
@@ -23,48 +23,64 @@
 
 log4j.rootCategory = ERROR, errorlogging
 
-#log4j.category.openjpa.Tool = INFO, infologging
-#log4j.category.openjpa.Runtime = INFO, infologging
-#log4j.category.openjpa.Remote = WARN, infologging
-#log4j.category.openjpa.DataCache = WARN, infologging
-#log4j.category.openjpa.MetaData = WARN, infologging
-#log4j.category.openjpa.Enhance = WARN, infologging
-#log4j.category.openjpa.Query = WARN, infologging
-#log4j.category.openjpa.jdbc.SQL = WARN, infologging
-#log4j.category.openjpa.jdbc.JDBC = WARN, infologging
-#log4j.category.openjpa.jdbc.Schema = WARN, infologging
-
-log4j.category.org.springframework = DEBUG, infologging
+log4j.category.org.springframework = ERROR, infologging
 log4j.additivity.org.springframework = false
 
-log4j.category.openjpa.Tool = TRACE, infologging
+log4j.category.openjpa.Tool = INFO, infologging
 log4j.additivity.openjpa.Tool = false
-log4j.category.openjpa.Runtime = TRACE, infologging
+log4j.category.openjpa.Runtime = INFO, infologging
 log4j.additivity.openjpa.Runtime = false
-log4j.category.openjpa.Remote = TRACE, infologging
+log4j.category.openjpa.Remote = WARN, infologging
 log4j.additivity.openjpa.Remote = false
-log4j.category.openjpa.DataCache = TRACE, infologging
+log4j.category.openjpa.DataCache = WARN, infologging
 log4j.additivity.openjpa.DataCache = false
-log4j.category.openjpa.MetaData = TRACE, infologging
+log4j.category.openjpa.MetaData = WARN, infologging
 log4j.additivity.openjpa.MetaData = false
-log4j.category.openjpa.Enhance = TRACE, infologging
+log4j.category.openjpa.Enhance = WARN, infologging
 log4j.additivity.openjpa.Enhance = false
-log4j.category.openjpa.Query = TRACE, infologging
+log4j.category.openjpa.Query = WARN, infologging
 log4j.additivity.openjpa.Query = false
-log4j.category.openjpa.jdbc.SQL = TRACE, infologging
+log4j.category.openjpa.jdbc.SQL = WARN, infologging
 log4j.additivity.openjpa.jdbc.SQL = false
-#log4j.category.openjpa.jdbc.JDBC = TRACE, infologging
-log4j.category.openjpa.jdbc.JDBC = DEBUG, infologging
+log4j.category.openjpa.jdbc.JDBC = WARN, infologging
 log4j.additivity.openjpa.jdbc.JDBC = false
-log4j.category.openjpa.jdbc.Schema = TRACE, infologging
+log4j.category.openjpa.jdbc.Schema = WARN, infologging
 log4j.additivity.openjpa.jdbc.Schema = false
 
+log4j.category.atomikos = WARN, infologging
+log4j.additivity.atomikos = false
+
+#log4j.category.org.springframework = DEBUG, infologging
+#log4j.additivity.org.springframework = false
+
+#log4j.category.openjpa.Tool = TRACE, infologging
+#log4j.additivity.openjpa.Tool = false
+#log4j.category.openjpa.Runtime = TRACE, infologging
+#log4j.additivity.openjpa.Runtime = false
+#log4j.category.openjpa.Remote = TRACE, infologging
+#log4j.additivity.openjpa.Remote = false
+#log4j.category.openjpa.DataCache = TRACE, infologging
+#log4j.additivity.openjpa.DataCache = false
+#log4j.category.openjpa.MetaData = TRACE, infologging
+#log4j.additivity.openjpa.MetaData = false
+#log4j.category.openjpa.Enhance = TRACE, infologging
+#log4j.additivity.openjpa.Enhance = false
+#log4j.category.openjpa.Query = TRACE, infologging
+#log4j.additivity.openjpa.Query = false
+#log4j.category.openjpa.jdbc.SQL = TRACE, infologging
+#log4j.additivity.openjpa.jdbc.SQL = false
+##log4j.category.openjpa.jdbc.JDBC = TRACE, infologging
+#log4j.category.openjpa.jdbc.JDBC = DEBUG, infologging
+#log4j.additivity.openjpa.jdbc.JDBC = false
+#log4j.category.openjpa.jdbc.Schema = TRACE, infologging
+#log4j.additivity.openjpa.jdbc.Schema = false
+
+#log4j.category.atomikos = DEBUG, infologging
+#log4j.additivity.atomikos = false
+
 log4j.category.org.apache.jetspeed = DEBUG, infologging
 log4j.additivity.org.apache.jetspeed = false
 
-log4j.category.atomikos = DEBUG, infologging
-log4j.additivity.atomikos = false
-
 log4j.appender.errorlogging = org.apache.log4j.FileAppender
 log4j.appender.errorlogging.file = ${basedir}/target/surefire-reports/tests-error.log
 log4j.appender.errorlogging.layout = org.apache.log4j.PatternLayout

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/jpa/PortletEntityAccessComponentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/jpa/PortletEntityAccessComponentImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/jpa/PortletEntityAccessComponentImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/jpa/PortletEntityAccessComponentImpl.java Sun Mar  8 15:45:21 2009
@@ -22,8 +22,6 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
 import javax.persistence.Query;
 
 import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org