wonder-cvs Mailing List for Project WONDER

wonder-cvs — CVS Activity

You can subscribe to this list here.

2002	Jan	Feb (239)	Mar (153)	Apr (426)	May (146)	Jun (207)	Jul (217)	Aug (292)	Sep (261)	Oct (343)	Nov (372)	Dec (468)
2003	Jan (378)	Feb (136)	Mar (243)	Apr (110)	May (166)	Jun (80)	Jul (6)	Aug (168)	Sep (379)	Oct (98)	Nov (132)	Dec (34)
2004	Jan (115)	Feb (161)	Mar (283)	Apr (185)	May (67)	Jun (71)	Jul (46)	Aug (52)	Sep (65)	Oct (39)	Nov (45)	Dec (96)
2005	Jan (58)	Feb (71)	Mar (36)	Apr (37)	May (74)	Jun (16)	Jul (54)	Aug (99)	Sep (111)	Oct (81)	Nov (42)	Dec (27)
2006	Jan (162)	Feb (30)	Mar (156)	Apr (122)	May (132)	Jun (135)	Jul (172)	Aug (170)	Sep (307)	Oct (322)	Nov (181)	Dec (349)
2007	Jan (390)	Feb (436)	Mar (208)	Apr (214)	May (833)	Jun (320)	Jul (296)	Aug (377)	Sep (131)	Oct (179)	Nov (261)	Dec (94)
2008	Jan (337)	Feb (414)	Mar (275)	Apr (410)	May (548)	Jun (217)	Jul (290)	Aug (160)	Sep (115)	Oct (180)	Nov (231)	Dec (138)
2009	Jan (117)	Feb (135)	Mar (203)	Apr (244)	May (173)	Jun (177)	Jul (167)	Aug (154)	Sep (269)	Oct (208)	Nov (238)	Dec (153)
2010	Jan (171)	Feb (197)	Mar (84)	Apr (103)	May (92)	Jun (103)	Jul (117)	Aug (132)	Sep (334)	Oct (240)	Nov (139)	Dec (83)
2011	Jan (92)	Feb (78)	Mar (44)	Apr (4)	May (19)	Jun (4)	Jul (5)	Aug (1)	Sep (1)	Oct (6)	Nov (12)	Dec (1)
2012	Jan	Feb (15)	Mar (9)	Apr (1)	May (27)	Jun (3)	Jul (5)	Aug (4)	Sep	Oct (9)	Nov	Dec

Flat | Threaded

1 2 3 .. 816 > >> (Page 1 of 816)

[Wonder-cvs] SF.net SVN: wonder:[12122] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/components /ERMDHasChangesMarker.java

From: <an...@us...> - 2012-10-24 10:19:13

Revision: 12122
          http://wonder.svn.sourceforge.net/wonder/?rev=12122&view=rev
Author:   anjo
Date:     2012-10-24 10:19:02 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
resetting ivars

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/components/ERMDHasChangesMarker.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/components/ERMDHasChangesMarker.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/components/ERMDHasChangesMarker.java	2012-10-21 20:59:20 UTC (rev 12121)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/components/ERMDHasChangesMarker.java	2012-10-24 10:19:02 UTC (rev 12122)
@@ -63,4 +63,10 @@
 		_indicatorFileName = name;
 	}
     
+	@Override
+	public void reset() {
+		_indicatorFileName = null;
+		_indicatorFrameworkName = null;
+		super.reset();
+	}
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12121] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions

From: <an...@us...> - 2012-10-21 20:59:26

Revision: 12121
          http://wonder.svn.sourceforge.net/wonder/?rev=12121&view=rev
Author:   anjo
Date:     2012-10-21 20:59:20 +0000 (Sun, 21 Oct 2012)
Log Message:
-----------
DADT fixes

Added Paths:
-----------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/.classpath.extra
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/.classpath.normal

Added: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/.classpath.extra
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/.classpath.extra	                        (rev 0)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/.classpath.extra	2012-10-21 20:59:20 UTC (rev 12121)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="com/webobjects/foundation/NSDictionary.java|com/webobjects/foundation/NSMutableDictionary.java|com/webobjects/foundation/NSMutableSet.java|com/webobjects/foundation/NSSet.java" kind="src" path="Sources"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/ERJars"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaWOExtensions"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaEOAccess"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaEOControl"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaEOProject"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaFoundation"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaJDBCAdaptor"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaWebObjects"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaWOJSPServlet"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaXML"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/.classpath.normal
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/.classpath.normal	                        (rev 0)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/.classpath.normal	2012-10-21 20:59:20 UTC (rev 12121)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="Sources"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/ERJars"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaWOExtensions"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaEOAccess"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaEOControl"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaEOProject"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaFoundation"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaJDBCAdaptor"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaWebObjects"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaWOJSPServlet"/>
+	<classpathentry exported="true" kind="con" path="WOFramework/JavaXML"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12120] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions/Sources/er/extensions

From: <an...@us...> - 2012-10-21 20:58:00

Revision: 12120
          http://wonder.svn.sourceforge.net/wonder/?rev=12120&view=rev
Author:   anjo
Date:     2012-10-21 20:57:53 +0000 (Sun, 21 Oct 2012)
Log Message:
-----------
DADT fixes

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEC.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOControlUtilities.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEditingContextDelegate.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXMutableDictionary.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXJDBCAdaptor.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationColumn.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationTable.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/partials/ERXPartialGenericRecord.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java	2012-10-21 19:05:43 UTC (rev 12119)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java	2012-10-21 20:57:53 UTC (rev 12120)
@@ -403,7 +403,7 @@
      */
     public void sharedEditingContextWasInitialized(NSNotification n) {
     	EOSharedEditingContext sec = EOSharedEditingContext.defaultSharedEditingContext();
-    	ERXEC.factory().setDefaultDelegateOnEditingContext(sec, true);
+    	ERXEC._factory().setDefaultDelegateOnEditingContext(sec, true);
     }
 
     /** logging support for the adaptor channel */

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEC.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEC.java	2012-10-21 19:05:43 UTC (rev 12119)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEC.java	2012-10-21 20:57:53 UTC (rev 12120)
@@ -1652,7 +1652,7 @@
 	 * 
 	 * @return editing context factory
 	 */
-	public static Factory factory() {
+	public static Factory _factory() {
 		if (factory == null) {
 			factory = new DefaultFactory();
 		}
@@ -1676,7 +1676,7 @@
 	 * @return a newly created editing context with the default delegate set.
 	 */
 	public static EOEditingContext newEditingContext() {
-		return factory()._newEditingContext();
+		return _factory()._newEditingContext();
 	}
 
 	/**
@@ -1735,7 +1735,7 @@
 	 *         delegate corresponding to the validation flag
 	 */
 	public static EOEditingContext newEditingContext(EOObjectStore parent, boolean validationEnabled) {
-		return factory()._newEditingContext(parent, validationEnabled);
+		return _factory()._newEditingContext(parent, validationEnabled);
 	}
 
 	/**
@@ -1752,7 +1752,7 @@
 	 *         disabled validation.
 	 */
 	public static EOEditingContext newEditingContext(boolean validation) {
-		return factory()._newEditingContext(validation);
+		return _factory()._newEditingContext(validation);
 	}
 
 	/**
@@ -1768,7 +1768,7 @@
 	 * @return new editing context with the given parent object store
 	 */
 	public static EOEditingContext newEditingContext(EOObjectStore objectStore) {
-		return factory()._newEditingContext(objectStore);
+		return _factory()._newEditingContext(objectStore);
 	}
 
 	/**

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOControlUtilities.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOControlUtilities.java	2012-10-21 19:05:43 UTC (rev 12119)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOControlUtilities.java	2012-10-21 20:57:53 UTC (rev 12120)
@@ -659,8 +659,8 @@
         spec.setRawRowKeyPaths(pkNames);
     	EOFetchSpecification clonedFetchSpec = (EOFetchSpecification)spec.clone();
         EOSQLExpression sql = ERXEOAccessUtilities.sqlExpressionForFetchSpecification(ec, clonedFetchSpec, start, end);
-        NSDictionary<String, EOSQLExpression> hints = new NSDictionary<String, EOSQLExpression>(sql, EODatabaseContext.CustomQueryExpressionHintKey);
-        clonedFetchSpec.setHints(hints);
+        NSDictionary<String, Object> hints = new NSDictionary<String, Object>(sql, EODatabaseContext.CustomQueryExpressionHintKey);
+        clonedFetchSpec.setHints((NSDictionary)hints);
         return ec.objectsWithFetchSpecification(clonedFetchSpec);
     }
     
@@ -1173,7 +1173,7 @@
         }
         
         if(string.trim().length()==0) {
-            return NSDictionary.EmptyDictionary;
+            return (NSDictionary)NSDictionary.EmptyDictionary;
         }
         
         EOEntity entity = ERXEOAccessUtilities.entityNamed(ec, entityName);

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEditingContextDelegate.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEditingContextDelegate.java	2012-10-21 19:05:43 UTC (rev 12119)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEditingContextDelegate.java	2012-10-21 20:57:53 UTC (rev 12120)
@@ -62,7 +62,7 @@
             }
             if(!_raiseOnMissingEditingContextDelegate) {
                 log.warn("Found null delegate. I will fix this for now by setting it to ERXExtensions.defaultDelegate");
-                ERXEC.factory().setDefaultDelegateOnEditingContext(editingContext);
+                ERXEC._factory().setDefaultDelegateOnEditingContext(editingContext);
                 return true;
             } else {
                 throw new IllegalStateException("Found null delegate. You can disable this check by setting er.extensions.ERXRaiseOnMissingEditingContextDelegate=false in your WebObjects.properties");

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXMutableDictionary.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXMutableDictionary.java	2012-10-21 19:05:43 UTC (rev 12119)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXMutableDictionary.java	2012-10-21 20:57:53 UTC (rev 12120)
@@ -21,7 +21,8 @@
  * Adds {@link java.util.Map} functionality to NSMutableDictionary and has
  * helpers to en- and decode from database field.
  * <code>ERPrototype name = mutableDictionary</code>
- * @param <V>
+ * @param <K> key
+ * @param <V> value
  */
 public class ERXMutableDictionary<K,V> extends NSMutableDictionary<K,V> {
 
@@ -113,6 +114,7 @@
 
 	/**
 	 * @param key
+	 * @return boolean value for the supplied key
 	 */
 	public Boolean booleanObjectForKey(K key) {
 		Object o = objectForKey(key);
@@ -127,6 +129,8 @@
 	 * instead and we will fix all the bugs in due time.
 	 * 
 	 * @author ak
+	 * @param <K> 
+	 * @param <V> 
 	 * 
 	 */
 
@@ -162,7 +166,7 @@
 		}
 
 		@Override
-		public synchronized void removeObjectsForKeys(NSArray<?> keys) {
+		public synchronized void removeObjectsForKeys(NSArray keys) {
 			super.removeObjectsForKeys(keys);
 		}
 
@@ -172,8 +176,8 @@
 		}
 
 		@Override
-		public synchronized void setObjectForKey(V object, K key) {
-			super.setObjectForKey(object, key);
+		public synchronized void setObjectForKey(Object object, Object key) {
+			super.setObjectForKey((V)object, (K)key);
 		}
 
 		@Override
@@ -254,9 +258,10 @@
 			return super.hashtable();
 		}
 
+		@SuppressWarnings("cast")
 		@Override
-		public synchronized boolean isEqualToDictionary(NSDictionary<? extends K, ? extends V> otherDictionary) {
-			return super.isEqualToDictionary(otherDictionary);
+		public synchronized boolean isEqualToDictionary(NSDictionary otherDictionary) {
+			return super.isEqualToDictionary((NSDictionary)otherDictionary);
 		}
 
 		@Override
@@ -280,8 +285,8 @@
 		}
 
 		@Override
-		public synchronized NSArray<V> objectsForKeys(NSArray<? extends K> keys, V notFoundMarker) {
-			return super.objectsForKeys(keys, notFoundMarker);
+		public synchronized NSArray<V> objectsForKeys(NSArray keys, Object notFoundMarker) {
+			return super.objectsForKeys(keys, (V) notFoundMarker);
 		}
 
 		@Override

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXJDBCAdaptor.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXJDBCAdaptor.java	2012-10-21 19:05:43 UTC (rev 12119)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXJDBCAdaptor.java	2012-10-21 20:57:53 UTC (rev 12120)
@@ -365,7 +365,7 @@
 			return _cachedChannel;
 		}
 
-		public EOAdaptorChannel createAdaptorChannel() {
+		public JDBCChannel createAdaptorChannel() {
 			if (_cachedChannel != null) {
 				JDBCChannel jdbcchannel = _cachedChannel;
 				_cachedChannel = null;

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationColumn.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationColumn.java	2012-10-21 19:05:43 UTC (rev 12119)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationColumn.java	2012-10-21 20:57:53 UTC (rev 12120)
@@ -394,7 +394,7 @@
 	@SuppressWarnings("unchecked")
 	public NSArray<EOSQLExpression> _createExpressions() {
 		EOSchemaSynchronization schemaSynchronization = _table.database().synchronizationFactory();
-		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToInsertColumnForAttribute(_newAttribute(), NSDictionary.EmptyDictionary);
+		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToInsertColumnForAttribute(_newAttribute(), (NSDictionary)NSDictionary.EmptyDictionary);
 		ERXMigrationDatabase._ensureNotEmpty(expressions, "add column", true);
 		return expressions;
 	}
@@ -423,7 +423,7 @@
 	@SuppressWarnings("unchecked")
 	public NSArray<EOSQLExpression> _deleteExpressions() {
 		EOSchemaSynchronization schemaSynchronization = _table.database().synchronizationFactory();
-		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToDeleteColumnNamed(name(), _table.name(), NSDictionary.EmptyDictionary);
+		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToDeleteColumnNamed(name(), _table.name(), (NSDictionary)NSDictionary.EmptyDictionary);
 		ERXMigrationDatabase._ensureNotEmpty(expressions, "delete column", true);
 		return expressions;
 	}
@@ -449,7 +449,7 @@
 	@SuppressWarnings("unchecked")
 	public NSArray<EOSQLExpression> _renameToExpressions(String newName) {
 		EOSchemaSynchronization schemaSynchronization = _table.database().synchronizationFactory();
-		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToRenameColumnNamed(name(), _table.name(), newName, NSDictionary.EmptyDictionary);
+		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToRenameColumnNamed(name(), _table.name(), newName, (NSDictionary)NSDictionary.EmptyDictionary);
 		ERXMigrationDatabase._ensureNotEmpty(expressions, "rename column", true);
 		_setName(newName);
 		return expressions;
@@ -478,7 +478,7 @@
 	@SuppressWarnings("unchecked")
 	public void setAllowsNull(boolean allowsNull) throws SQLException {
 		EOSchemaSynchronization schemaSynchronization = _table.database().synchronizationFactory();
-		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToModifyColumnNullRule(name(), _table.name(), allowsNull, NSDictionary.EmptyDictionary);
+		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToModifyColumnNullRule(name(), _table.name(), allowsNull, (NSDictionary)NSDictionary.EmptyDictionary);
 		ERXMigrationDatabase._ensureNotEmpty(expressions, "modify allows null", true);
 		ERXJDBCUtilities.executeUpdateScript(_table.database().adaptorChannel(), ERXMigrationDatabase._stringsForExpressions(expressions));
 	}

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationTable.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationTable.java	2012-10-21 19:05:43 UTC (rev 12119)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationTable.java	2012-10-21 20:57:53 UTC (rev 12120)
@@ -902,7 +902,7 @@
 	@SuppressWarnings("unchecked")
 	public NSArray<EOSQLExpression> _renameToExpressions(String newName) {
 		EOSchemaSynchronization schemaSynchronization = _database.synchronizationFactory();
-		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToRenameTableNamed(name(), newName, NSDictionary.EmptyDictionary);
+		NSArray<EOSQLExpression> expressions = schemaSynchronization.statementsToRenameTableNamed(name(), newName, (NSDictionary)NSDictionary.EmptyDictionary);
 		ERXMigrationDatabase._ensureNotEmpty(expressions, "rename table", true);
 		return expressions;
 	}

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/partials/ERXPartialGenericRecord.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/partials/ERXPartialGenericRecord.java	2012-10-21 19:05:43 UTC (rev 12119)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/partials/ERXPartialGenericRecord.java	2012-10-21 20:57:53 UTC (rev 12120)
@@ -33,7 +33,7 @@
 			ERXEntityClassDescription cd = (ERXEntityClassDescription) classDescription();
 			NSArray<Class<ERXPartial>> partialEntityClasses = cd.partialClasses();
 			if (partialEntityClasses == null || partialEntityClasses.count() == 0) {
-				_partials = NSMutableDictionary.EmptyDictionary;
+				_partials = (NSDictionary)NSMutableDictionary.EmptyDictionary;
 			}
 			else {
 				NSMutableDictionary<Class, ERXPartial> partials = new NSMutableDictionary<Class, ERXPartial>();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12119] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ build.xml

From: <an...@us...> - 2012-10-21 19:05:50

Revision: 12119
          http://wonder.svn.sourceforge.net/wonder/?rev=12119&view=rev
Author:   anjo
Date:     2012-10-21 19:05:43 +0000 (Sun, 21 Oct 2012)
Log Message:
-----------
test

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/build.xml

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/build.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/build.xml	2012-10-18 11:42:18 UTC (rev 12118)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/build.xml	2012-10-21 19:05:43 UTC (rev 12119)
@@ -107,3 +107,4 @@
     <target name="all" depends="clean, frameworks, frameworks.install, applications, applications.install, examples, examples.install">
     </target>
 </project>
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12118] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Ajax/Ajax

From: <an...@us...> - 2012-10-18 11:42:29

Revision: 12118
          http://wonder.svn.sourceforge.net/wonder/?rev=12118&view=rev
Author:   anjo
Date:     2012-10-18 11:42:18 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
some customizations to ajaxupload

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/Components/AjaxFlexibleFileUpload.wo/AjaxFlexibleFileUpload.html
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/Components/AjaxFlexibleFileUpload.wo/AjaxFlexibleFileUpload.wod
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/WebServerResources/default_ajaxupload.css

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/Components/AjaxFlexibleFileUpload.wo/AjaxFlexibleFileUpload.html
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/Components/AjaxFlexibleFileUpload.wo/AjaxFlexibleFileUpload.html	2012-10-15 12:30:33 UTC (rev 12117)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/Components/AjaxFlexibleFileUpload.wo/AjaxFlexibleFileUpload.html	2012-10-18 11:42:18 UTC (rev 12118)
@@ -1,5 +1,6 @@
 <webobject name = "OuterUpdateContainer">
   <webobject name = "InnerUpdateContainer">
+    <webobject name = "Content"></webobject>
     <webobject name = "ShowFileSelect">
       <webobject name = "SelectFileLink">
         <span><webobject name = "SelectFileLabel" /></span>

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/Components/AjaxFlexibleFileUpload.wo/AjaxFlexibleFileUpload.wod
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/Components/AjaxFlexibleFileUpload.wo/AjaxFlexibleFileUpload.wod	2012-10-15 12:30:33 UTC (rev 12117)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/Components/AjaxFlexibleFileUpload.wo/AjaxFlexibleFileUpload.wod	2012-10-18 11:42:18 UTC (rev 12118)
@@ -117,3 +117,7 @@
 
 CreateAjaxUploadScript : ERXJavaScript {
 }
+
+Content: WOComponentContent {
+	
+}

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/WebServerResources/default_ajaxupload.css
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/WebServerResources/default_ajaxupload.css	2012-10-15 12:30:33 UTC (rev 12117)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Ajax/Ajax/WebServerResources/default_ajaxupload.css	2012-10-18 11:42:18 UTC (rev 12118)
@@ -26,7 +26,6 @@
 	background-color: #c0c0c0;
 }
 
-.AjaxFlexibleFileUpload .Button,
 .ERAttachmentFlexibleEditor .Button {
 	float: left;
 	background-image: url(btn_blu_sm.png);
@@ -38,7 +37,6 @@
 	margin: 3px 0;
 }
 
-.AjaxFlexibleFileUpload .Button span,
 .ERAttachmentFlexibleEditor .Button span {
 	float: left;
 	background-image: url(btn_blu_sm.png);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12117] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ ERDControllerButton.java

From: <an...@us...> - 2012-10-15 12:30:44

Revision: 12117
          http://wonder.svn.sourceforge.net/wonder/?rev=12117&view=rev
Author:   anjo
Date:     2012-10-15 12:30:33 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
easier CSS setting via rules

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDControllerButton.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDControllerButton.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDControllerButton.java	2012-10-15 10:48:30 UTC (rev 12116)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDControllerButton.java	2012-10-15 12:30:33 UTC (rev 12117)
@@ -39,7 +39,8 @@
     public String cssForChoice() {
     	String css = (String) branch.objectForKey("branchClass");
     	if(css == null) {
-    		css = "";
+    		css = (String)valueForBinding("branchClass");
+    		css = css != null ? css  : "";
     	}
     	css += " " + ERXSubmitButton.STYLE_PREFIX + branch.objectForKey("branchName");
     	if(css.length() ==0 ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12116] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ ERD2WEditString.java

From: <an...@us...> - 2012-10-15 10:48:39

Revision: 12116
          http://wonder.svn.sourceforge.net/wonder/?rev=12116&view=rev
Author:   anjo
Date:     2012-10-15 10:48:30 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
required markers now validate non-attributes (at least for null/empty) in text fields

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERD2WEditString.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERD2WEditString.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERD2WEditString.java	2012-08-09 19:55:47 UTC (rev 12115)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERD2WEditString.java	2012-10-15 10:48:30 UTC (rev 12116)
@@ -7,8 +7,13 @@
 package er.directtoweb.components.strings;
 
 import com.webobjects.appserver.WOContext;
+import com.webobjects.appserver.WORequest;
 import com.webobjects.directtoweb.D2WEditString;
 
+import er.extensions.foundation.ERXValueUtilities;
+import er.extensions.validation.ERXValidationException;
+import er.extensions.validation.ERXValidationFactory;
+
 /**
  * Allows specifing the maxLength for a WOTextField.<br />
  * @d2wKey maxLength
@@ -23,6 +28,16 @@
     public void validationFailedWithException(Throwable theException,Object theValue, String theKeyPath) {
         // This is for number formatting exceptions
         String keyPath = theKeyPath.equals("value") ? propertyKey() : theKeyPath;
-        parent().validationFailedWithException(theException, theValue, keyPath);
-    }
+		parent().validationFailedWithException(theException, theValue, keyPath);
+	}
+
+	@Override
+	public void takeValuesFromRequest(WORequest arg0, WOContext arg1) {
+		super.takeValuesFromRequest(arg0, arg1);
+		// AK: meh... this would belong right in D2WComponent... it's so you can have fake keys that behave like attibutes
+		if (ERXValueUtilities.booleanValue(d2wContext().valueForKey("displayRequiredMarker")) && d2wContext().valueForKey("attribute") == null && value() == null) {
+			ERXValidationException exception = ERXValidationFactory.defaultFactory().createException(object(), propertyKey(), value(), "NullPropertyException");
+			validationFailedWithException(exception, value(), propertyKey());
+		}
+	}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12115] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ ERXStatisticsStore.java

From: <an...@us...> - 2012-08-09 19:55:53

Revision: 12115
          http://wonder.svn.sourceforge.net/wonder/?rev=12115&view=rev
Author:   anjo
Date:     2012-08-09 19:55:47 +0000 (Thu, 09 Aug 2012)
Log Message:
-----------
- we only want to log once every (say) ten secs. Once shit hits the fan, the logging itself makes things worse (and can produce ~800mb files on minutes)
- we only get the traces once, not each time in the iteration. Deep stacks cost a lot...

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java	2012-08-02 14:36:32 UTC (rev 12114)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java	2012-08-09 19:55:47 UTC (rev 12115)
@@ -68,9 +68,10 @@
 	 */
 	class StopWatchTimer implements Runnable {
 
-		long maximumRequestErrorTime;
-		long maximumRequestWarnTime;
-		long maximumRequestFatalTime;
+		long _maximumRequestErrorTime;
+		long _maximumRequestWarnTime;
+		long _maximumRequestFatalTime;
+		long _lastLog;
 
 		Map<Thread, Long> _requestThreads = new WeakHashMap<Thread, Long>();
 		Map<Thread, Map<Thread, StackTraceElement[]>> _warnTraces = Collections.synchronizedMap(new WeakHashMap<Thread, Map<Thread, StackTraceElement[]>>());
@@ -84,9 +85,9 @@
 			Thread timerThread = new Thread(this);
 			timerThread.setDaemon(true);
 			timerThread.start();
-			maximumRequestWarnTime = ERXProperties.longForKeyWithDefault("er.extensions.ERXStatisticsStore.milliSeconds.warn", 2000L);
-			maximumRequestErrorTime = ERXProperties.longForKeyWithDefault("er.extensions.ERXStatisticsStore.milliSeconds.error", 10000L);
-			maximumRequestFatalTime = ERXProperties.longForKeyWithDefault("er.extensions.ERXStatisticsStore.milliSeconds.fatal", 5 * 60 * 1000L);
+			_maximumRequestWarnTime = ERXProperties.longForKeyWithDefault("er.extensions.ERXStatisticsStore.milliSeconds.warn", 2000L);
+			_maximumRequestErrorTime = ERXProperties.longForKeyWithDefault("er.extensions.ERXStatisticsStore.milliSeconds.error", 10000L);
+			_maximumRequestFatalTime = ERXProperties.longForKeyWithDefault("er.extensions.ERXStatisticsStore.milliSeconds.fatal", 5 * 60 * 1000L);
 		}
 
 		private long time() {
@@ -117,15 +118,20 @@
 				synchronized (_requestThreads) {
 					_requestThreads.remove(Thread.currentThread());
 				}
-				if (requestTime > maximumRequestFatalTime) {
+				long currentTime = System.currentTimeMillis();
+				if(currentTime - _lastLog > 10000) {
+					return;
+				}
+				_lastLog = currentTime;
+				if (requestTime > _maximumRequestFatalTime) {
 					String requestDescription = aContext == null ? aString : descriptionForContext(aContext);
 					log.fatal("Request did take too long : " + requestTime + "ms request was: " + requestDescription + trace);
 				}
-				else if (requestTime > maximumRequestErrorTime) {
+				else if (requestTime > _maximumRequestErrorTime) {
 					String requestDescription = aContext == null ? aString : descriptionForContext(aContext);
 					log.error("Request did take too long : " + requestTime + "ms request was: " + requestDescription + trace);
 				}
-				else if (requestTime > maximumRequestWarnTime) {
+				else if (requestTime > _maximumRequestWarnTime) {
 					String requestDescription = aContext == null ? aString : descriptionForContext(aContext);
 					log.warn("Request did take too long : " + requestTime + "ms request was: " + requestDescription + trace);
 				}
@@ -233,24 +239,31 @@
 	            requestThreads.putAll(_requestThreads);
 			}
 			if (!requestThreads.isEmpty()) {
+				Map traces = null; 
 				for (Iterator iterator = requestThreads.keySet().iterator(); iterator.hasNext();) {
 					Thread thread = (Thread) iterator.next();
 					Long time = requestThreads.get(thread);
 					if (time != null) {
 						time = System.currentTimeMillis() - time;
-						if (time > maximumRequestWarnTime/2 && _warnTraces.get(thread) == null) {
-							Map traces = Thread.getAllStackTraces();
+						if (time > _maximumRequestWarnTime/2 && _warnTraces.get(thread) == null) {
+							if(traces == null) {
+								traces = Thread.getAllStackTraces();
+							}
 							Map names = getCurrentThreadNames(traces.keySet());
 							_warnTraces.put(thread, traces);
 						}
-						if (time > maximumRequestErrorTime/2 && _errorTraces.get(thread) == null) {
-							Map traces = Thread.getAllStackTraces();
+						if (time > _maximumRequestErrorTime/2 && _errorTraces.get(thread) == null) {
+							if(traces == null) {
+								traces = Thread.getAllStackTraces();
+							}
 							Map names = getCurrentThreadNames(traces.keySet());
 							_errorTraces.put(thread, traces);
 							_errorTracesNames.put(thread, names);
 						}
-						if (time > maximumRequestFatalTime && _fatalTraces.get(thread) == null) {
-							Map traces = Thread.getAllStackTraces();
+						if (time > _maximumRequestFatalTime && _fatalTraces.get(thread) == null) {
+							if(traces == null) {
+								traces = Thread.getAllStackTraces();
+							}
 							Map names = getCurrentThreadNames(traces.keySet());
 							_fatalTraces.put(thread, traces);
 							_fatalTracesNames.put(thread, names);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12114] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication .java

From: <an...@us...> - 2012-08-02 14:36:43

Revision: 12114
          http://wonder.svn.sourceforge.net/wonder/?rev=12114&view=rev
Author:   anjo
Date:     2012-08-02 14:36:32 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
This hopefully helps me remember the next time this happens...

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java	2012-08-02 11:01:06 UTC (rev 12113)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java	2012-08-02 14:36:32 UTC (rev 12114)
@@ -1016,7 +1016,11 @@
 		if (_loader == null) {
 			System.out.println("No loader: " + System.getProperty("java.class.path"));
 		} else if (!_loader.didLoad()) {
-			throw new RuntimeException("ERXExtensions have not been initialized. Please report the classpath and the rest of the bundles to the Wonder mailing list: " + "\nRemaining frameworks: " + (_loader == null ? "none" : _loader.allFrameworks) + "\nClasspath: " + System.getProperty("java.class.path"));
+			String msg = "ERXExtensions have not been initialized (not all bundles were loaded).\n";
+			msg += "\nThis happens often when renaming a project in Eclipse. If you started inside of Eclipse, check if project.*  entries in the 'build.properties' file exist and match your project's name in Eclipse. ";
+			msg += "\nIn other cases, please report the classpath and the rest of the bundles to the Wonder mailing list: ";
+			msg += "\nRemaining frameworks: " + (_loader == null ? "none" : _loader.allFrameworks) + "\nClasspath: " + System.getProperty("java.class.path");
+			throw new RuntimeException(msg);
 		}
 		if ("JavaFoundation".equals(NSBundle.mainBundle().name())) {
 			throw new RuntimeException("Your main bundle is \"JavaFoundation\".  You are not launching this WO application properly.  If you are using Eclipse, most likely you launched your WOA as a \"Java Application\" instead of a \"WO Application\".");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12113] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Build/build/generic.xml

From: <an...@us...> - 2012-08-02 11:01:12

Revision: 12113
          http://wonder.svn.sourceforge.net/wonder/?rev=12113&view=rev
Author:   anjo
Date:     2012-08-02 11:01:06 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
fixing local dir (this must have been present for ages...)

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Build/build/generic.xml

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Build/build/generic.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Build/build/generic.xml	2012-08-01 20:28:04 UTC (rev 12112)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Build/build/generic.xml	2012-08-02 11:01:06 UTC (rev 12113)
@@ -281,7 +281,7 @@
            </classpath>
            <!-- ak: must NOT be a copy of WOApp, as deploymentDir doesn't work here -->
            <frameworks root="External" if="wo.external.root.bundles" bundles="${wo.external.root.bundles}" embed="${wo.external.root.bundles.embed}" dir="${wo.external.root}" />
-           <frameworks root="Local"    if="wo.local.root.bundles" bundles="${wo.local.root.bundles}" embed="${wo.local.root.bundles.embed}" dir="${wo.local.root}"/>
+           <frameworks root="Local"    if="wo.local.root.bundles" bundles="${wo.local.root.bundles}" embed="${wo.local.root.bundles.embed}" dir="${wo.local.frameworks}"/>
            <frameworks root="System"   if="wo.system.root.bundles" bundles="${wo.system.root.bundles}" embed="${wo.system.root.bundles.embed}" dir="${wo.system.frameworks}"/>
         </wocompile>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12112] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Build/build/generic.xml

From: <an...@us...> - 2012-08-01 20:28:11

Revision: 12112
          http://wonder.svn.sourceforge.net/wonder/?rev=12112&view=rev
Author:   anjo
Date:     2012-08-01 20:28:04 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
also copying frameworks when building embedded

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Build/build/generic.xml

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Build/build/generic.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Build/build/generic.xml	2012-07-22 09:28:54 UTC (rev 12111)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Build/build/generic.xml	2012-08-01 20:28:04 UTC (rev 12112)
@@ -563,6 +563,11 @@
         <sync todir="${web.application.install.root}/${project.name}.woa/Contents/WebServerResources">
             <fileset dir="${build.root}/${project.name}.woa/Contents/WebServerResources" />
         </sync>
+        <sync todir="${web.application.install.root}/${project.name}.woa/Contents/Frameworks">
+            <fileset dir="${build.root}/${project.name}.woa/Contents/Frameworks/">
+                <include name="*/WebServerResources/**" />
+			</fileset>
+        </sync>
     </target>
 	
     <target name="global.framework.clean" depends="global.properties">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12111] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ ERXBrowserFactory.java

From: <an...@us...> - 2012-07-22 09:29:00

Revision: 12111
          http://wonder.svn.sourceforge.net/wonder/?rev=12111&view=rev
Author:   anjo
Date:     2012-07-22 09:28:54 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
promoted to public

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXBrowserFactory.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXBrowserFactory.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXBrowserFactory.java	2012-07-22 08:23:12 UTC (rev 12110)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXBrowserFactory.java	2012-07-22 09:28:54 UTC (rev 12111)
@@ -360,7 +360,7 @@
         return browser;
     }
     
-    private boolean isRobot(String userAgent) {
+    public boolean isRobot(String userAgent) {
     	synchronized (robotExpressions) {
 			if(robotExpressions.count()==0) {
 				String strings = ERXStringUtilities.stringFromResource("robots", "txt", NSBundle.bundleForName("ERExtensions"));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12110] branches/Wonder_5_0_0_WebObjects_5_3_Branch

From: <an...@us...> - 2012-07-22 08:23:20

Revision: 12110
          http://wonder.svn.sourceforge.net/wonder/?rev=12110&view=rev
Author:   anjo
Date:     2012-07-22 08:23:12 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
and there's still some left of the damn things

Removed Paths:
-------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/BugTracker/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/ERMailer/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/JavaMonitor/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/Uber/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/ValidityModeler/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/wotaskd/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxExample2/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxLookExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/ERDivaLookExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/ERIUIExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/YUIExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/D2WComponentTour/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERDivaliteExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERModernMoviesDemo/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERMovies/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/DevStudio/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERComponentTour/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERIndexingExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/EROpenIDExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERSeleniumExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/JavaRESTAdaptorExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/TickTockMan/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ValidityExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DRGroupingTest/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DocsByExample/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DynaReporter/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Tests/ERXTest/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Tests/TestAdaptor/pom.xml
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Tests/pom.xml

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/BugTracker/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/BugTracker/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/BugTracker/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,86 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.applications</groupId>
-		<artifactId>applications</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.applications</groupId>
-	<artifactId>BugTracker</artifactId>
-	<name>BugTracker Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>BTBusinessLogic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>ERSelenium</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>ERCalendar</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERCoreBusinessLogic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERTaggable</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.reporting</groupId>
-			<artifactId>WRReporting</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.reporting</groupId>
-			<artifactId>ERPlot</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.reporting</groupId>
-			<artifactId>DRGrouping</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.eof</groupId>
-			<artifactId>ERRest</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jfree</groupId>
-			<artifactId>jfreechart</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/ERMailer/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/ERMailer/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/ERMailer/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,30 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.applications</groupId>
-		<artifactId>applications</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.applications</groupId>
-	<artifactId>ERMailer</artifactId>
-	<name>ERMailer Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERJavaMail</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERCoreBusinessLogic</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/JavaMonitor/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/JavaMonitor/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/JavaMonitor/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.applications</groupId>
-		<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>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.ajax</groupId>
-			<artifactId>Ajax</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>JavaMonitorFramework</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.eof</groupId>
-			<artifactId>ERRest</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/Uber/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/Uber/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/Uber/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,77 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.applications</groupId>
-		<artifactId>applications</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.applications</groupId>
-	<artifactId>Uber</artifactId>
-	<name>Uber Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>WOOgnl</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>JavaWOExtensions</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.ajax</groupId>
-			<artifactId>Ajax</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.eof</groupId>
-			<artifactId>ERRest</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERTaggable</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERAttachment</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>ERChronic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaXML</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/ValidityModeler/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/ValidityModeler/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/ValidityModeler/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,21 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.applications</groupId>
-		<artifactId>applications</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.applications</groupId>
-	<artifactId>ValidityModeler</artifactId>
-	<name>ValidityModeler Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.eof</groupId>
-			<artifactId>Validity</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder</groupId>
-		<artifactId>wonder</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.applications</groupId>
-	<artifactId>applications</artifactId>
-	<packaging>pom</packaging>
-	<name>Applications</name>
-	<modules>
-		<module>BugTracker</module>
-		<module>ERMailer</module>
-		<module>JavaMonitor</module>
-		<module>Uber</module>
-		<module>ValidityModeler</module>
-		<module>wotaskd</module>
-	</modules>
-</project>

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/wotaskd/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/wotaskd/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Applications/wotaskd/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,26 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.applications</groupId>
-		<artifactId>applications</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.applications</groupId>
-	<artifactId>wotaskd</artifactId>
-	<name>wotaskd</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>JavaMonitorFramework</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,31 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>ajax</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.ajax</groupId>
-	<artifactId>AjaxExample</artifactId>
-	<name>AjaxExample Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.ajax</groupId>
-			<artifactId>Ajax</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxExample2/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxExample2/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxExample2/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,44 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>ajax</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.ajax</groupId>
-	<artifactId>AjaxExample2</artifactId>
-	<name>AjaxExample2 Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.ajax</groupId>
-			<artifactId>Ajax</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>WOOgnl</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERPrototypes</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>WOLips</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>rome</groupId>
-			<artifactId>rome</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxLookExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxLookExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/AjaxLookExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,42 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>ajax</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.ajax</groupId>
-	<artifactId>AjaxLookExample</artifactId>
-	<name>AjaxLookExample Application</name>
-	<packaging>woapplication</packaging>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/ERDivaLookExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/ERDivaLookExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/ERDivaLookExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,51 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>ajax</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.ajax</groupId>
-	<artifactId>ERDivaLookExample</artifactId>
-	<name>ERDivaLook Example Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.ajax</groupId>
-			<artifactId>Ajax</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.ajax</groupId>
-			<artifactId>ERDivaLook</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERMoviesLogic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/ERIUIExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/ERIUIExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/ERIUIExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>ajax</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.ajax</groupId>
-	<artifactId>ERIUIExample</artifactId>
-	<name>ERIUIExample Application</name>
-	<packaging>woapplication</packaging>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.ajax</groupId>
-			<artifactId>ERIUI</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/YUIExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/YUIExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/YUIExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,26 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>ajax</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.ajaxexamples</groupId>
-	<artifactId>YUIExample</artifactId>
-	<name>YUIExample Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.ajax</groupId>
-			<artifactId>YUI</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Ajax/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>examples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>ajax</artifactId>
-	<packaging>pom</packaging>
-	<name>Ajax Examples</name>
-	<modules>
-		<module>AjaxExample</module>
-		<module>AjaxExample2</module>
-		<module>AjaxLookExample</module>
-		<module>ERDivaLookExample</module>
-		<module>ERIUIExample</module>
-		<module>YUIExample</module>
-	</modules>
-</project>

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/D2WComponentTour/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/D2WComponentTour/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/D2WComponentTour/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,26 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>d2w</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.d2w</groupId>
-	<artifactId>D2WComponentTour</artifactId>
-	<name>D2WComponentTour Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERDirectToWeb</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERDivaliteExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERDivaliteExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERDivaliteExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,50 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>d2w</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.d2w</groupId>
-	<artifactId>ERDivaliteExample</artifactId>
-	<name>ERDivaliteExample Application</name>
-	<packaging>woapplication</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>ERDivaliteLook</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERMoviesLogic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERModernMoviesDemo/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERModernMoviesDemo/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERModernMoviesDemo/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,49 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>d2w</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.d2w</groupId>
-	<artifactId>ERModernMoviesDemo</artifactId>
-	<name>ERModernMoviesDemo Application</name>
-	<packaging>woapplication</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERMoviesLogic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERMovies/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERMovies/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/ERMovies/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,26 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>d2w</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.d2w</groupId>
-	<artifactId>ERMovies</artifactId>
-	<name>ERMovies Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERDirectToWeb</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/D2W/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>examples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>d2w</artifactId>
-	<packaging>pom</packaging>
-	<name>D2W Examples</name>
-
-	<modules>
-		<module>D2WComponentTour</module>
-		<module>ERDivaliteExample</module>
-		<module>ERModernMoviesDemo</module>
-		<module>ERMovies</module>
-	</modules>
-</project>

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/DevStudio/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/DevStudio/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/DevStudio/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,50 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>miscexamples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.misc</groupId>
-	<artifactId>DevStudio</artifactId>
-	<name>Dev Studio Application</name>
-	<packaging>woapplication</packaging>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jtidy</groupId>
-			<artifactId>jtidy</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>net.sourceforge</groupId>
-			<artifactId>jode</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERComponentTour/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERComponentTour/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERComponentTour/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>miscexamples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>wonder.misc</groupId>
-	<artifactId>ERComponentTour</artifactId>
-	<name>ERComponentTour Example Application</name>
-	<packaging>woapplication</packaging>
-
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERIndexingExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERIndexingExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERIndexingExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,57 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>miscexamples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>wonder.misc</groupId>
-	<artifactId>ERIndexingExample</artifactId>
-	<name>ERIndexing Example Application</name>
-	<packaging>woapplication</packaging>
-
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.eof</groupId>
-			<artifactId>ERIndexing</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/EROpenIDExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/EROpenIDExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/EROpenIDExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>miscexamples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>wonder.misc</groupId>
-	<artifactId>EROpenIDExample</artifactId>
-	<name>EROpenID Example Application</name>
-	<packaging>woapplication</packaging>
-
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>EROpenID</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,53 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>miscexamples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>wonder.misc</groupId>
-	<artifactId>ERRestRouteExample</artifactId>
-	<name>ERRestRouteExample Example Application</name>
-	<packaging>woapplication</packaging>
-
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.eof</groupId>
-			<artifactId>ERRest</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERSeleniumExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERSeleniumExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERSeleniumExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,30 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>miscexamples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.misc</groupId>
-	<artifactId>ERSeleniumExample</artifactId>
-	<name>ERSelenium Example Application</name>
-	<packaging>woapplication</packaging>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>ERSelenium</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/JavaRESTAdaptorExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/JavaRESTAdaptorExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/JavaRESTAdaptorExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,42 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>miscexamples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.misc</groupId>
-	<artifactId>JavaRESTAdaptorExample</artifactId>
-	<name>Java REST Adaptor Example Application</name>
-	<packaging>woapplication</packaging>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaXML</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,59 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>miscexamples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.misc</groupId>
-	<artifactId>RestExample</artifactId>
-	<name>RestExample Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.misc</groupId>
-			<artifactId>ERDirectToRest</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.eof</groupId>
-			<artifactId>ERRest</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaDirectToWeb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaXML</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/TickTockMan/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/TickTockMan/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/TickTockMan/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,41 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>wonder.applications</groupId>
-		<artifactId>applications</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder.applications</groupId>
-	<artifactId>TickTockMan</artifactId>
-	<name>TickTockMan Application</name>
-	<packaging>woapplication</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ValidityExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ValidityExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ValidityExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,38 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>miscexamples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.misc</groupId>
-	<artifactId>ValidityExample</artifactId>
-	<name>ValidityExample Application</name>
-	<packaging>woapplication</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.eof</groupId>
-			<artifactId>Validity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>examples</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>miscexamples</artifactId>
-	<packaging>pom</packaging>
-	<name>Misc Examples</name>
-
-	<modules>
-		<module>DevStudio</module>
-		<module>ERComponentTour</module>
-		<module>ERIndexingExample</module>
-		<module>EROpenIDExample</module>
-		<module>ERRestRouteExample</module>
-		<module>ERSeleniumExample</module>
-		<module>JavaRESTAdaptorExample</module>
-		<module>RestExample</module>
-		<module>TickTockMan</module>
-		<module>ValidityExample</module>
-	</modules>
-</project>

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DRGroupingTest/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DRGroupingTest/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DRGroupingTest/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,46 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>reporting</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.reporting</groupId>
-	<artifactId>DRGroupingTest</artifactId>
-	<name>DRGroupingTest Application</name>
-	<packaging>woapplication</packaging>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.reporting</groupId>
-			<artifactId>DRGrouping</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERMoviesLogic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DocsByExample/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DocsByExample/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DocsByExample/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,50 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>reporting</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.reporting</groupId>
-	<artifactId>DocsByExample</artifactId>
-	<name>Docs by Example Application</name>
-	<packaging>woapplication</packaging>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.reporting</groupId>
-			<artifactId>DRGrouping</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.businesslogic</groupId>
-			<artifactId>ERMoviesLogic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOAccess</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaEOControl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaXML</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DynaReporter/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DynaReporter/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/DynaReporter/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,42 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>wonder.examples</groupId>
-		<artifactId>reporting</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>wonder.reporting</groupId>
-	<artifactId>DynaReporter</artifactId>
-	<name>DynaReporter Application</name>
-	<packaging>woapplication</packaging>
-	<build>
-		<sourceDirectory>Sources</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>ERExtensions</artifactId>
-			<classifier>${woClassifier}</classifier>
-		</dependency>
-		<dependency>
-			<groupId>wonder.core</groupId>
-			<artifactId>JavaWOExtensions</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>wonder.reporting</groupId>
-			<artifactId>DRGrouping</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaWebObjects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaFoundation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.webobjects</groupId>
-			<artifactId>JavaXML</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/pom.xml	2012-07-22 05:48:00 UTC (rev 12109)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Reporting/pom.xml	2012-07-22 08:23:12 UTC (rev 12110)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xml...
 
[truncated message content]

[Wonder-cvs] SF.net SVN: wonder:[12109] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication .java

From: <an...@us...> - 2012-07-22 05:48:06

Revision: 12109
          http://wonder.svn.sourceforge.net/wonder/?rev=12109&view=rev
Author:   anjo
Date:     2012-07-22 05:48:00 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
freeing up mem during startup

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java	2012-07-11 15:30:47 UTC (rev 12108)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java	2012-07-22 05:48:00 UTC (rev 12109)
@@ -826,9 +826,9 @@
 			}
 		}
 
-		private static NSMutableDictionary<String, NSMutableArray<String>> packages = new NSMutableDictionary<String, NSMutableArray<String>>();
+		private NSMutableDictionary<String, NSMutableArray<String>> packages = new NSMutableDictionary<String, NSMutableArray<String>>();
 
-		private static NSMutableDictionary<String, NSMutableSet<Entry>> classes = new NSMutableDictionary<String, NSMutableSet<Entry>>();
+		private NSMutableDictionary<String, NSMutableSet<Entry>> classes = new NSMutableDictionary<String, NSMutableSet<Entry>>();
 
 		private void processJar(String jar) {
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12108] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/PlugIns/PostgresqlPlugIn/Sources/com/webobjects/jdbcadaptor/ PostgresqlExpression.java

From: <an...@us...> - 2012-07-11 15:30:56

Revision: 12108
          http://wonder.svn.sourceforge.net/wonder/?rev=12108&view=rev
Author:   anjo
Date:     2012-07-11 15:30:47 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
inet 6 fix

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/PlugIns/PostgresqlPlugIn/Sources/com/webobjects/jdbcadaptor/PostgresqlExpression.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/PlugIns/PostgresqlPlugIn/Sources/com/webobjects/jdbcadaptor/PostgresqlExpression.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/PlugIns/PostgresqlPlugIn/Sources/com/webobjects/jdbcadaptor/PostgresqlExpression.java	2012-07-07 12:16:27 UTC (rev 12107)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/PlugIns/PostgresqlPlugIn/Sources/com/webobjects/jdbcadaptor/PostgresqlExpression.java	2012-07-11 15:30:47 UTC (rev 12108)
@@ -909,6 +909,11 @@
         	EOEntity kpEntity = entityForKeyPath(kp);
         	attribute = kpEntity.attributeNamed(kp.substring(lastDotIdx+1));
         }
+        // AK: inet6 addresses get handed down as "xxx:xxx:...:xxx%y", not "xxx:xxx:...:xxx/y"
+        // note that this might break if you hand over a host name that contains percent chars (not sure if possible)
+    	if(attribute != null && "inet".equals(attribute.externalType()) && v != null && v.toString().indexOf('%') > 0) {
+    		v = v.toString().replace('%', '/');
+    	}
         if(attribute != null && v != null && v != NSKeyValueCoding.NullValue) {
         	String s = columnTypeStringForAttribute(attribute);
         	return super.sqlStringForValue(v, kp) + "::" + s;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12107] branches/Wonder_5_0_0_WebObjects_5_3_Branch/pom. xml

From: <an...@us...> - 2012-07-07 12:16:35

Revision: 12107
          http://wonder.svn.sourceforge.net/wonder/?rev=12107&view=rev
Author:   anjo
Date:     2012-07-07 12:16:27 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
missed one of these suckers

Removed Paths:
-------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/pom.xml

Deleted: branches/Wonder_5_0_0_WebObjects_5_3_Branch/pom.xml
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/pom.xml	2012-06-28 08:33:38 UTC (rev 12106)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/pom.xml	2012-07-07 12:16:27 UTC (rev 12107)
@@ -1,762 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>wonder</groupId>
-	<artifactId>wonder</artifactId>
-	<version>5.0.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Project Wonder</name>
-	<url>http://wonder.sf.net/</url>
-	<modules>
-		<module>Applications</module>
-		<module>Examples</module>
-		<module>Frameworks</module>
-		<!-- Tests module configuration not finished yet -->
-		<!-- <module>Tests</module> -->
-		<module>Utilities</module>
-	</modules>
-
-	<properties>
-		<!-- VERY BAD PRACTICE: But there are broken tests -->
-		<maven.test.skip>true</maven.test.skip>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-	</properties>
-
-	<profiles>
-		<profile>
-			<id>unknown</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<properties>
-				<woClassifier>unknown</woClassifier>
-				<!-- Any WebObjects version equals or superior to 5.3 -->
-				<woversion>[5.3,)</woversion>
-			</properties>
-		</profile>
-		<profile>
-			<id>wo53</id>
-			<activation>
-				<property>
-					<name>womajor</name>
-					<value>5.3</value>
-				</property>
-			</activation>
-			<properties>
-				<woClassifier>wo53</woClassifier>
-				<!-- WebObjects version 5.3.x -->
-				<woversion>[5.3,5.4)</woversion>
-			</properties>
-		</profile>
-		<profile>
-			<id>wo54</id>
-			<activation>
-				<property>
-					<name>womajor</name>
-					<value>5.4</value>
-				</property>
-			</activation>
-			<properties>
-				<woClassifier>wo54</woClassifier>
-				<!-- WebObjects version 5.4.x -->
-				<woversion>[5.4,5.5)</woversion>
-			</properties>
-		</profile>
-		<profile>
-			<id>hudson</id>
-			<distributionManagement>
-				<snapshotRepository>
-					<id>wocommunity.deployment</id>
-					<uniqueVersion>false</uniqueVersion>
-					<name>WOCommunity Maven2 Snapshots Repository</name>
-					<!-- Saving some bandwidth -->
-					<url>http://wo-repository.moleque.com.br/nexus/content/repositories/snapshots/</url>
-				</snapshotRepository>
-			</distributionManagement>
-		</profile>
-	</profiles>
-	<build>
-		<testSourceDirectory>${project.basedir}/Tests</testSourceDirectory>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.objectstyle.woproject.maven2</groupId>
-					<artifactId>maven-wolifecycle-plugin</artifactId>
-					<version>2.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>2.3.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.2</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.3.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<version>2.5</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-install-plugin</artifactId>
-					<version>2.3.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.4.3</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>1.5</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.objectstyle.woproject.maven2</groupId>
-				<artifactId>maven-wolifecycle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<skipAppleProvidedFrameworks>true</skipAppleProvidedFrameworks>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>com.webobjects</groupId>
-				<artifactId>JavaJDBCAdaptor</artifactId>
-				<version>${woversion}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.webobjects</groupId>
-				<artifactId>JavaFoundation</artifactId>
-				<version>${woversion}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.webobjects</groupId>
-				<artifactId>JavaWebObjects</artifactId>
-				<version>${woversion}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.webobjects</groupId>
-				<artifactId>JavaWOJSPServlet</artifactId>
-				<version>${woversion}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.webobjects</groupId>
-				<artifactId>JavaDirectToWeb</artifactId>
-				<version>${woversion}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.webobjects</groupId>
-				<artifactId>JavaEOAccess</artifactId>
-				<version>${woversion}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.webobjects</groupId>
-				<artifactId>JavaEOControl</artifactId>
-				<version>${woversion}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.webobjects</groupId>
-				<artifactId>JavaXML</artifactId>
-				<version>${woversion}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.core</groupId>
-				<artifactId>JavaWOExtensions</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.core</groupId>
-				<artifactId>ERExtensions</artifactId>
-				<version>${project.version}</version>
-				<classifier>${woClassifier}</classifier>
-				<!-- Using the provided scope to avoid problems with profiles and variables substitution -->
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>wonder.core</groupId>
-				<artifactId>ERDirectToWeb</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.core</groupId>
-				<artifactId>ERPrototypes</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.core</groupId>
-				<artifactId>ERJavaMail</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.core</groupId>
-				<artifactId>WOOgnl</artifactId>
-				<version>${project.version}</version>
-				<classifier>${woClassifier}</classifier>
-				<!-- Using the provided scope to avoid problems with profiles and variables substitution -->
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>wonder.d2w</groupId>
-				<artifactId>ERModernDirectToWeb</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.businesslogic</groupId>
-				<artifactId>ERCoreBusinessLogic</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.businesslogic</groupId>
-				<artifactId>BTBusinessLogic</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.businesslogic</groupId>
-				<artifactId>ERTaggable</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.businesslogic</groupId>
-				<artifactId>ERAttachment</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.businesslogic</groupId>
-				<artifactId>ERMoviesLogic</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.ajax</groupId>
-				<artifactId>Ajax</artifactId>
-				<version>${project.version}</version>
-				<classifier>${woClassifier}</classifier>
-				<!-- Using the provided scope to avoid problems with profiles and variables substitution -->
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>wonder.ajax</groupId>
-				<artifactId>SproutCore</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.ajax</groupId>
-				<artifactId>YUI</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.ajax</groupId>
-				<artifactId>ERDivaLook</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.ajax</groupId>
-				<artifactId>ERIUI</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.reporting</groupId>
-				<artifactId>WRReporting</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.reporting</groupId>
-				<artifactId>DRGrouping</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.reporting</groupId>
-				<artifactId>ERPlot</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.eof</groupId>
-				<artifactId>Validity</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.eof</groupId>
-				<artifactId>ERRest</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.eof</groupId>
-				<artifactId>ERIndexing</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.misc</groupId>
-				<artifactId>ERSelenium</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.misc</groupId>
-				<artifactId>ERCalendar</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.misc</groupId>
-				<artifactId>ERChronic</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.misc</groupId>
-				<artifactId>JavaMonitorFramework</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.misc</groupId>
-				<artifactId>ERDirectToRest</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.misc</groupId>
-				<artifactId>WOLips</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.misc</groupId>
-				<artifactId>EROpenID</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.misc</groupId>
-				<artifactId>ERDivaliteLook</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>wonder.eoadaptors</groupId>
-				<artifactId>JavaMemoryAdaptor</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.activation</groupId>
-				<artifactId>activation</artifactId>
-				<version>1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.mail</groupId>
-				<artifactId>mail</artifactId>
-				<version>1.4.1</version>
-			</dependency>
-			<dependency>
-				<groupId>jdom</groupId>
-				<artifactId>jdom</artifactId>
-				<version>1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>oro</groupId>
-				<artifactId>oro</artifactId>
-				<version>2.0.6</version>
-			</dependency>
-			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.8.1</version>
-			</dependency>
-			<dependency>
-				<groupId>com.ibm.icu</groupId>
-				<artifactId>icu4j</artifactId>
-				<version>3.8</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>1.5.8</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.5.8</version>
-			</dependency>
-			<dependency>
-				<groupId>ognl</groupId>
-				<artifactId>ognl</artifactId>
-				<version>2.6.7</version>
-			</dependency>
-			<dependency>
-				<groupId>metaparadigm</groupId>
-				<artifactId>jsonrpc</artifactId>
-				<version>1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>com.google.code</groupId>
-				<artifactId>jabsorb</artifactId>
-				<version>1.2.2</version>
-			</dependency>
-			<dependency>
-				<groupId>jfree</groupId>
-				<artifactId>jcommon</artifactId>
-				<version>1.0.14</version>
-				<exclusions>
-					<exclusion>
-						<groupId>gnujaxp</groupId>
-						<artifactId>gnujaxp</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>jfree</groupId>
-				<artifactId>jfreechart</artifactId>
-				<version>1.0.11</version>
-				<exclusions>
-					<exclusion>
-						<groupId>gnujaxp</groupId>
-						<artifactId>gnujaxp</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.google.code.jofc2</groupId>
-				<artifactId>jofc2</artifactId>
-				<version>1.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.mina</groupId>
-				<artifactId>mina-core</artifactId>
-				<version>1.1.7</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.netty</groupId>
-				<artifactId>netty</artifactId>
-				<version>3.2.2.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-cli</groupId>
-				<artifactId>commons-cli</artifactId>
-				<version>1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>3.2.1</version>
-			</dependency>
-			<dependency>
-				<groupId>net.spy.west.bleu.spy</groupId>
-				<artifactId>spy</artifactId>
-				<version>2.3.1</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.jms</groupId>
-				<artifactId>jms</artifactId>
-				<version>1.0.2</version>
-			</dependency>
-			<dependency>
-				<groupId>openjms</groupId>
-				<artifactId>openjms-client</artifactId>
-				<version>0.7.6</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.naming</groupId>
-				<artifactId>jndi</artifactId>
-				<version>1.2.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.lucene</groupId>
-				<artifactId>lucene-core</artifactId>
-				<version>2.9.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.lucene</groupId>
-				<artifactId>lucene-analyzers</artifactId>
-				<version>2.9.3</version>
-			</dependency>
-			<dependency>
-				<groupId>jgroups</groupId>
-				<artifactId>jgroups-all</artifactId>
-				<version>2.4.1</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId>
-				<version>1.1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>com.gammastream</groupId>
-				<artifactId>gamma-core</artifactId>
-				<version>1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>com.h2database</groupId>
-				<artifactId>h2</artifactId>
-				<version>1.2.125</version>
-			</dependency>
-			<dependency>
-				<groupId>com.octo.captcha</groupId>
-				<artifactId>jcaptcha-all</artifactId>
-				<version>1.0-RC6</version>
-			</dependency>
-			<dependency>
-				<groupId>net.tanesha.recaptcha4j</groupId>
-				<artifactId>recaptcha4j</artifactId>
-				<version>0.0.7</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sourceforge.akismet</groupId>
-				<artifactId>akismet-java</artifactId>
-				<version>1.02</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-codec</groupId>
-				<artifactId>commons-codec</artifactId>
-				<version>1.3</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-httpclient</groupId>
-				<artifactId>commons-httpclient</artifactId>
-				<version>3.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.htmlparser</groupId>
-				<artifactId>htmlparser</artifactId>
-				<version>1.6</version>
-			</dependency>
-			<dependency>
-				<groupId>org.openxri</groupId>
-				<artifactId>openxri-client</artifactId>
-				<version>1.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.openxri</groupId>
-				<artifactId>openxri-syntax</artifactId>
-				<version>1.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>rome</groupId>
-				<artifactId>rome</artifactId>
-				<version>0.9</version>
-			</dependency>
-			<dependency>
-				<groupId>xml-security</groupId>
-				<artifactId>xmlsec</artifactId>
-				<version>1.3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.safehaus.jug</groupId>
-				<artifactId>jug</artifactId>
-				<version>2.0.0</version>
-				<classifier>asl</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.openqa.selenium.client-drivers</groupId>
-				<artifactId>selenium-java-client-driver</artifactId>
-				<version>1.0-beta-1</version>
-			</dependency>
-			<dependency>
-				<groupId>jtidy</groupId>
-				<artifactId>jtidy</artifactId>
-				<version>4aug2000r7-dev</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sourceforge</groupId>
-				<artifactId>jode</artifactId>
-				<version>1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.derby</groupId>
-				<artifactId>derby</artifactId>
-				<version>10.4.2.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.derby</groupId>
-				<artifactId>derbytools</artifactId>
-				<version>10.4.2.0</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sf.ezmorph</groupId>
-				<artifactId>ezmorph</artifactId>
-				<version>1.0.5</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sf.json-lib</groupId>
-				<artifactId>json-lib</artifactId>
-				<version>2.2.2</version>
-				<classifier>jdk15</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.zeroturnaround</groupId>
-				<artifactId>jr-sdk</artifactId>
-				<version>3.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.zeroturnaround</groupId>
-				<artifactId>jr-utils</artifactId>
-				<version>3.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.zeroturnaround</groupId>
-				<artifactId>jr-javassist</artifactId>
-				<version>3.11.0.GA</version>
-			</dependency>
-			<dependency>
-				<groupId>org.xhtmlrenderer</groupId>
-				<artifactId>core-renderer</artifactId>
-				<version>R8-final</version>
-			</dependency>
-			<dependency>
-				<groupId>com.lowagie</groupId>
-				<artifactId>itext</artifactId>
-				<version>2.1.7</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sourceforge.ujac</groupId>
-				<artifactId>ujac</artifactId>
-				<version>1.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-lang</groupId>
-				<artifactId>commons-lang</artifactId>
-				<version>2.4</version>
-			</dependency>
-			<dependency>
-				<groupId>javassist</groupId>
-				<artifactId>javassist</artifactId>
-				<version>3.11.0.GA</version>
-			</dependency>
-			<dependency>
-				<groupId>glounj</groupId>
-				<artifactId>glounj</artifactId>
-				<version>1.5-beta</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.poi</groupId>
-				<artifactId>poi</artifactId>
-				<version>3.6</version>
-			</dependency>
-			<dependency>
-				<groupId>com.intellij</groupId>
-				<artifactId>annotations</artifactId>
-				<version>7.0.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.openid4java</groupId>
-				<artifactId>openid4java</artifactId>
-				<version>0.9.5</version>
-			</dependency>
-			<dependency>
-				<groupId>xml-apis</groupId>
-				<artifactId>xml-apis</artifactId>
-				<version>1.3.04</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sf.jasperreports</groupId>
-				<artifactId>jasperreports</artifactId>
-				<version>3.7.4</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	<repositories>
-		<repository>
-			<id>wocommunity.releases</id>
-			<name>WOCommunity Maven 2 Releases Repository</name>
-			<url>http://maven.wocommunity.org/content/groups/public</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>wocommunity.snapshots</id>
-			<name>WOCommunity Maven 2 Snapshots Repository</name>
-			<url>http://maven.wocommunity.org/content/groups/public-snapshots
-			</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>wocommunity.releases</id>
-			<name>WOCommunity Maven 2 Releases Repository</name>
-			<url>http://maven.wocommunity.org/content/groups/public</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</pluginRepository>
-		<pluginRepository>
-			<id>wocommunity.snapshots</id>
-			<name>WOCommunity Maven 2 Snapshots Repository</name>
-			<url>http://maven.wocommunity.org/content/groups/public-snapshots
-			</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</pluginRepository>
-	</pluginRepositories>
-	<distributionManagement>
-		<repository>
-			<id>wocommunity.deployment</id>
-			<name>WOCommunity Maven2 Releases Repository</name>
-			<url>http://maven.wocommunity.org/content/repositories/releases</url>
-		</repository>
-		<snapshotRepository>
-			<id>wocommunity.deployment</id>
-			<uniqueVersion>false</uniqueVersion>
-			<name>WOCommunity Maven2 Snapshots Repository</name>
-			<url>http://maven.wocommunity.org/content/repositories/snapshots/</url>
-		</snapshotRepository>
-	</distributionManagement>
-	<scm>
-		<connection>scm:svn:https://wonder.svn.sourceforge.net/svnroot/wonder/trunk/Wonder
-		</connection>
-		<developerConnection>scm:svn:https://wonder.svn.sourceforge.net/svnroot/wonder/trunk/Wonder
-		</developerConnection>
-	</scm>
-</project>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12106] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERDirectToWeb/Components/ERDFacetFilter.api

From: <an...@us...> - 2012-06-28 08:33:47

Revision: 12106
          http://wonder.svn.sourceforge.net/wonder/?rev=12106&view=rev
Author:   anjo
Date:     2012-06-28 08:33:38 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
clear all, javadoc, css, display name, none key, cleanup

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/ERDFacetFilter.api

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/ERDFacetFilter.api
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/ERDFacetFilter.api	2012-06-28 08:31:57 UTC (rev 12105)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/ERDFacetFilter.api	2012-06-28 08:33:38 UTC (rev 12106)
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <wodefinitions>
-        <wo wocomponentcontent="false" class="ERDFacetFilter.java">
+        <wo class="ERDFacetFilter.java" wocomponentcontent="false">
 
-        </wo>
-</wodefinitions>
\ No newline at end of file
+        <binding name="displayGroup"/>
+        <binding name="groupingKeys"/>
+    </wo>
+</wodefinitions>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12105] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERDirectToWeb

From: <an...@us...> - 2012-06-28 08:32:08

Revision: 12105
          http://wonder.svn.sourceforge.net/wonder/?rev=12105&view=rev
Author:   anjo
Date:     2012-06-28 08:31:57 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
clear all, javadoc, css, display name, none key, cleanup

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.html
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.wod
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDFacetFilter.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.html
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.html	2012-06-27 19:22:43 UTC (rev 12104)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.html	2012-06-28 08:31:57 UTC (rev 12105)
@@ -1,18 +1,19 @@
 <webobject name = "HasKeyList">
-  <ul class = "keyList">
+  <ul class = "FacetFilterKeys">
     <webobject name = "KeyList">
       <webobject name = "HasValueList">
-        <li class = "key">
-          <webobject name = "Key" />
-          <ul>
+        <li class = "FacetFilterKey">
+          <span><webobject name = "Key" /></span>
+          <ul class = "FacetFilterItems">
             <webobject name = "ValueList">
-              <li>
-                <webobject name = "IsSelectedValue">[X]</webobject>  <webobject name = "ValueLink"><webobject name = "Value" /></webobject> (<webobject name = "ValueCount" />)</li>
+              <webobject name = "ValueItem">
+                <webobject name = "ValueLink"><webobject name = "Value" /></webobject> (<webobject name = "ValueCount" />)</webobject>
             </webobject>
             <webobject name = "HasSelectedValues"><li><webobject name = "ClearSelectionLink">[Clear]</webobject></li></webobject>
           </ul>
         </li>
       </webobject>
     </webobject>
+    <webobject name = "HasSelectedValues"><li><webobject name = "ClearSelectionLink">[Clear all]</webobject></li></webobject>
   </ul>
 </webobject>
\ No newline at end of file

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.wod
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.wod	2012-06-27 19:22:43 UTC (rev 12104)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.wod	2012-06-28 08:31:57 UTC (rev 12105)
@@ -7,8 +7,13 @@
 	item = currentKey;
 }
 
+ValueItem: WOGenericContainer {
+	elementName = "li";
+	class = itemClassName;
+}
+
 Key: WOString {
-	value = currentKey;
+	value = currentDisplayName;
 }
 
 HasValueList: WOConditional {

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDFacetFilter.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDFacetFilter.java	2012-06-27 19:22:43 UTC (rev 12104)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDFacetFilter.java	2012-06-28 08:31:57 UTC (rev 12105)
@@ -11,13 +11,51 @@
 
 import er.extensions.eof.ERXS;
 import er.extensions.foundation.ERXArrayUtilities;
+import er.extensions.foundation.ERXStringUtilities;
 
+/**
+ * Provides simple filtered grouping capability for display groups, like ebay or Solr.
+ * To be put outside of the "is this list empty" conditional.
+ * 
+ * @binding displayGroup displayGroup to filter
+ * @binding groupingKeys keys to group on
+ * 
+ * @author ak
+ *
+ */
+
+/* sample CSS
+<style>
+.FacetFilterKeys {
+    float: left;
+}
+.FacetFilterKey, .FacetFilterKey {
+    padding-left: 1em;
+}
+.FacetFilterKey span {
+    font-weight: bold;
+}
+.FacetFilterItem.Selected {
+    font-weight: bold;
+}
+.ObjTable {
+    width: 80%;
+}
+.ERMDEmptyList {
+    margin-left: 20%;
+}
+</style>
+*/
+
+// TODO: doesn't account for changes in displayGroup or groupingKeys, no batching support, can lead to empty list, should maybe update count of selectable items (so you don't end up with an empty list), localization
 public class ERDFacetFilter extends ERDCustomQueryComponent {
 	
 	public Object currentValue;
 	public String currentKey;
 	private NSArray<EOEnterpriseObject> _allObjects;
 	
+	private static String NONE = "(None)";
+	
 	private NSMutableDictionary<String, NSDictionary<Object, NSArray<EOEnterpriseObject>>> values = new NSMutableDictionary();
 	private NSMutableDictionary<String, NSMutableArray<Object>> selectedValues = new NSMutableDictionary();
 
@@ -36,7 +74,11 @@
 			values.removeAllObjects();
 			selectedValues.removeAllObjects();
 			for (String keyPath : allKeys()) {
-				NSDictionary<Object, NSArray<EOEnterpriseObject>> groupedObjects = ERXArrayUtilities.arrayGroupedByKeyPath(_allObjects, keyPath);
+				NSMutableDictionary<Object, NSArray<EOEnterpriseObject>> groupedObjects = ERXArrayUtilities.arrayGroupedByKeyPath(_allObjects, keyPath).mutableClone();
+				NSArray<EOEnterpriseObject> nulls = groupedObjects.remove(ERXArrayUtilities.NULL_GROUPING_KEY);
+				if(nulls != null) {
+				    groupedObjects.setObjectForKey(nulls, NONE);
+				}
 				values.setObjectForKey(groupedObjects, keyPath);
 				selectedValues.setObjectForKey(new NSMutableArray(), keyPath);
 			}
@@ -98,12 +140,34 @@
 	}
 
 	public boolean hasSelectedValues() {
-		return selectedValues.objectForKey(currentKey).count() > 0;
+	    if(currentKey != null) {
+	        return selectedValues.objectForKey(currentKey).count() > 0;
+	    }
+	    for (NSArray values : selectedValues.values()) {
+            if(values.count() > 0) {
+                return true;
+            }
+        }
+	    return false;
 	}
 
 	public WOActionResults clearSelectedValues() {
-		selectedValues.objectForKey(currentKey).removeAllObjects();
+	    if(currentKey != null) {
+	        selectedValues.objectForKey(currentKey).removeAllObjects();
+	    } else {
+	        for (NSMutableArray values : selectedValues.allValues()) {
+                values.removeAllObjects();
+            }
+	    }
 		updateSelectedValues();
 		return null;
 	}
+
+    public String itemClassName() {
+        return isCurrentValueSelected() ? "FacetFilterItem Selected" : "FacetFilterItem";
+    }
+
+    public String currentDisplayName() {
+        return NONE == currentKey ? NONE : ERXStringUtilities.displayNameForKey(currentKey);
+    }
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12104] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERDirectToWeb

From: <an...@us...> - 2012-06-27 19:22:49

Revision: 12104
          http://wonder.svn.sourceforge.net/wonder/?rev=12104&view=rev
Author:   anjo
Date:     2012-06-27 19:22:43 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
adding facet filter (like solr, ebay etc) first cut

Added Paths:
-----------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/ERDFacetFilter.api
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.html
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.wod
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.woo
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDFacetFilter.java

Added: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/ERDFacetFilter.api
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/ERDFacetFilter.api	                        (rev 0)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/ERDFacetFilter.api	2012-06-27 19:22:43 UTC (rev 12104)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<wodefinitions>
+        <wo wocomponentcontent="false" class="ERDFacetFilter.java">
+
+        </wo>
+</wodefinitions>
\ No newline at end of file

Added: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.html
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.html	                        (rev 0)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.html	2012-06-27 19:22:43 UTC (rev 12104)
@@ -0,0 +1,18 @@
+<webobject name = "HasKeyList">
+  <ul class = "keyList">
+    <webobject name = "KeyList">
+      <webobject name = "HasValueList">
+        <li class = "key">
+          <webobject name = "Key" />
+          <ul>
+            <webobject name = "ValueList">
+              <li>
+                <webobject name = "IsSelectedValue">[X]</webobject>  <webobject name = "ValueLink"><webobject name = "Value" /></webobject> (<webobject name = "ValueCount" />)</li>
+            </webobject>
+            <webobject name = "HasSelectedValues"><li><webobject name = "ClearSelectionLink">[Clear]</webobject></li></webobject>
+          </ul>
+        </li>
+      </webobject>
+    </webobject>
+  </ul>
+</webobject>
\ No newline at end of file

Added: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.wod
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.wod	                        (rev 0)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.wod	2012-06-27 19:22:43 UTC (rev 12104)
@@ -0,0 +1,45 @@
+HasKeyList: WOConditional {
+	condition = keyList.@count;
+}
+
+KeyList: WORepetition {
+	list = keyList;
+	item = currentKey;
+}
+
+Key: WOString {
+	value = currentKey;
+}
+
+HasValueList: WOConditional {
+	condition = valueList.@count;
+}
+
+ValueList: WORepetition {
+	list = valueList;
+	item = currentValue;
+}
+
+IsSelectedValue: WOConditional {
+	condition = isCurrentValueSelected;
+}
+
+HasSelectedValues: WOConditional {
+	condition = hasSelectedValues;
+}
+
+ClearSelectionLink: WOHyperlink {
+	action = clearSelectedValues;
+}
+
+Value: WOString {
+	value = currentValue;
+}
+
+ValueCount: WOString {
+	value = currentValueCount;
+}
+
+ValueLink: WOHyperlink {
+	action = selectCurrentValue;
+}

Added: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.woo
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.woo	                        (rev 0)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDFacetFilter.wo/ERDFacetFilter.woo	2012-06-27 19:22:43 UTC (rev 12104)
@@ -0,0 +1,4 @@
+{
+	"WebObjects Release" = "WebObjects 5.0";
+	encoding = "UTF-8";
+}
\ No newline at end of file

Added: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDFacetFilter.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDFacetFilter.java	                        (rev 0)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDFacetFilter.java	2012-06-27 19:22:43 UTC (rev 12104)
@@ -0,0 +1,109 @@
+package er.directtoweb.components;
+
+import com.webobjects.appserver.WOActionResults;
+import com.webobjects.appserver.WOContext;
+import com.webobjects.eocontrol.EOEnterpriseObject;
+import com.webobjects.foundation.NSArray;
+import com.webobjects.foundation.NSDictionary;
+import com.webobjects.foundation.NSMutableArray;
+import com.webobjects.foundation.NSMutableDictionary;
+import com.webobjects.foundation.NSMutableSet;
+
+import er.extensions.eof.ERXS;
+import er.extensions.foundation.ERXArrayUtilities;
+
+public class ERDFacetFilter extends ERDCustomQueryComponent {
+	
+	public Object currentValue;
+	public String currentKey;
+	private NSArray<EOEnterpriseObject> _allObjects;
+	
+	private NSMutableDictionary<String, NSDictionary<Object, NSArray<EOEnterpriseObject>>> values = new NSMutableDictionary();
+	private NSMutableDictionary<String, NSMutableArray<Object>> selectedValues = new NSMutableDictionary();
+
+	public ERDFacetFilter(WOContext context) {
+		super(context);
+	}
+	
+	@Override
+	public boolean synchronizesVariablesWithBindings() {
+		return false;
+	}
+
+	public NSArray<EOEnterpriseObject> allObjects() {
+		if(_allObjects == null && allKeys() != null) {
+			_allObjects = (NSArray<EOEnterpriseObject>) displayGroup().allObjects();
+			values.removeAllObjects();
+			selectedValues.removeAllObjects();
+			for (String keyPath : allKeys()) {
+				NSDictionary<Object, NSArray<EOEnterpriseObject>> groupedObjects = ERXArrayUtilities.arrayGroupedByKeyPath(_allObjects, keyPath);
+				values.setObjectForKey(groupedObjects, keyPath);
+				selectedValues.setObjectForKey(new NSMutableArray(), keyPath);
+			}
+		}
+		return _allObjects;
+	}
+	
+	public NSArray<String> allKeys() {
+		return (NSArray<String>) valueForBinding("groupingKeys");
+	}
+
+	public NSArray valueList() {
+		return ERXS.asc("toString").sorted(values.objectForKey(currentKey).allKeys());
+	}
+	
+	public int currentValueCount() {
+		return values.objectForKey(currentKey).objectForKey(currentValue).count();
+	}
+
+	public NSArray keyList() {
+		allObjects();
+		return values.allKeys();
+	}
+
+	public boolean isCurrentValueSelected() {
+		NSMutableArray<Object> selected = selectedValues.objectForKey(currentKey);
+		return selected.containsObject(currentValue);
+	}
+	
+	public WOActionResults selectCurrentValue() {
+		NSMutableArray<Object> selected = selectedValues.objectForKey(currentKey);
+		if(selected.containsObject(currentValue)) {
+			selected.removeObject(currentValue);
+		} else {
+			selected.addObject(currentValue);
+		}
+		updateSelectedValues();
+		return null;
+	}
+
+	public void updateSelectedValues() {
+		if (selectedValues.count() > 0) {
+			NSMutableSet eos = new NSMutableSet(allObjects());
+			for (String key : selectedValues.allKeys()) {
+				NSMutableArray<Object> selection = selectedValues.objectForKey(key);
+				if (selection.count() > 0) {
+					NSMutableSet currentEos = new NSMutableSet();
+					for (Object value : selection) {
+						currentEos.addObjectsFromArray(values.objectForKey(key).objectForKey(value));
+					}
+					eos.intersectSet(currentEos);
+				}
+			}
+			displayGroup().setObjectArray(eos.allObjects());
+			displayGroup().setSortOrderings(displayGroup().sortOrderings());
+		} else {
+			displayGroup().setObjectArray(null);
+		}
+	}
+
+	public boolean hasSelectedValues() {
+		return selectedValues.objectForKey(currentKey).count() > 0;
+	}
+
+	public WOActionResults clearSelectedValues() {
+		selectedValues.objectForKey(currentKey).removeAllObjects();
+		updateSelectedValues();
+		return null;
+	}
+}
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12103] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions/Sources/er/extensions/components/ ERXListDisplay.java

From: <an...@us...> - 2012-05-23 18:47:08

Revision: 12103
          http://wonder.svn.sourceforge.net/wonder/?rev=12103&view=rev
Author:   anjo
Date:     2012-05-23 18:47:02 +0000 (Wed, 23 May 2012)
Log Message:
-----------
list and array support

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXListDisplay.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXListDisplay.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXListDisplay.java	2012-05-23 18:46:33 UTC (rev 12102)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXListDisplay.java	2012-05-23 18:47:02 UTC (rev 12103)
@@ -53,7 +53,12 @@
     
     public NSArray list() {
         if(list == null) {
-            list =(NSArray)valueForBinding("list");
+        	Object o = valueForBinding("list");
+        	if(o instanceof NSArray) {
+                list =(NSArray)o;
+        	} else if(o instanceof Object[]) {
+                list =new NSArray((Object[])o);
+        	}
         }
         return list;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12102] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEC.java

From: <an...@us...> - 2012-05-23 18:46:40

Revision: 12102
          http://wonder.svn.sourceforge.net/wonder/?rev=12102&view=rev
Author:   anjo
Date:     2012-05-23 18:46:33 +0000 (Wed, 23 May 2012)
Log Message:
-----------
using NS api

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEC.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEC.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEC.java	2012-05-23 18:04:05 UTC (rev 12101)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEC.java	2012-05-23 18:46:33 UTC (rev 12102)
@@ -671,7 +671,7 @@
 		if (traces != null && traces.count() != 0) {
 			String instance = getClass().getSimpleName() + "@" + System.identityHashCode(this);
 			log.error(instance + " Disposed with " + traces.count() + " locks (finalizing = " + isFinalizing + ")");
-			for (NSMutableArray<Exception> actual : traces.values()) {
+			for (NSMutableArray<Exception> actual : traces.allValues()) {
 				for (Exception existingOpenLockTrace : actual) {
 					log.error(instance + " Existing lock: ", existingOpenLockTrace);
 				}
@@ -1818,7 +1818,7 @@
 				if(!ERXEC.traceOpenLocks()) {
 					pw.println("Stack tracing is disabled");
 				} else {
-					for (Thread thread : traces.keySet()) {
+					for (Thread thread : traces.allKeys()) {
 						pw.println("Outstanding at @" + thread);
 						for(Exception ex: traces.objectForKey(thread)) {
 							ex.printStackTrace(pw);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12101] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout .java

From: <an...@us...> - 2012-05-23 18:04:15

Revision: 12101
          http://wonder.svn.sourceforge.net/wonder/?rev=12101&view=rev
Author:   anjo
Date:     2012-05-23 18:04:05 +0000 (Wed, 23 May 2012)
Log Message:
-----------
what do you know... java has evolved a bit in the last 10 years!

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout.java	2012-05-23 17:52:04 UTC (rev 12100)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout.java	2012-05-23 18:04:05 UTC (rev 12101)
@@ -197,12 +197,12 @@
 		 */
 		@Override
 		public String convert(LoggingEvent event) {
-			NSArray parts = NSArray.componentsSeparatedByString(ERXUtilities.stackTrace(), "\n\t");
-			for (Enumeration e = parts.objectEnumerator(); e.hasMoreElements();) {
-				String line = (String) e.nextElement();
-				int offset = line.indexOf("(");
-				if (offset > 0 && line.matches("^at .*?\\.test\\w+\\(.*")) {
-					return line.replaceAll(".*?\\.(\\w+\\.\\w+\\(.*?\\))$", "$1");
+			Throwable t = new Throwable();
+			for (StackTraceElement e : t.getStackTrace()) {
+				if (e.getMethodName().startsWith("test")) {
+					String className = e.getClassName();
+					int index = className.lastIndexOf(".");
+					return className.substring(index > 0 ? index + 1 : 0 ) + "." + e.getMethodName() + "(" + e.getFileName() + ":" + e.getLineNumber() + ")";
 				}
 			}
 			return "";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12100] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout .java

From: <an...@us...> - 2012-05-23 17:52:15

Revision: 12100
          http://wonder.svn.sourceforge.net/wonder/?rev=12100&view=rev
Author:   anjo
Date:     2012-05-23 17:52:04 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Logging support for unit tests (should not be run in production).

%U outputs TestClass.testMethod(TestFile.java:Line)

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout.java	2012-05-22 14:43:26 UTC (rev 12099)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERExtensions/Sources/er/extensions/logging/ERXPatternLayout.java	2012-05-23 17:52:04 UTC (rev 12100)
@@ -161,6 +161,10 @@
 			addConverter(new ThreadStoragePatternConverter(formattingInfo, extractOption()));
 			currentLiteral.setLength(0);
 			break;
+		case 'U':
+			addConverter(new UnitTestPatternConverter(formattingInfo));
+			currentLiteral.setLength(0);
+			break;
 		default:
 			super.finalizeConverter(c);
 			break;
@@ -168,6 +172,45 @@
 	}
 
 	/**
+	 * Shows TestClass.testName(TestClass.java:Line)
+	 * @author ak
+	 *
+	 */
+	private class UnitTestPatternConverter extends PatternConverter {
+		/**
+		 * Package access level constructor.
+		 * 
+		 * @param formattingInfo
+		 *            that is currently being used for this pattern converter.
+		 */
+		UnitTestPatternConverter(FormattingInfo formattingInfo) {
+			super(formattingInfo);
+		}
+
+		/**
+		 * For a given log event returns the string representation of a stack
+		 * trace for the current logging call minus all of the log4j stack.
+		 * 
+		 * @param event
+		 *            current logging event
+		 * @return string representation of the current backtrace.
+		 */
+		@Override
+		public String convert(LoggingEvent event) {
+			NSArray parts = NSArray.componentsSeparatedByString(ERXUtilities.stackTrace(), "\n\t");
+			for (Enumeration e = parts.objectEnumerator(); e.hasMoreElements();) {
+				String line = (String) e.nextElement();
+				int offset = line.indexOf("(");
+				if (offset > 0 && line.matches("^at .*?\\.test\\w+\\(.*")) {
+					return line.replaceAll(".*?\\.(\\w+\\.\\w+\\(.*?\\))$", "$1");
+				}
+			}
+			return "";
+		}
+	}
+
+	
+	/**
 	 * The stack trace pattern is useful for logging full stack traces when a
 	 * log event occurs.
 	 */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12099] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/Core/ERDirectToWeb/Resources/German.lproj/Localizable.strings

From: <an...@us...> - 2012-05-22 14:43:38

Revision: 12099
          http://wonder.svn.sourceforge.net/wonder/?rev=12099&view=rev
Author:   anjo
Date:     2012-05-22 14:43:26 +0000 (Tue, 22 May 2012)
Log Message:
-----------
advanced find added

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Resources/German.lproj/Localizable.strings

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Resources/German.lproj/Localizable.strings
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Resources/German.lproj/Localizable.strings	2012-05-22 07:34:06 UTC (rev 12098)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/Core/ERDirectToWeb/Resources/German.lproj/Localizable.strings	2012-05-22 14:43:26 UTC (rev 12099)
@@ -4,6 +4,7 @@
 	"CouldNotSavePleaseReapply" = "Ihre \U00c4nderungen konnten nicht gesichert werden. Der/die @@displayNameForEntity@@ wurde von einem anderen Benutzer ver\U00e4ndert und Ihre \U00c4nderungen wurden verworfen. Bitte versuchen Sie es erneut.";
 	"ends with" = "ends with";
 	"ERD2W.addButtonLabel" = "Anlegen";
+	"ERD2W.advancedFindButtonLabel" = "Mehr...";
 	"ERD2W.cancelButtonLabel" = "Abbrechen";
 	"ERD2W.cancelCreationMessage" = "<b>Wollen Sie das Anlegen von @@displayNameForEntity@@ abbrechen?</b><br /><br />Mit <b>OK</b> verwerfen Sie alle \U00c4nderungen, mit <b>Abbrechen</b> k\U00f6nnen Sie weiter bearbeiten.";
 	"ERD2W.clearButtonLabel" = "L\U00f6schen";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Wonder-cvs] SF.net SVN: wonder:[12098] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Examples/Misc

From: <an...@us...> - 2012-05-22 07:34:16

Revision: 12098
          http://wonder.svn.sourceforge.net/wonder/?rev=12098&view=rev
Author:   anjo
Date:     2012-05-22 07:34:06 +0000 (Tue, 22 May 2012)
Log Message:
-----------
uppdated REST

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/Client.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/ClientCompanyRestDelegate.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/ERXRestClient.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/delegates/CarRestDelegate.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/delegates/ManufacturerRestDelegate.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Animal.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Company.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Person.java
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/.settings/org.eclipse.core.resources.prefs
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/Components/Main.wo/Main.woo

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/Client.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/Client.java	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/Client.java	2012-05-22 07:34:06 UTC (rev 12098)
@@ -10,6 +10,7 @@
 
 import er.extensions.eof.ERXKeyFilter;
 import er.rest.ERXNoOpRestDelegate;
+import er.rest.ERXRestContext;
 import er.rest.ERXRestNameRegistry;
 import er.rest.ERXRestRequestNode;
 import er.rest.IERXRestDelegate;
@@ -20,23 +21,21 @@
 		String baseURL = "http://localhost:8642/cgi-bin/WebObjects/RESTExample.woa/ra";
 		
 		ERXRestNameRegistry.registry().setExternalNameForInternalName("Company", "ClientCompany");
-		IERXRestDelegate.Factory.setDefaultDelegateClass(ERXNoOpRestDelegate.class);
-		IERXRestDelegate.Factory.setDelegateForEntityNamed(ClientCompanyRestDelegate.class, "ClientCompany", ClientCompany.class);
+		IERXRestDelegate.Factory.setDefaultDelegate(new ERXNoOpRestDelegate());
+		IERXRestDelegate.Factory.setDelegateForEntityNamed(new ClientCompanyRestDelegate(), "ClientCompany", ClientCompany.class);
 
-		ERXNoOpRestDelegate delegate = new ERXNoOpRestDelegate();
-
-		ERXRestClient client = new ERXRestClient(baseURL, delegate);
+		ERXRestClient client = new ERXRestClient(baseURL, new ERXRestContext());
 		ClientCompany c = client.objectWithPath("Company/1.json");
 		System.out.println("Client.main: single company = " + c);
 
-		Object obj = new ERXRestClient(client.baseURL(), delegate, false).objectWithPath("Pet/1.json");
+		Object obj = new ERXRestClient(client.baseURL(), new ERXRestContext(), false).objectWithPath("Pet/1.json");
 		System.out.println("Client.main: unknown class = " + obj);
 
 		NSArray<ClientCompany> comps = client.objectWithPath("Company.json", "ClientCompany");
 		System.out.println("Client.main: array of companies = " + comps);
 
 		c.setName("New Name");
-		client.updateObjectWithPath(c, ERXKeyFilter.filterWithAllRecursive(), "Company/1.json", ERXRestFormat.JSON);
+		client.updateObjectWithPath(c, ERXKeyFilter.filterWithAllRecursive(), "Company/1.json", ERXRestFormat.json());
 
 		ClientCompany updatedCompany = client.objectWithPath("Company/1.json");
 		System.out.println("Client.main: updated company = " + updatedCompany);
@@ -46,16 +45,16 @@
 		dict.setObjectForKey("Mike", "firstName");
 		dict.setObjectForKey(new NSDictionary<String, Object>("true", "nested"), "child");
 		dict.setObjectForKey(new NSArray<String>("a", "b"), "array");
-		String dictJSON = ERXRestFormat.JSON.toString(dict);
+		String dictJSON = ERXRestFormat.json().toString(dict);
 		System.out.println("Client.main: dictionary as JSON " + dictJSON);
 
 		NSArray<?> list = new NSArray<String>("a", "b");
-		String arrayJSON = ERXRestFormat.JSON.toString(list);
+		String arrayJSON = ERXRestFormat.json().toString(list);
 		System.out.println("Client.main: array as JSON " + arrayJSON);
 
 		ClientCompany newCompany = new ClientCompany();
 		newCompany.setName("Peters Pickles");
-		ERXRestRequestNode node = client.createObjectWithPath(newCompany, ERXKeyFilter.filterWithAllRecursive(), "Company.json", ERXRestFormat.JSON);
-		System.out.println("Client.main: The newly created company is: " + node.toString(ERXRestFormat.JSON));
+		ERXRestRequestNode node = client.createObjectWithPath(newCompany, ERXKeyFilter.filterWithAllRecursive(), "Company.json", ERXRestFormat.json());
+		System.out.println("Client.main: The newly created company is: " + node.toString(ERXRestFormat.json(), new ERXRestContext()));
 	}
 }

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/ClientCompanyRestDelegate.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/ClientCompanyRestDelegate.java	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/ClientCompanyRestDelegate.java	2012-05-22 07:34:06 UTC (rev 12098)
@@ -6,30 +6,18 @@
 import com.webobjects.eocontrol.EOClassDescription;
 
 import er.rest.ERXAbstractRestDelegate;
+import er.rest.ERXRestContext;
 
 public class ClientCompanyRestDelegate extends ERXAbstractRestDelegate {
-	@Override
-	public boolean shouldCreateMissingObjects() {
-		return true;
-	}
-
-	@Override
-	protected Object _primaryKeyForObject(EOClassDescription entity, Object obj) {
+    public Object primaryKeyForObject(Object obj, ERXRestContext context) {
 		return ((ClientCompany) obj).getId();
 	}
-
-	@Override
-	protected boolean _isDelegateForEntity(EOClassDescription entity) {
-		return ClientCompany.class.getSimpleName().equals(entity.entityName());
-	}
-
-	@Override
-	protected Object _fetchObjectOfEntityWithID(EOClassDescription entity, Object id) {
+    
+    public Object objectOfEntityWithID(EOClassDescription entity, Object id, ERXRestContext context) {
 		return null;
 	}
-
-	@Override
-	protected Object _createObjectOfEntityWithID(EOClassDescription entity, Object id) {
+    
+    public Object createObjectOfEntityWithID(EOClassDescription entity, Object id, ERXRestContext context) {
 		ClientCompany comp = new ClientCompany();
 		comp.setId(String.valueOf(id));
 		return comp;

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/ERXRestClient.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/ERXRestClient.java	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/client/ERXRestClient.java	2012-05-22 07:34:06 UTC (rev 12098)
@@ -16,26 +16,26 @@
 import er.extensions.eof.ERXKeyFilter;
 import er.extensions.foundation.ERXMutableURL;
 import er.rest.ERXRestClassDescriptionFactory;
+import er.rest.ERXRestContext;
 import er.rest.ERXRestRequestNode;
-import er.rest.IERXRestDelegate;
 import er.rest.format.ERXRestFormat;
 import er.rest.format.ERXStringBufferRestResponse;
 import er.rest.format.ERXStringRestRequest;
 
 public class ERXRestClient {
 	private String _baseURL;
-	private IERXRestDelegate _delegate;
+	private ERXRestContext _context;
 	private boolean _classDescriptionRequired;
 	private HttpClient _httpClient = null;
 
-	public ERXRestClient(String baseURL, IERXRestDelegate delegate, boolean classDescriptionRequired) {
+	public ERXRestClient(String baseURL, ERXRestContext context, boolean classDescriptionRequired) {
 		_baseURL = baseURL;
-		_delegate = delegate;
+		_context = context;
 		setClassDescriptionRequired(classDescriptionRequired);
 	}
 
-	public ERXRestClient(String baseURL, IERXRestDelegate delegate) {
-		this(baseURL, delegate, true);
+	public ERXRestClient(String baseURL, ERXRestContext context) {
+		this(baseURL, context, true);
 	}
 
 	public void setBaseURL(String baseURL) {
@@ -45,15 +45,15 @@
 	public String baseURL() {
 		return _baseURL;
 	}
+	
+	public void setContext(ERXRestContext context) {
+        _context = context;
+    }
+	
+	public ERXRestContext context() {
+        return _context;
+    }
 
-	public void setDelegate(IERXRestDelegate delegate) {
-		_delegate = delegate;
-	}
-
-	public IERXRestDelegate delegate() {
-		return _delegate;
-	}
-
 	public void setClassDescriptionRequired(boolean classDescriptionRequired) {
 		_classDescriptionRequired = classDescriptionRequired;
 	}
@@ -73,7 +73,7 @@
 	/* Extract the requestNode from the given method using the given format.
 	 */
 	protected ERXRestRequestNode requestNodeWithMethod(HttpMethodBase method, ERXRestFormat format) throws IOException {
-		ERXRestRequestNode responseNode = format.parser().parseRestRequest(new ERXStringRestRequest(method.getResponseBodyAsString()), format.delegate());
+		ERXRestRequestNode responseNode = format.parser().parseRestRequest(new ERXStringRestRequest(method.getResponseBodyAsString()), format.delegate(), _context);
 		return responseNode;
 	}
 
@@ -84,7 +84,7 @@
 			obj = node;
 		}
 		else {
-			obj = node.objectWithFilter(entityName, ERXKeyFilter.filterWithAllRecursive(), _delegate);
+			obj = node.objectWithFilter(entityName, ERXKeyFilter.filterWithAllRecursive(), _context);
 		}
 		return obj;
 	}
@@ -157,9 +157,9 @@
 	}
 
 	public ERXRestRequestNode updateObjectWithPath(Object obj, ERXKeyFilter filter, String path, ERXRestFormat format) throws HttpException, IOException {
-		ERXRestRequestNode node = ERXRestRequestNode.requestNodeWithObjectAndFilter(obj, filter, _delegate);
+		ERXRestRequestNode node = ERXRestRequestNode.requestNodeWithObjectAndFilter(obj, filter, _context);
 		ERXStringBufferRestResponse response = new ERXStringBufferRestResponse();
-		format.writer().appendToResponse(node, response, format.delegate());
+		format.writer().appendToResponse(node, response, format.delegate(), _context);
 
 		HttpClient client = httpClient();
 		PutMethod updateObjectMethod = new PutMethod(new ERXMutableURL(_baseURL).appendPath(path).toExternalForm());
@@ -173,9 +173,9 @@
 	}
 
 	public ERXRestRequestNode createObjectWithPath(Object obj, ERXKeyFilter filter, String path, ERXRestFormat format) throws HttpException, IOException {
-		ERXRestRequestNode node = ERXRestRequestNode.requestNodeWithObjectAndFilter(obj, filter, _delegate);
+		ERXRestRequestNode node = ERXRestRequestNode.requestNodeWithObjectAndFilter(obj, filter, _context);
 		ERXStringBufferRestResponse response = new ERXStringBufferRestResponse();
-		format.writer().appendToResponse(node, response, format.delegate());
+		format.writer().appendToResponse(node, response, format.delegate(), _context);
 
 		HttpClient client = httpClient();
 		PostMethod updateObjectMethod = new PostMethod(new ERXMutableURL(_baseURL).appendPath(path).toExternalForm());
@@ -189,7 +189,7 @@
 	}
 
 	public ERXRestRequestNode deleteObjectWithPath(Object obj, String path, ERXRestFormat format) throws HttpException, IOException {
-		ERXRestRequestNode node = ERXRestRequestNode.requestNodeWithObjectAndFilter(obj, ERXKeyFilter.filterWithNone(), _delegate);
+		ERXRestRequestNode node = ERXRestRequestNode.requestNodeWithObjectAndFilter(obj, ERXKeyFilter.filterWithNone(), _context);
 
 		HttpClient client = httpClient();
 		DeleteMethod deleteObjectMethod = new DeleteMethod(new ERXMutableURL(_baseURL).appendPath(path).toExternalForm());

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/delegates/CarRestDelegate.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/delegates/CarRestDelegate.java	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/delegates/CarRestDelegate.java	2012-05-22 07:34:06 UTC (rev 12098)
@@ -5,6 +5,7 @@
 
 import er.extensions.eof.ERXQ;
 import er.rest.ERXAbstractRestDelegate;
+import er.rest.ERXRestContext;
 import er.rest.example.model.Car;
 
 /**
@@ -18,25 +19,17 @@
 public class CarRestDelegate extends ERXAbstractRestDelegate {
 	public CarRestDelegate() {
 	}
-
-	@Override
-	protected Object _createObjectOfEntityWithID(EOClassDescription entity, Object id) {
+	
+	public Object createObjectOfEntityWithID(EOClassDescription entity, Object id, ERXRestContext context) {
 		return new Car();
 	}
-
-	@Override
-	protected Object _primaryKeyForObject(EOClassDescription entity, Object obj) {
+	
+	public Object primaryKeyForObject(Object obj, ERXRestContext context) {
 		return ((Car) obj).getName();
 	}
-
-	@Override
-	protected Object _fetchObjectOfEntityWithID(EOClassDescription entity, Object id) {
+	
+	public Object objectOfEntityWithID(EOClassDescription entity, Object id, ERXRestContext context) {
 		NSArray<Car> cars = ERXQ.filtered(Car.cars(), ERXQ.is("name", id));
 		return cars.size() == 0 ? null : cars.objectAtIndex(0);
 	}
-
-	@Override
-	protected boolean _isDelegateForEntity(EOClassDescription entity) {
-		return "Car".equals(entity.entityName());
-	}
 }

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/delegates/ManufacturerRestDelegate.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/delegates/ManufacturerRestDelegate.java	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/delegates/ManufacturerRestDelegate.java	2012-05-22 07:34:06 UTC (rev 12098)
@@ -5,38 +5,31 @@
 
 import er.extensions.eof.ERXQ;
 import er.rest.ERXAbstractRestDelegate;
+import er.rest.ERXRestContext;
 import er.rest.example.model.Manufacturer;
 
 /**
  * ManufacturerRestDelegate is an example of a rest delegate for retrieving
- * and creating objects of non-EO types. The name of the class is 
- * important (the delegate for the "Manufacturer" entity), though you can manually 
- * register a different class name via IERXRestDelegate.Factory.
- *  
+ * and creating objects of non-EO types. The name of the class is
+ * important (the delegate for the "Manufacturer" entity), though you can
+ * manually register a different class name via IERXRestDelegate.Factory.
+ * 
  * @author mschrag
  */
 public class ManufacturerRestDelegate extends ERXAbstractRestDelegate {
-	public ManufacturerRestDelegate() {
-	}
+    public ManufacturerRestDelegate() {
+    }
 
-	@Override
-	protected Object _createObjectOfEntityWithID(EOClassDescription entity, Object id) {
-		return new Manufacturer();
-	}
+    public Object createObjectOfEntityWithID(EOClassDescription entity, Object id, ERXRestContext context) {
+        return new Manufacturer();
+    }
 
-	@Override
-	protected Object _primaryKeyForObject(EOClassDescription entity, Object obj) {
-		return ((Manufacturer) obj).getName();
-	}
+    public Object primaryKeyForObject(Object obj, ERXRestContext context) {
+        return ((Manufacturer) obj).getName();
+    }
 
-	@Override
-	protected Object _fetchObjectOfEntityWithID(EOClassDescription entity, Object id) {
-		NSArray<Manufacturer> manufacturers = ERXQ.filtered(Manufacturer.manufacturers(), ERXQ.is("name", id));
-		return manufacturers.size() == 0 ? null : manufacturers.objectAtIndex(0);
-	}
-
-	@Override
-	protected boolean _isDelegateForEntity(EOClassDescription entity) {
-		return "Manufacturer".equals(entity.entityName());
-	}
+    public Object objectOfEntityWithID(EOClassDescription entity, Object id, ERXRestContext context) {
+        NSArray<Manufacturer> manufacturers = ERXQ.filtered(Manufacturer.manufacturers(), ERXQ.is("name", id));
+        return manufacturers.size() == 0 ? null : manufacturers.objectAtIndex(0);
+    }
 }

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Animal.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Animal.java	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Animal.java	2012-05-22 07:34:06 UTC (rev 12098)
@@ -1,4 +1,4 @@
-// $LastChangedRevision: 4733 $ DO NOT EDIT.  Make changes to Animal.java instead.
+// DO NOT EDIT.  Make changes to Animal.java instead.
 package er.rest.example.model;
 
 import com.webobjects.eoaccess.*;
@@ -36,22 +36,22 @@
   }
 
   public String name() {
-    return (String) storedValueForKey("name");
+    return (String) storedValueForKey(_Animal.NAME_KEY);
   }
 
   public void setName(String value) {
     if (_Animal.LOG.isDebugEnabled()) {
     	_Animal.LOG.debug( "updating name from " + name() + " to " + value);
     }
-    takeStoredValueForKey(value, "name");
+    takeStoredValueForKey(value, _Animal.NAME_KEY);
   }
 
   public er.rest.example.model.Person owner() {
-    return (er.rest.example.model.Person)storedValueForKey("owner");
+    return (er.rest.example.model.Person)storedValueForKey(_Animal.OWNER_KEY);
   }
   
   public void setOwner(er.rest.example.model.Person value) {
-    takeStoredValueForKey(value, "owner");
+    takeStoredValueForKey(value, _Animal.OWNER_KEY);
   }
 
   public void setOwnerRelationship(er.rest.example.model.Person value) {
@@ -64,10 +64,10 @@
     else if (value == null) {
     	er.rest.example.model.Person oldValue = owner();
     	if (oldValue != null) {
-    		removeObjectFromBothSidesOfRelationshipWithKey(oldValue, "owner");
+    		removeObjectFromBothSidesOfRelationshipWithKey(oldValue, _Animal.OWNER_KEY);
       }
     } else {
-    	addObjectToBothSidesOfRelationshipWithKey(value, "owner");
+    	addObjectToBothSidesOfRelationshipWithKey(value, _Animal.OWNER_KEY);
     }
   }
   
@@ -80,6 +80,10 @@
     return eo;
   }
 
+  public static ERXFetchSpecification<Animal> fetchSpec() {
+    return new ERXFetchSpecification<Animal>(_Animal.ENTITY_NAME, null, null, false, true, null);
+  }
+
   public static NSArray<Animal> fetchAllAnimals(EOEditingContext editingContext) {
     return _Animal.fetchAllAnimals(editingContext, null);
   }
@@ -89,9 +93,9 @@
   }
 
   public static NSArray<Animal> fetchAnimals(EOEditingContext editingContext, EOQualifier qualifier, NSArray<EOSortOrdering> sortOrderings) {
-    EOFetchSpecification fetchSpec = new EOFetchSpecification(_Animal.ENTITY_NAME, qualifier, sortOrderings);
+    ERXFetchSpecification<Animal> fetchSpec = new ERXFetchSpecification<Animal>(_Animal.ENTITY_NAME, qualifier, sortOrderings);
     fetchSpec.setIsDeep(true);
-    NSArray<Animal> eoObjects = (NSArray<Animal>)editingContext.objectsWithFetchSpecification(fetchSpec);
+    NSArray<Animal> eoObjects = fetchSpec.fetchObjects(editingContext);
     return eoObjects;
   }
 
@@ -107,7 +111,7 @@
       eoObject = null;
     }
     else if (count == 1) {
-      eoObject = (Animal)eoObjects.objectAtIndex(0);
+      eoObject = eoObjects.objectAtIndex(0);
     }
     else {
       throw new IllegalStateException("There was more than one Animal that matched the qualifier '" + qualifier + "'.");
@@ -128,7 +132,7 @@
   }
 
   public static Animal localInstanceIn(EOEditingContext editingContext, Animal eo) {
-    Animal localInstance = (eo == null) ? null : (Animal)EOUtilities.localInstanceOfObject(editingContext, eo);
+    Animal localInstance = (eo == null) ? null : ERXEOControlUtilities.localInstanceOfObject(editingContext, eo);
     if (localInstance == null && eo != null) {
       throw new IllegalStateException("You attempted to localInstance " + eo + ", which has not yet committed.");
     }

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Company.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Company.java	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Company.java	2012-05-22 07:34:06 UTC (rev 12098)
@@ -1,4 +1,4 @@
-// $LastChangedRevision: 4733 $ DO NOT EDIT.  Make changes to Company.java instead.
+// DO NOT EDIT.  Make changes to Company.java instead.
 package er.rest.example.model;
 
 import com.webobjects.eoaccess.*;
@@ -36,18 +36,18 @@
   }
 
   public String name() {
-    return (String) storedValueForKey("name");
+    return (String) storedValueForKey(_Company.NAME_KEY);
   }
 
   public void setName(String value) {
     if (_Company.LOG.isDebugEnabled()) {
     	_Company.LOG.debug( "updating name from " + name() + " to " + value);
     }
-    takeStoredValueForKey(value, "name");
+    takeStoredValueForKey(value, _Company.NAME_KEY);
   }
 
   public NSArray<er.rest.example.model.Person> employees() {
-    return (NSArray<er.rest.example.model.Person>)storedValueForKey("employees");
+    return (NSArray<er.rest.example.model.Person>)storedValueForKey(_Company.EMPLOYEES_KEY);
   }
 
   public NSArray<er.rest.example.model.Person> employees(EOQualifier qualifier) {
@@ -68,7 +68,7 @@
         fullQualifier = inverseQualifier;
       }
       else {
-        NSMutableArray qualifiers = new NSMutableArray();
+        NSMutableArray<EOQualifier> qualifiers = new NSMutableArray<EOQualifier>();
         qualifiers.addObject(qualifier);
         qualifiers.addObject(inverseQualifier);
         fullQualifier = new EOAndQualifier(qualifiers);
@@ -89,11 +89,11 @@
   }
   
   public void addToEmployees(er.rest.example.model.Person object) {
-    includeObjectIntoPropertyWithKey(object, "employees");
+    includeObjectIntoPropertyWithKey(object, _Company.EMPLOYEES_KEY);
   }
 
   public void removeFromEmployees(er.rest.example.model.Person object) {
-    excludeObjectFromPropertyWithKey(object, "employees");
+    excludeObjectFromPropertyWithKey(object, _Company.EMPLOYEES_KEY);
   }
 
   public void addToEmployeesRelationship(er.rest.example.model.Person object) {
@@ -104,7 +104,7 @@
     	addToEmployees(object);
     }
     else {
-    	addObjectToBothSidesOfRelationshipWithKey(object, "employees");
+    	addObjectToBothSidesOfRelationshipWithKey(object, _Company.EMPLOYEES_KEY);
     }
   }
 
@@ -116,27 +116,27 @@
     	removeFromEmployees(object);
     }
     else {
-    	removeObjectFromBothSidesOfRelationshipWithKey(object, "employees");
+    	removeObjectFromBothSidesOfRelationshipWithKey(object, _Company.EMPLOYEES_KEY);
     }
   }
 
   public er.rest.example.model.Person createEmployeesRelationship() {
-    EOClassDescription eoClassDesc = EOClassDescription.classDescriptionForEntityName("Person");
+    EOClassDescription eoClassDesc = EOClassDescription.classDescriptionForEntityName( er.rest.example.model.Person.ENTITY_NAME );
     EOEnterpriseObject eo = eoClassDesc.createInstanceWithEditingContext(editingContext(), null);
     editingContext().insertObject(eo);
-    addObjectToBothSidesOfRelationshipWithKey(eo, "employees");
+    addObjectToBothSidesOfRelationshipWithKey(eo, _Company.EMPLOYEES_KEY);
     return (er.rest.example.model.Person) eo;
   }
 
   public void deleteEmployeesRelationship(er.rest.example.model.Person object) {
-    removeObjectFromBothSidesOfRelationshipWithKey(object, "employees");
+    removeObjectFromBothSidesOfRelationshipWithKey(object, _Company.EMPLOYEES_KEY);
     editingContext().deleteObject(object);
   }
 
   public void deleteAllEmployeesRelationships() {
-    Enumeration objects = employees().immutableClone().objectEnumerator();
+    Enumeration<er.rest.example.model.Person> objects = employees().immutableClone().objectEnumerator();
     while (objects.hasMoreElements()) {
-      deleteEmployeesRelationship((er.rest.example.model.Person)objects.nextElement());
+      deleteEmployeesRelationship(objects.nextElement());
     }
   }
 
@@ -148,6 +148,10 @@
     return eo;
   }
 
+  public static ERXFetchSpecification<Company> fetchSpec() {
+    return new ERXFetchSpecification<Company>(_Company.ENTITY_NAME, null, null, false, true, null);
+  }
+
   public static NSArray<Company> fetchAllCompanies(EOEditingContext editingContext) {
     return _Company.fetchAllCompanies(editingContext, null);
   }
@@ -157,9 +161,9 @@
   }
 
   public static NSArray<Company> fetchCompanies(EOEditingContext editingContext, EOQualifier qualifier, NSArray<EOSortOrdering> sortOrderings) {
-    EOFetchSpecification fetchSpec = new EOFetchSpecification(_Company.ENTITY_NAME, qualifier, sortOrderings);
+    ERXFetchSpecification<Company> fetchSpec = new ERXFetchSpecification<Company>(_Company.ENTITY_NAME, qualifier, sortOrderings);
     fetchSpec.setIsDeep(true);
-    NSArray<Company> eoObjects = (NSArray<Company>)editingContext.objectsWithFetchSpecification(fetchSpec);
+    NSArray<Company> eoObjects = fetchSpec.fetchObjects(editingContext);
     return eoObjects;
   }
 
@@ -175,7 +179,7 @@
       eoObject = null;
     }
     else if (count == 1) {
-      eoObject = (Company)eoObjects.objectAtIndex(0);
+      eoObject = eoObjects.objectAtIndex(0);
     }
     else {
       throw new IllegalStateException("There was more than one Company that matched the qualifier '" + qualifier + "'.");
@@ -196,7 +200,7 @@
   }
 
   public static Company localInstanceIn(EOEditingContext editingContext, Company eo) {
-    Company localInstance = (eo == null) ? null : (Company)EOUtilities.localInstanceOfObject(editingContext, eo);
+    Company localInstance = (eo == null) ? null : ERXEOControlUtilities.localInstanceOfObject(editingContext, eo);
     if (localInstance == null && eo != null) {
       throw new IllegalStateException("You attempted to localInstance " + eo + ", which has not yet committed.");
     }

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Person.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Person.java	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/ERRestRouteExample/Sources/er/rest/example/model/_Person.java	2012-05-22 07:34:06 UTC (rev 12098)
@@ -1,4 +1,4 @@
-// $LastChangedRevision: 4733 $ DO NOT EDIT.  Make changes to Person.java instead.
+// DO NOT EDIT.  Make changes to Person.java instead.
 package er.rest.example.model;
 
 import com.webobjects.eoaccess.*;
@@ -38,22 +38,22 @@
   }
 
   public String name() {
-    return (String) storedValueForKey("name");
+    return (String) storedValueForKey(_Person.NAME_KEY);
   }
 
   public void setName(String value) {
     if (_Person.LOG.isDebugEnabled()) {
     	_Person.LOG.debug( "updating name from " + name() + " to " + value);
     }
-    takeStoredValueForKey(value, "name");
+    takeStoredValueForKey(value, _Person.NAME_KEY);
   }
 
   public er.rest.example.model.Company company() {
-    return (er.rest.example.model.Company)storedValueForKey("company");
+    return (er.rest.example.model.Company)storedValueForKey(_Person.COMPANY_KEY);
   }
   
   public void setCompany(er.rest.example.model.Company value) {
-    takeStoredValueForKey(value, "company");
+    takeStoredValueForKey(value, _Person.COMPANY_KEY);
   }
 
   public void setCompanyRelationship(er.rest.example.model.Company value) {
@@ -66,15 +66,15 @@
     else if (value == null) {
     	er.rest.example.model.Company oldValue = company();
     	if (oldValue != null) {
-    		removeObjectFromBothSidesOfRelationshipWithKey(oldValue, "company");
+    		removeObjectFromBothSidesOfRelationshipWithKey(oldValue, _Person.COMPANY_KEY);
       }
     } else {
-    	addObjectToBothSidesOfRelationshipWithKey(value, "company");
+    	addObjectToBothSidesOfRelationshipWithKey(value, _Person.COMPANY_KEY);
     }
   }
   
   public NSArray<er.rest.example.model.Animal> pets() {
-    return (NSArray<er.rest.example.model.Animal>)storedValueForKey("pets");
+    return (NSArray<er.rest.example.model.Animal>)storedValueForKey(_Person.PETS_KEY);
   }
 
   public NSArray<er.rest.example.model.Animal> pets(EOQualifier qualifier) {
@@ -95,7 +95,7 @@
         fullQualifier = inverseQualifier;
       }
       else {
-        NSMutableArray qualifiers = new NSMutableArray();
+        NSMutableArray<EOQualifier> qualifiers = new NSMutableArray<EOQualifier>();
         qualifiers.addObject(qualifier);
         qualifiers.addObject(inverseQualifier);
         fullQualifier = new EOAndQualifier(qualifiers);
@@ -116,11 +116,11 @@
   }
   
   public void addToPets(er.rest.example.model.Animal object) {
-    includeObjectIntoPropertyWithKey(object, "pets");
+    includeObjectIntoPropertyWithKey(object, _Person.PETS_KEY);
   }
 
   public void removeFromPets(er.rest.example.model.Animal object) {
-    excludeObjectFromPropertyWithKey(object, "pets");
+    excludeObjectFromPropertyWithKey(object, _Person.PETS_KEY);
   }
 
   public void addToPetsRelationship(er.rest.example.model.Animal object) {
@@ -131,7 +131,7 @@
     	addToPets(object);
     }
     else {
-    	addObjectToBothSidesOfRelationshipWithKey(object, "pets");
+    	addObjectToBothSidesOfRelationshipWithKey(object, _Person.PETS_KEY);
     }
   }
 
@@ -143,27 +143,27 @@
     	removeFromPets(object);
     }
     else {
-    	removeObjectFromBothSidesOfRelationshipWithKey(object, "pets");
+    	removeObjectFromBothSidesOfRelationshipWithKey(object, _Person.PETS_KEY);
     }
   }
 
   public er.rest.example.model.Animal createPetsRelationship() {
-    EOClassDescription eoClassDesc = EOClassDescription.classDescriptionForEntityName("Animal");
+    EOClassDescription eoClassDesc = EOClassDescription.classDescriptionForEntityName( er.rest.example.model.Animal.ENTITY_NAME );
     EOEnterpriseObject eo = eoClassDesc.createInstanceWithEditingContext(editingContext(), null);
     editingContext().insertObject(eo);
-    addObjectToBothSidesOfRelationshipWithKey(eo, "pets");
+    addObjectToBothSidesOfRelationshipWithKey(eo, _Person.PETS_KEY);
     return (er.rest.example.model.Animal) eo;
   }
 
   public void deletePetsRelationship(er.rest.example.model.Animal object) {
-    removeObjectFromBothSidesOfRelationshipWithKey(object, "pets");
+    removeObjectFromBothSidesOfRelationshipWithKey(object, _Person.PETS_KEY);
     editingContext().deleteObject(object);
   }
 
   public void deleteAllPetsRelationships() {
-    Enumeration objects = pets().immutableClone().objectEnumerator();
+    Enumeration<er.rest.example.model.Animal> objects = pets().immutableClone().objectEnumerator();
     while (objects.hasMoreElements()) {
-      deletePetsRelationship((er.rest.example.model.Animal)objects.nextElement());
+      deletePetsRelationship(objects.nextElement());
     }
   }
 
@@ -175,6 +175,10 @@
     return eo;
   }
 
+  public static ERXFetchSpecification<Person> fetchSpec() {
+    return new ERXFetchSpecification<Person>(_Person.ENTITY_NAME, null, null, false, true, null);
+  }
+
   public static NSArray<Person> fetchAllPersons(EOEditingContext editingContext) {
     return _Person.fetchAllPersons(editingContext, null);
   }
@@ -184,9 +188,9 @@
   }
 
   public static NSArray<Person> fetchPersons(EOEditingContext editingContext, EOQualifier qualifier, NSArray<EOSortOrdering> sortOrderings) {
-    EOFetchSpecification fetchSpec = new EOFetchSpecification(_Person.ENTITY_NAME, qualifier, sortOrderings);
+    ERXFetchSpecification<Person> fetchSpec = new ERXFetchSpecification<Person>(_Person.ENTITY_NAME, qualifier, sortOrderings);
     fetchSpec.setIsDeep(true);
-    NSArray<Person> eoObjects = (NSArray<Person>)editingContext.objectsWithFetchSpecification(fetchSpec);
+    NSArray<Person> eoObjects = fetchSpec.fetchObjects(editingContext);
     return eoObjects;
   }
 
@@ -202,7 +206,7 @@
       eoObject = null;
     }
     else if (count == 1) {
-      eoObject = (Person)eoObjects.objectAtIndex(0);
+      eoObject = eoObjects.objectAtIndex(0);
     }
     else {
       throw new IllegalStateException("There was more than one Person that matched the qualifier '" + qualifier + "'.");
@@ -223,7 +227,7 @@
   }
 
   public static Person localInstanceIn(EOEditingContext editingContext, Person eo) {
-    Person localInstance = (eo == null) ? null : (Person)EOUtilities.localInstanceOfObject(editingContext, eo);
+    Person localInstance = (eo == null) ? null : ERXEOControlUtilities.localInstanceOfObject(editingContext, eo);
     if (localInstance == null && eo != null) {
       throw new IllegalStateException("You attempted to localInstance " + eo + ", which has not yet committed.");
     }

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/.settings/org.eclipse.core.resources.prefs
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/.settings/org.eclipse.core.resources.prefs	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/.settings/org.eclipse.core.resources.prefs	2012-05-22 07:34:06 UTC (rev 12098)
@@ -1,5 +1,6 @@
-#Wed Mar 04 23:55:54 CET 2009
+#Tue Feb 21 11:19:07 CET 2012
 eclipse.preferences.version=1
+encoding//Components/Main.wo/Main.wod=UTF-8
 encoding//Components/PageWrapper.api=UTF-8
 encoding//Components/PageWrapper.wo=UTF-8
 encoding//Components/PageWrapper.wo/PageWrapper.html=UTF-8

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/Components/Main.wo/Main.woo
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/Components/Main.wo/Main.woo	2012-05-21 14:59:17 UTC (rev 12097)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Examples/Misc/RestExample/Components/Main.wo/Main.woo	2012-05-22 07:34:06 UTC (rev 12098)
@@ -1,5 +1 @@
-{
-	"WebObjects Release" = "WebObjects 5.0"; 
-	encoding = "UTF-8";
-	variables = {};  
-}
\ No newline at end of file
+{"WebObjects Release" = "WebObjects 5.0"; encoding = "UTF-8"; variables = {}; }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

267 messages has been excluded from this view by a project administrator.

Flat | Threaded

1 2 3 .. 816 > >> (Page 1 of 816)