the same classpath will be generated even in case of system jar-files, since the files from the package should be used

2 files changed, 26 insertions, 28 deletions

diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index 6102a84..208e58f 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: build.xml,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rene $ $Date: 2008-02-01 10:21:43 $
+ *  last change: $Author: mav $ $Date: 2008-02-01 13:25:30 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -93,7 +93,6 @@
     <target name="jar" depends="compile, init">
         <jar basedir="${classes}" compress="true" jarfile="${dist}/${name}.jar">
             <manifest>
-        <!-- FIXME: Set Class-Path correctly for the system case !-->		
                 <attribute name="Class-Path" value="commons-codec-1.3.jar commons-lang-2.3.jar commons-httpclient-3.0.1.jar commons-logging-1.1.jar"/>
                 <attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
             </manifest>            
@@ -106,11 +105,10 @@
             <fileset dir="src" includes="**/*.xcu,**/*.xcs,**/*.xml" excludes="uno-extension-manifest.xml" casesensitive="yes"/>
             <fileset dir="${dist}" includes="${name}.jar" casesensitive="yes"/>
             <fileset dir="." includes="images/**,templates/**" casesensitive="yes"/>
-        <file file="mediawiki.jar"/>
-        <file file="${commons-codec-jar}"/>
-        <file file="${commons-httpclient-jar}"/>
-        <file file="${commons-lang-jar}"/>
-        <file file="${commons-logging-jar}"/>
+            <file file="${commons-codec-jar}"/>
+            <file file="${commons-httpclient-jar}"/>
+            <file file="${commons-lang-jar}"/>
+            <file file="${commons-logging-jar}"/>
             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
             <zipfileset dir="src" includes="uno-extension-manifest.xml" fullpath="META-INF/manifest.xml"/>
         </zip>
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
index 98f0625..cfb7d0d 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WikiEditSettingDialog.java,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: mav $ $Date: 2008-01-30 19:02:16 $
+ *  last change: $Author: mav $ $Date: 2008-02-01 13:25:31 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -53,12 +53,6 @@ public class WikiEditSettingDialog extends WikiDialog
     private final String sCancelMethod = "Cancel";
     private final String sHelpMethod = "Help";
 
-    private static final String m_sNoConnectionToURL1 = "A connection to the MediaWiki system at '";
-    private static final String m_sNoConnectionToURL2 = "' could not be created.";
-    private static final String m_sWrongLogin = "User name or password is incorrect. Please try again, or leave the fields blank for an anonymous connection.";
-    private static final String m_sInvalidURL = "A connection could not be created, because the URL is invalid.";
-    private static final String m_sNoURL = "Specify a MediaWiki server by providing a URL.";
-    
     String[] Methods = 
     {sOKMethod, sCancelMethod, sHelpMethod};
     private Hashtable setting;
@@ -295,22 +289,28 @@ public class WikiEditSettingDialog extends WikiDialog
         }
         catch ( SSLException essl )
         {
-            Helper.ShowError( m_xContext,
-                              m_xDialog,
-                              Helper.DLG_MEDIAWIKI_TITLE,
-                              Helper.UNKNOWNCERT_ERROR,
-                              null,
-                              false );
+            if ( Helper.IsConnectionAllowed() )
+            {
+                Helper.ShowError( m_xContext,
+                                  m_xDialog,
+                                  Helper.DLG_MEDIAWIKI_TITLE,
+                                  Helper.UNKNOWNCERT_ERROR,
+                                  null,
+                                  false );
+            }
             essl.printStackTrace();
         }
         catch ( Exception ex ) 
         {
-            Helper.ShowError( m_xContext,
-                              m_xDialog,
-                              Helper.DLG_MEDIAWIKI_TITLE,
-                              Helper.NOURLCONNECTION_ERROR,
-                              sURL,
-                              false );
+            if ( Helper.IsConnectionAllowed() )
+            {
+                Helper.ShowError( m_xContext,
+                                  m_xDialog,
+                                  Helper.DLG_MEDIAWIKI_TITLE,
+                                  Helper.NOURLCONNECTION_ERROR,
+                                  sURL,
+                                  false );
+            }
             ex.printStackTrace();
         }