Menu
▾
▴
[Wonder-cvs] SF.net SVN: wonder:[11566] branches/Wonder_5_0_0_WebObjects_5_4_Branch/ Wonder
|
From: <ms...@us...> - 2010-10-15 19:21:43
|
Revision: 11566
http://wonder.svn.sourceforge.net/wonder/?rev=11566&view=rev
Author: mschrag
Date: 2010-10-15 19:21:35 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
trunk merge
Modified Paths:
--------------
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Applications/JavaMonitor/pom.xml
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Examples/Ajax/ERDivaLookExample/.classpath
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Examples/Reporting/DRGroupingTest/pom.xml
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/Components/AjaxExpansion.api
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Resources/Properties
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/eoaccess/ERXEntityDependencyOrderingDelegate.java
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXAdaptorChannelDelegate.java
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/PlugIns/PostgresqlPlugIn/woproject/resources.include.patternset
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/erxtest/ERXTestSuite.java
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/pom.xml
Added Paths:
-----------
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/formatters/ERXOrdinalFormatter.java
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/ERXOrdinalFormatterTests.java
Removed Paths:
-------------
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/ERXOrdinalFormatterTests.java
Property Changed:
----------------
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java
branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder:11280-11548
+ /trunk/Wonder:11280-11565
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Applications/JavaMonitor/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Applications/JavaMonitor/pom.xml 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Applications/JavaMonitor/pom.xml 2010-10-15 19:21:35 UTC (rev 11566)
@@ -4,11 +4,13 @@
<artifactId>applications</artifactId>
<version>5.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>wonder.applications</groupId>
<artifactId>JavaMonitor</artifactId>
<name>JavaMonitor Application</name>
<packaging>woapplication</packaging>
+
<dependencies>
<dependency>
<groupId>wonder.core</groupId>
@@ -24,6 +26,10 @@
<groupId>wonder.misc</groupId>
<artifactId>JavaMonitorFramework</artifactId>
</dependency>
+ <dependency>
+ <groupId>wonder.eof</groupId>
+ <artifactId>ERRest</artifactId>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>Sources</sourceDirectory>
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Examples/Ajax/ERDivaLookExample/.classpath
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Examples/Ajax/ERDivaLookExample/.classpath 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Examples/Ajax/ERDivaLookExample/.classpath 2010-10-15 19:21:35 UTC (rev 11566)
@@ -17,10 +17,8 @@
<classpathentry kind="con" path="WOFramework/JavaWebObjects"/>
<classpathentry kind="con" path="WOFramework/JavaXML"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/ERDivaLook"/>
<classpathentry kind="con" path="WOFramework/H2PlugIn"/>
<classpathentry kind="con" path="WOFramework/ERMoviesLogic"/>
- <classpathentry combineaccessrules="false" kind="src" path="/ERPrototaculous"/>
<classpathentry kind="con" path="WOFramework/ERPrototaculous"/>
<classpathentry kind="con" path="WOFramework/ERSelenium"/>
<classpathentry kind="con" path="WOFramework/ERTaggable"/>
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Examples/Reporting/DRGroupingTest/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Examples/Reporting/DRGroupingTest/pom.xml 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Examples/Reporting/DRGroupingTest/pom.xml 2010-10-15 19:21:35 UTC (rev 11566)
@@ -23,6 +23,10 @@
<artifactId>DRGrouping</artifactId>
</dependency>
<dependency>
+ <groupId>wonder.businesslogic</groupId>
+ <artifactId>ERMoviesLogic</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.webobjects</groupId>
<artifactId>JavaWebObjects</artifactId>
</dependency>
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/Components/AjaxExpansion.api
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/Components/AjaxExpansion.api 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/Components/AjaxExpansion.api 2010-10-15 19:21:35 UTC (rev 11566)
@@ -24,5 +24,7 @@
<binding name="onFailure"/>
<binding name="onSuccess"/>
<binding name="onExpansionComplete"/>
+ <binding name="openedLabel"/>
+ <binding name="closedLabel"/>
</wo>
</wodefinitions>
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox:11280-11356,11357-11548*
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox:11280-11356,11357-11565*
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css:11280-11548
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js:11280-11548
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js:11280-11548
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images:11280-11356,11357-11548*
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images:11280-11356,11357-11565*
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png:11280-11548
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif:11280-11548
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins:11280-11356,11357-11548*
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins:11280-11356,11357-11565*
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox:11280-11356,11357-11548*
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox:11280-11356,11357-11565*
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css:11280-11548
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox:11280-11356,11357-11548*
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox:11280-11356,11357-11565*
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images:11280-11356,11357-11548*
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images:11280-11356,11357-11565*
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif:11280-11548
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif:11280-11548
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css:11280-11548
+ /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo:2739-11458
/trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo:11280-11548
+ /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo:2739-11458
/trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:2736-11475
/trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:11280-11548
+ /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:2736-11475
/trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod:11280-11565
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Resources/Properties
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Resources/Properties 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Resources/Properties 2010-10-15 19:21:35 UTC (rev 11566)
@@ -279,6 +279,9 @@
## but only if it is activated or remote syncing is on
# er.extensions.ERXDatabaseContext.activate = true
+# Set to true to have this delegate order the operations (e.g. or MS SQL Server)
+com.webobjects.eoaccess.ERXEntityDependencyOrderingDelegate.active = false
+
#########################################################################
# ERXDatabaseContextDelegate
#########################################################################
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/eoaccess/ERXEntityDependencyOrderingDelegate.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/eoaccess/ERXEntityDependencyOrderingDelegate.java 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/com/webobjects/eoaccess/ERXEntityDependencyOrderingDelegate.java 2010-10-15 19:21:35 UTC (rev 11566)
@@ -20,11 +20,16 @@
* <pre>
* ERXDatabaseContextMulticastingDelegate.addDefaultDelegate(new ERXEntityDependencyOrderingDelegate());
* </pre>
- *
+ * To turn this on for a Wonder application, just set this property:
+ * <pre>
+ * com.webobjects.eoaccess.ERXEntityDependencyOrderingDelegate.active = true
+ * </pre>
+ *
* @author chill
*/
public class ERXEntityDependencyOrderingDelegate {
+ public static final String ERXEntityDependencyOrderingDelegateActiveKey = "com.webobjects.eoaccess.ERXEntityDependencyOrderingDelegate.active";
protected NSComparator adaptorOpComparator;
private static Logger logger = Logger.getLogger(ERXEntityDependencyOrderingDelegate.class);
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java 2010-10-15 19:21:35 UTC (rev 11566)
@@ -32,6 +32,7 @@
import com.webobjects.eoaccess.EORelationship;
import com.webobjects.eoaccess.EOSQLExpression;
import com.webobjects.eoaccess.EOUtilities;
+import com.webobjects.eoaccess.ERXEntityDependencyOrderingDelegate;
import com.webobjects.eoaccess.ERXModel;
import com.webobjects.eoaccess.EOQualifierSQLGeneration.Support;
import com.webobjects.eocontrol.EOEditingContext;
@@ -59,6 +60,7 @@
import er.extensions.eof.ERXConstant;
import er.extensions.eof.ERXDatabaseContext;
import er.extensions.eof.ERXDatabaseContextDelegate;
+import er.extensions.eof.ERXDatabaseContextMulticastingDelegate;
import er.extensions.eof.ERXEC;
import er.extensions.eof.ERXEOAccessUtilities;
import er.extensions.eof.ERXEntityClassDescription;
@@ -208,10 +210,20 @@
// False by default
if (ERXValueUtilities.booleanValue(System.getProperty(ERXSharedEOLoader.PatchSharedEOLoadingPropertyKey))) {
ERXSharedEOLoader.patchSharedEOLoading();
- }
- ERXExtensions.configureAdaptorContextRapidTurnAround(this);
- ERXJDBCAdaptor.registerJDBCAdaptor();
- EODatabaseContext.setDefaultDelegate(ERXDatabaseContextDelegate.defaultDelegate());
+ }
+ ERXExtensions.configureAdaptorContextRapidTurnAround(this);
+ ERXJDBCAdaptor.registerJDBCAdaptor();
+
+ if (EODatabaseContext.defaultDelegate() == null) {
+ if (ERXProperties.booleanForKey(ERXEntityDependencyOrderingDelegate.ERXEntityDependencyOrderingDelegateActiveKey)) {
+ ERXDatabaseContextMulticastingDelegate.addDefaultDelegate(new ERXEntityDependencyOrderingDelegate());
+ ERXDatabaseContextMulticastingDelegate.addDefaultDelegate(ERXDatabaseContextDelegate.defaultDelegate());
+ }
+ else {
+ EODatabaseContext.setDefaultDelegate(ERXDatabaseContextDelegate.defaultDelegate());
+ }
+ }
+
ERXAdaptorChannelDelegate.setupDelegate();
NSNotificationCenter.defaultCenter().addObserver(this, new NSSelector("sharedEditingContextWasInitialized", ERXConstant.NotificationClassArray), EOSharedEditingContext.DefaultSharedEditingContextWasInitializedNotification, null);
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java 2010-10-15 19:21:35 UTC (rev 11566)
@@ -2005,20 +2005,21 @@
}
else {
NSData input = response.content();
- byte[] inputBytes = input._bytesNoCopy();
- inputBytesLength = inputBytes.length;
- compressedData = ERXCompressionUtilities.gzipByteArray(inputBytes);
+ inputBytesLength = input.length();
+ compressedData = (inputBytesLength > 0) ? ERXCompressionUtilities.gzipByteArray(input._bytesNoCopy()) : null;
}
- if (compressedData == null) {
- // something went wrong
- }
- else {
- response.setContent(new NSData(compressedData, new NSRange(0, compressedData.length), true));
- response.setHeader(String.valueOf(compressedData.length), "content-length");
- response.setHeader("gzip", "content-encoding");
- if (log.isDebugEnabled()) {
- log.debug("before: " + inputBytesLength + ", after " + compressedData.length + ", time: " + (System.currentTimeMillis() - start));
+ if ( inputBytesLength > 0 ) {
+ if (compressedData == null) {
+ // something went wrong
}
+ else {
+ response.setContent(new NSData(compressedData, new NSRange(0, compressedData.length), true));
+ response.setHeader(String.valueOf(compressedData.length), "content-length");
+ response.setHeader("gzip", "content-encoding");
+ if (log.isDebugEnabled()) {
+ log.debug("before: " + inputBytesLength + ", after " + compressedData.length + ", time: " + (System.currentTimeMillis() - start));
+ }
+ }
}
}
}
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXAdaptorChannelDelegate.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXAdaptorChannelDelegate.java 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXAdaptorChannelDelegate.java 2010-10-15 19:21:35 UTC (rev 11566)
@@ -18,13 +18,13 @@
/**
* Tracks and logs the SQL that gets sent to the database. If the milliseconds
- * used exceed the time specified in the system property
+ * used exceeds the time specified in the system property
* <code>er.extensions.ERXSQLExpressionTracker.trace.milliSeconds.[debug|info|warn|error]</code>,
* and the entity name matches the regular expression
* <code>er.extensions.ERXSQLExpressionTracker.trace.entityMatchPattern</code>
* then the SQL expression is logged together with the time used and the
* parameters. <br />
- * NOTE: to get patched into EOF, this class registers itself for the
+ * NOTE: To get patched into EOF, this class registers itself for the
* <code>EODatabaseContext.DatabaseChannelNeededNotification</code>
* notification and creates a new channel. If you would like to handle creation
* of the channel yourself *and* you need the logging feature, you need to:
@@ -32,7 +32,7 @@
* <li>set the er.extensions.ERXAdaptorChannelDelegate.enabled=false in your
* properties, which will prevent creation of the channel here
* <li>create the channel yourself and set the delegate to
- * {@link ERXAdaptorChannelDelegate.defaultDelegate()}
+ * {@link new ERXAdaptorChannelDelegate()}
* </ul>
* otherwise you just need to set
* er.extensions.ERXAdaptorChannelDelegate.enabled=true
@@ -43,8 +43,6 @@
private static Logger log = Logger.getLogger(ERXAdaptorChannelDelegate.class);
- private static ERXAdaptorChannelDelegate _delegate;
-
private long _lastMilliseconds;
private LinkedList _lastStatements;
@@ -52,18 +50,13 @@
private Boolean _collectLastStatements;
private Integer _numberOfStatementsToCollect;
-
+
public static void setupDelegate() {
- _delegate = new ERXAdaptorChannelDelegate();
- NSNotificationCenter.defaultCenter().addObserver(_delegate,
+ NSNotificationCenter.defaultCenter().addObserver(ERXAdaptorChannelDelegate.class,
new NSSelector("dataBaseChannelNeeded", ERXConstant.NotificationClassArray),
EODatabaseContext.DatabaseChannelNeededNotification, null);
}
- public static ERXAdaptorChannelDelegate delegate() {
- return _delegate;
- }
-
/**
* Implemented so the the thread checks if it should get interrupted.
* @param eoadaptorchannel
@@ -109,15 +102,16 @@
/**
* Answers to the EODataBaseChannelNeeded notification.
- * Creates a new EODatabaseChannel and sets its adaptorChannel delegate to this instance,
+ * Creates a new EODatabaseChannel and sets its adaptorChannel delegate
+ * to a new instance of ERXAdaptorChannelDelegate.
* @param n
*/
- public void dataBaseChannelNeeded(NSNotification n) {
+ static public void dataBaseChannelNeeded(NSNotification n) {
if (ERXProperties.booleanForKeyWithDefault("er.extensions.ERXAdaptorChannelDelegate.enabled", false)) {
EODatabaseContext context = (EODatabaseContext) n.object();
EODatabaseChannel channel = new EODatabaseChannel(context);
context.registerChannel(channel);
- channel.adaptorChannel().setDelegate(this);
+ channel.adaptorChannel().setDelegate(new ERXAdaptorChannelDelegate());
}
}
Copied: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/formatters/ERXOrdinalFormatter.java (from rev 11565, trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/formatters/ERXOrdinalFormatter.java)
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/formatters/ERXOrdinalFormatter.java (rev 0)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/formatters/ERXOrdinalFormatter.java 2010-10-15 19:21:35 UTC (rev 11566)
@@ -0,0 +1,40 @@
+package er.extensions.formatters;
+
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import com.ibm.icu.text.RuleBasedNumberFormat;
+import com.ibm.icu.util.ULocale;
+
+
+
+/**
+ * Formats numbers into 1st, 2nd, 3rd. etc. Not localized (English only at present).
+ *
+ * @author chill
+ */
+public class ERXOrdinalFormatter extends java.text.Format {
+
+
+ public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
+ StringBuffer result = new StringBuffer();
+ if (obj != null) {
+ if ( !(obj instanceof Number)) {
+ throw new RuntimeException("Object of class " + obj.getClass().getCanonicalName() + " passed to ERXOrdinalFormatter");
+ }
+
+ RuleBasedNumberFormat rbnf = new RuleBasedNumberFormat(ULocale.ENGLISH,RuleBasedNumberFormat.ORDINAL);
+ result.append(rbnf.format(obj));
+ }
+
+ return result;
+ }
+
+ /**
+ * API conformance.
+ */
+ public Object parseObject(String source, ParsePosition pos)
+ {
+ throw new RuntimeException("Method not implemented");
+ }
+
+}
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXLog4JConfiguration.java:2736-10716
/branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:10717-11458
/trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:11280-11548
+ /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXLog4JConfiguration.java:2736-10716
/branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:10717-11458
/trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er:11280-11356,11357-11548*
+ /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er:11280-11356,11357-11565*
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel:11280-11356,11357-11548*
+ /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel:11280-11356,11357-11565*
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java:11280-11548
+ /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java:11280-11548
+ /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java:11280-11565
Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java:11280-11548
+ /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java:11280-11565
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/PlugIns/PostgresqlPlugIn/woproject/resources.include.patternset
===================================================================
(Binary files differ)
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/erxtest/ERXTestSuite.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/erxtest/ERXTestSuite.java 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/erxtest/ERXTestSuite.java 2010-10-15 19:21:35 UTC (rev 11566)
@@ -22,7 +22,7 @@
suite.addTestSuite(com.webobjects.foundation.NSMutableSetTest.class);
suite.addTestSuite(com.webobjects.foundation.NSSetTest.class);
suite.addTestSuite(com.webobjects.foundation.NSTimestampTest.class);
-
+
suite.addTestSuite(com.webobjects.eoaccess.ERXEntityTest.class);
suite.addTestSuite(er.extensions.eof.ERXECTest.class);
@@ -36,7 +36,9 @@
suite.addTestSuite(er.extensions.foundation.ERXThreadStorageTest.class);
suite.addTestSuite(er.extensions.foundation.ERXUtilitiesTest.class);
suite.addTestSuite(er.extensions.foundation.ERXValueUtilitiesTest.class);
-
+
+ suite.addTestSuite(er.extensions.formatters.ERXOrdinalFormatterTests.class);
+
suite.addTestSuite(er.extensions.jdbc.MicrosoftSQLHelperTest.class);
suite.addTestSuite(er.extensions.appserver.ERXApplicationTest.class);
Deleted: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/ERXOrdinalFormatterTests.java
===================================================================
--- trunk/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/ERXOrdinalFormatterTests.java 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/ERXOrdinalFormatterTests.java 2010-10-15 19:21:35 UTC (rev 11566)
@@ -1,31 +0,0 @@
-package er.extensions.formatters;
-
-import junit.framework.*;
-
-import er.erxtest.*;
-
-
-/**
- * Tests for ERXOrdinalFormatter.
- *
- * @author chill
- */
-public class ERXOrdinalFormatterTests extends ERXTestCase {
-
-
- public void testEnglishFormat() {
- ERXOrdinalFormatter formatter = new ERXOrdinalFormatter();
-
- Assert.assertEquals("", formatter.format(null));
- Assert.assertEquals("1st", formatter.format(Integer.valueOf(1)));
- Assert.assertEquals("2nd", formatter.format(Integer.valueOf(2)));
- Assert.assertEquals("3rd", formatter.format(Integer.valueOf(3)));
- Assert.assertEquals("4th", formatter.format(Integer.valueOf(4)));
- Assert.assertEquals("10th", formatter.format(Integer.valueOf(10)));
- Assert.assertEquals("11th", formatter.format(Integer.valueOf(11)));
- Assert.assertEquals("20th", formatter.format(Integer.valueOf(20)));
- Assert.assertEquals("21st", formatter.format(Integer.valueOf(21)));
- }
-
-
-}
Copied: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/ERXOrdinalFormatterTests.java (from rev 11565, trunk/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/ERXOrdinalFormatterTests.java)
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/ERXOrdinalFormatterTests.java (rev 0)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Tests/ERXTest/Sources/er/extensions/formatters/ERXOrdinalFormatterTests.java 2010-10-15 19:21:35 UTC (rev 11566)
@@ -0,0 +1,31 @@
+package er.extensions.formatters;
+
+import junit.framework.*;
+
+import er.erxtest.*;
+
+
+/**
+ * Tests for ERXOrdinalFormatter.
+ *
+ * @author chill
+ */
+public class ERXOrdinalFormatterTests extends ERXTestCase {
+
+
+ public void testEnglishFormat() {
+ ERXOrdinalFormatter formatter = new ERXOrdinalFormatter();
+
+ Assert.assertEquals("", formatter.format(null));
+ Assert.assertEquals("1st", formatter.format(Integer.valueOf(1)));
+ Assert.assertEquals("2nd", formatter.format(Integer.valueOf(2)));
+ Assert.assertEquals("3rd", formatter.format(Integer.valueOf(3)));
+ Assert.assertEquals("4th", formatter.format(Integer.valueOf(4)));
+ Assert.assertEquals("10th", formatter.format(Integer.valueOf(10)));
+ Assert.assertEquals("11th", formatter.format(Integer.valueOf(11)));
+ Assert.assertEquals("20th", formatter.format(Integer.valueOf(20)));
+ Assert.assertEquals("21st", formatter.format(Integer.valueOf(21)));
+ }
+
+
+}
Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/pom.xml 2010-10-15 17:36:20 UTC (rev 11565)
+++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/pom.xml 2010-10-15 19:21:35 UTC (rev 11566)
@@ -464,7 +464,7 @@
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.2.1.Final</version>
+ <version>3.2.2.Final</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|