You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2009/03/08 16:45:23 UTC
svn commit: r751448 [3/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...
Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueCollection.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueCollection.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueCollection.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueCollection.java Sun Mar 8 15:45:21 2009
@@ -60,36 +60,7 @@
*/
public Iterator<SecurityAttributeValue> iterator()
{
- return new Iterator<SecurityAttributeValue>()
- {
- private Iterator<SecurityAttributeValue> iter = attributesCollection.iterator();
- private SecurityAttributeValue lastNext = null;
-
- /* (non-Javadoc)
- * @see java.util.Iterator#hasNext()
- */
- public boolean hasNext()
- {
- return iter.hasNext();
- }
-
- /* (non-Javadoc)
- * @see java.util.Iterator#next()
- */
- public SecurityAttributeValue next()
- {
- return lastNext = iter.next();
- }
-
- /* (non-Javadoc)
- * @see java.util.Iterator#remove()
- */
- public void remove()
- {
- iter.remove();
- ((SecurityAttributeValueImpl)lastNext).setInverseRelationship(null);
- }
- };
+ return attributesCollection.iterator();
}
/* (non-Javadoc)
@@ -97,12 +68,7 @@
*/
public boolean remove(Object element)
{
- if (attributesCollection.remove(element))
- {
- ((SecurityAttributeValueImpl)element).setInverseRelationship(null);
- return true;
- }
- return false;
+ return attributesCollection.remove(element);
}
/* (non-Javadoc)
Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueImpl.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueImpl.java Sun Mar 8 15:45:21 2009
@@ -55,7 +55,7 @@
@SuppressWarnings("unused")
private int jpaVersion;
@ManyToOne (targetEntity=PersistentJetspeedPrincipal.class, fetch=FetchType.LAZY, optional=false)
- @JoinColumn (name="PRINCIPAL_ID", referencedColumnName="PRINCIPAL_ID")
+ @JoinColumn (name="PRINCIPAL_ID", referencedColumnName="PRINCIPAL_ID", nullable=false)
@SuppressWarnings("unused")
private PersistentJetspeedPrincipal principal;
@Basic
Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/jpa-security.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/jpa-security.xml?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/jpa-security.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/jpa-security.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-security/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/log4j.properties?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/log4j.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/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-sso/src/test/resources/jpa-sso.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/jpa-sso.xml?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/jpa-sso.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/jpa-sso.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-sso/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/log4j.properties?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/log4j.properties (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/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/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java Sun Mar 8 15:45:21 2009
@@ -37,4 +37,6 @@
public void removeDefaults(PortletDefinition pd);
public void removeDefaults(PortletApplication app);
public Map<String, InternalPortletPreference> getDefaultPreferences(PortletDefinition pd);
+ public void removeAll(PortletDefinition pd);
+ public void removeAll(PortletApplication app);
}
Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jpa-jta.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jpa-jta.xml?rev=751448&r1=751447&r2=751448&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jpa-jta.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jpa-jta.xml Sun Mar 8 15:45:21 2009
@@ -71,6 +71,7 @@
<bean id="atomikosTransactionManager" class="com.atomikos.icatch.jta.UserTransactionManager" init-method="init" destroy-method="close" depends-on="atomikosUserTransactionService">
<meta key="j2:cat" value="jpa"/>
<property name="forceShutdown" value="true"/>
+ <property name="transactionTimeout" value="30"/>
</bean>
<bean id="jtaTransactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
<meta key="j2:cat" value="jpa"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org