misc

diff --git a/archive/net.sourceforge.phpeclipse.wiki/about.html b/archive/net.sourceforge.phpeclipse.wiki/about.html
index e992790..e839917 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/about.html
+++ b/archive/net.sourceforge.phpeclipse.wiki/about.html
@@ -21,12 +21,26 @@ For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
 <p>The plug-in includes software developed by SnipSnap Radeox.  Therefore:</p>
 
 <blockquote>
-This product includes software developed by the (<a href="http://www.radeox.org/">http://www.radeox.org/</a>).
+This product includes software developed by the (<a href="http://www.radeox.org/">radeox.org</a>) project.
 </blockquote>
 
 <blockquote>Copyright (c) 2000-2003 Matthias L. Jugel, Stephan J. Schmidt. All rights reserved.</blockquote>
 
-<p><b>xmlrpc commons-logging commons-httpclient velocity</b></p>
+<p><b>XStream</b></p>
+
+<blockquote>
+This product includes software developed by the (<a href="http://xstream.codehaus.org/">xstream.codehaus.org</a>) project.
+</blockquote>
+
+<blockquote>Copyright (c) 2003-2004, Joe Walnes. All rights reserved.</blockquote>
+
+<p><b>MySQL Connector/J</b></p>
+
+<blockquote>
+The MySQL Connector/J JDBC driver is licensed under the GNU Public License (see <a href="http://dev.mysql.com/downloads/connector/j/3.1.html">http://dev.mysql.com/downloads/connector/j/3.1.html</a>).
+</blockquote>
+
+<p><b>xmlrpc, commons-logging, commons-httpclient and velocity</b></p>
 
 <p>The plug-in includes software developed by The Apache Software Foundation as part of the Jakarta project.  Therefore:</p>
 
@@ -36,7 +50,7 @@ This product includes software developed by the Apache Software Foundation (<a h
 
 <blockquote>Copyright (c) 2001 The Apache Software Foundation. All rights reserved.</blockquote>
 
-<p>Your use of the Lucene and HTML Parser code is subject to the terms and conditions of the Apache Software License 1.1 which is available at
+<p>Your use of the xmlrpc, commons-logging, commons-httpclient and velocity code is subject to the terms and conditions of the Apache Software License 1.1 which is available at
 <a href="http://jakarta.apache.org/LICENSE">http://jakarta.apache.org/LICENSE</a>.
 More specifically:</p>
 <blockquote>

diff --git a/archive/net.sourceforge.phpeclipse.wiki/build.xml b/archive/net.sourceforge.phpeclipse.wiki/build.xml
index 1f4d79e..937ac37 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/build.xml
+++ b/archive/net.sourceforge.phpeclipse.wiki/build.xml
@@ -89,8 +89,8 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.texteditor_3.0.1/texteditor.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.filebuffers_3.0.1/filebuffers.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.console_3.0.0/console.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.webbrowser/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.webbrowser/webbrowser.jar"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.webbrowser/bin"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.webbrowser/webbrowser.jar"/>
                                <pathelement path="lib/xmlrpc-1.1.jar"/>
                                <pathelement path="lib/radeox.jar"/>
                                <pathelement path="lib/commons-logging.jar"/>

diff --git a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/ProblemConsole.java b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/ProblemConsole.java
index 04161fd..d158514 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/ProblemConsole.java
+++ b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/ProblemConsole.java
@@ -78,13 +78,13 @@ public class ProblemConsole {
     stream.setColor(color);
   }
 
-  public void reportError(String title, String message) {
-    if (hasMessages) {
-      WikiEditorPlugin.getDefault().reportError(title, message);
-    }
-  }
+//  public void reportError(String title, String message) {
+//    if (hasMessages) {
+//      WikiEditorPlugin.getDefault().reportError(title, message);
+//    }
+//  }
 
-  public void reportError() {
-    reportError("Problems listed", "Open console view for problems log!");
-  }
+//  public void reportError() {
+//    reportError("Problems listed", "Open console view for problems log!");
+//  }
 }
\ No newline at end of file

diff --git a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/mediawiki/RefreshJob.java b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/mediawiki/RefreshJob.java
index 9758384..9563651 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/mediawiki/RefreshJob.java
+++ b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/mediawiki/RefreshJob.java
@@ -88,7 +88,6 @@ public class RefreshJob extends WorkspaceJob {
 
       if (isModal(this)) {
         // The progress dialog is still open show the message
-        console.reportError();
       } else {
         //        setProperty(IProgressConstants.KEEP_PROPERTY, Boolean.TRUE);
         //            setProperty(IProgressConstants.ACTION_PROPERTY, getWikisCompletedAction());
@@ -119,7 +118,6 @@ public class RefreshJob extends WorkspaceJob {
     }
     if (isModal(this)) {
       // The progress dialog is still open show the message
-      console.reportError();
     }
     return Status.OK_STATUS;
   }

diff --git a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/mediawiki/post/PostJob.java b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/mediawiki/post/PostJob.java
index a7c811f..4ee5c35 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/mediawiki/post/PostJob.java
+++ b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/actions/mediawiki/post/PostJob.java
@@ -176,7 +176,6 @@ public class PostJob extends WorkspaceJob {
 
       if (isModal(this)) {
         // The progress dialog is still open show the message
-        console.reportError();
       } else {
         setProperty(IProgressConstants.KEEP_PROPERTY, Boolean.TRUE);
         //            setProperty(IProgressConstants.ACTION_PROPERTY, getWikisCompletedAction());
@@ -227,7 +226,6 @@ public class PostJob extends WorkspaceJob {
     }
     if (isModal(this)) {
       // The progress dialog is still open show the message
-      console.reportError();
     }
     return Status.CANCEL_STATUS;
   }