Merge branch 'master' into dutchfix

Examples/D2W/ERModernMoviesDemo/Components/Main.wo/Main.html

@@ -14,7 +14,7 @@
 	      <h2>Login</h2>
 	      <p><label for="username">Username:</label><webobject name = "UsernameField"/></p>
 	      <p><label for="password">Password:</label><webobject name = "PasswordField"/></p>
-        <p class="button_bar"><a href="javascript:void();" onclick="document.forms['LoginForm'].submit()" class="Button PageButton LoginPageButton"><span>Login</span></a></p>
+        <p class="button_bar"><a href="javascript:void(0);" onclick="document.forms['LoginForm'].submit()" class="Button PageButton LoginPageButton"><span>Login</span></a></p>
         </webobject>
     </div>
 	</body>

Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxFlexibleFileUpload.java

@@ -70,8 +70,11 @@ public class AjaxFlexibleFileUpload extends AjaxFileUpload {
 	 * <a href="http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf">Java Object Serialization Spec</a>
 	 */
 	private static final long serialVersionUID = 1L;
-
-	protected final Logger log = Logger.getLogger(getClass());
+
+	/**
+	 * Logger
+	 */
+	private static final Logger log = Logger.getLogger(AjaxFlexibleFileUpload.class);
 
 	public static interface Keys {
 		public static final String name = "name";

Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxProgress.java

@@ -13,11 +13,19 @@
 /**
  * AjaxProgress is the model for an AjaxProgressBar.  By holding
  * onto this, you can keep track of and control the progress
- * of whatever operation is bound to this progress object. 
- * 
+ * of whatever operation is bound to this progress object.
+ *
  * @author mschrag
  */
 public class AjaxProgress {
+
+    /**
+     * Do I need to update serialVersionUID?
+     * See section 5.6 <cite>Type Changes Affecting Serialization</cite> on page 51 of the
+     * <a href="http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf">Java Object Serialization Spec</a>
+     */
+    private static final long serialVersionUID = 1L;
+
 	private String _id;
 	private long _value;
 	private long _maximum;
@@ -30,7 +38,7 @@ public class AjaxProgress {
 
 	/**
 	 * Construct an AjaxProgress
-	 * 
+	 *
 	 * @param maximum the maximum value of this progress
 	 */
 	public AjaxProgress(long maximum) {
@@ -60,7 +68,7 @@ public AjaxProgress(String id, int maximum) {
 
 	/**
 	 * Returns the id of this progress model.
-	 * 
+	 *
 	 * @return the id of this progress model
 	 */
 	public String id() {
@@ -71,7 +79,7 @@ public String id() {
 	 * Sets the current value of this progress model.  In the context of
 	 * an upload, value would represent the number of bytes uploaded
 	 * so far.
-	 *  
+	 *
 	 * @param value the new value
 	 */
 	public void setValue(long value) {
@@ -81,7 +89,7 @@ public void setValue(long value) {
 	/**
 	 * Returns the current value of this progress model.  If this
 	 * model isSucceeded, then this will return maximum().
-	 *  
+	 *
 	 * @return the current value of this progress model
 	 */
 	public long value() {
@@ -97,7 +105,7 @@ public long value() {
 
 	/**
 	 * Increment value by the given amount.
-	 * 
+	 *
 	 * @param count the mount to increment value by
 	 */
 	public void incrementValue(long count) {
@@ -106,7 +114,7 @@ public void incrementValue(long count) {
 
 	/**
 	 * Sets the maximum value for this progress model.
-	 * 
+	 *
 	 * @param maximum the maximum value for this progress model
 	 */
 	public void setMaximum(long maximum) {
@@ -115,7 +123,7 @@ public void setMaximum(long maximum) {
 
 	/**
 	 * Returns the maximum value for this progress model.
-	 * 
+	 *
 	 * @return the maximum value for this progress model
 	 */
 	public long maximum() {
@@ -124,7 +132,7 @@ public long maximum() {
 
 	/**
 	 * Returns the percentage completion of this progress model (0.0 - 1.0).
-	 * 
+	 *
 	 * @return the percentage completion of this progress model (0.0 - 1.0)
 	 */
 	public double percentage() {
@@ -139,7 +147,7 @@ public double percentage() {
 
 	/**
 	 * Returns whether or not this procedure has started.
-	 * 
+	 *
 	 * @return whether or not this procedure has started
 	 */
 	public boolean isStarted() {
@@ -148,7 +156,7 @@ public boolean isStarted() {
 
 	/**
 	 * Sets whether or not this procedure is done.
-	 * 
+	 *
 	 * @param done whether or not this procedure is done
 	 */
 	public void setDone(boolean done) {
@@ -157,7 +165,7 @@ public void setDone(boolean done) {
 
 	/**
 	 * Returns whether or not this procedure is done.
-	 * 
+	 *
 	 * @return whether or not this procedure is done
 	 */
 	public boolean isDone() {
@@ -166,7 +174,7 @@ public boolean isDone() {
 
 	/**
 	 * Sets the exception that caused this procedure to fail.
-	 * 
+	 *
 	 * @param failure the exception that caused this procedure to fail
 	 */
 	public void setFailure(Throwable failure) {
@@ -206,7 +214,7 @@ public boolean isFailed() {
 
 	/**
 	 * Returns true if this procedure is done, not canceled, and not failed.
-	 * 
+	 *
 	 * @return true if this procedure is done, not canceled, and not failed
 	 */
 	public boolean isSucceeded() {
@@ -222,58 +230,58 @@ public void dispose() {
 
 	/**
 	 * Sets whether or not this procedure has notified listeners of its completion.
-	 * 
+	 *
 	 * @param completionEventsFired whether or not this procedure has notified listeners of its completion
 	 */
 	public void setCompletionEventsFired(boolean completionEventsFired) {
 		_completionEventsFired = completionEventsFired;
 	}
-	
+
 	/**
 	 * Returns whether or not this procedure has notified listeners of its completion.
 	 * @return whether or not this procedure has notified listeners of its completion
 	 */
 	public boolean completionEventsFired() {
 		return _completionEventsFired;
 	}
-	
+
 	/**
 	 * Flags the attached procedure to reset the next time it is processed.
 	 */
 	public void reset() {
 		_reset = true;
 	}
-	
+
 	/**
 	 * Returns whether or not the attached procedure should reset the next time it is processed.
-	 * 
+	 *
 	 * @return whether or not the attached procedure should reset the next time it is processed
 	 */
 	public boolean shouldReset() {
 		return _reset;
 	}
-	
+
 	/**
 	 * Sets the current status message for this process.
-	 * 
+	 *
 	 * @param status the current status message for this process
 	 */
 	public void setStatus(String status) {
 		_status = status;
 	}
-	
+
 	/**
 	 * Returns the current status message for this process.
-	 * 
+	 *
 	 * @return the current status message for this process
 	 */
 	public String status() {
 		return _status;
 	}
-	
+
 	/**
 	 * Convenience method for copying a stream and tracking it with this progress model.
-	 * 
+	 *
 	 * @param inputStream the input stream to copy from
 	 * @param outputStream the output stream to copy to
 	 * @param maxSize the maximum size to read
@@ -312,11 +320,11 @@ public void copyAndTrack(InputStream inputStream, OutputStream outputStream, lon
 			throw e;
 		}
 	}
-	
+
 
 	/**
 	 * Register a progress object in the registry.
-	 * 
+	 *
 	 * @param session
 	 *            the session
 	 * @param progress
@@ -333,7 +341,7 @@ public static void registerProgress(WOSession session, AjaxProgress progress) {
 
 	/**
 	 * Unregister a progress object from the registry.
-	 * 
+	 *
 	 * @param session
 	 *            the session
 	 * @param progress
@@ -348,7 +356,7 @@ public static void unregisterProgress(WOSession session, AjaxProgress progress)
 
 	/**
 	 * Returns the progress object with the given id (or null if one does not exist).
-	 * 
+	 *
 	 * @param session
 	 *            the session
 	 * @param id

Frameworks/BusinessLogic/ERAttachment/pom.xml

@@ -9,6 +9,12 @@
 	<artifactId>ERAttachment</artifactId>
 	<name>ERAttachment Framework</name>
 	<packaging>woframework</packaging>
+
+	<properties>
+		<!-- VERY BAD PRACTICE: But there are broken tests -->
+		<maven.test.skip>true</maven.test.skip>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>wonder.core</groupId>

Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/migrations/Movies1.java

@@ -1,23 +1,16 @@
 package webobjectsexamples.businesslogic.movies.migrations;
 
 import com.webobjects.eocontrol.EOEditingContext;
-import com.webobjects.foundation.NSArray;
 
 import er.attachment.migrations.ERAttachmentMigration;
 import er.extensions.migration.ERXMigrationDatabase;
-import er.extensions.migration.ERXModelVersion;
 
 public class Movies1 extends ERAttachmentMigration {
 
 	public Movies1() {
 		super("movie", "poster_AttachmentID", true);
 	}
 
-	@Override
-	public NSArray<ERXModelVersion> modelDependencies() {
-		return null;
-	}
-
 	@Override
 	public void downgrade(EOEditingContext editingContext, ERXMigrationDatabase database) throws Throwable {
 		// DO NOTHING