X-Git-Url: http://secure.phpeclipse.com

diff --git a/archive/net.sourceforge.phpeclipse.wiki/plugin.xml b/archive/net.sourceforge.phpeclipse.wiki/plugin.xml
index 56770b6..e90fdb7 100644
--- a/archive/net.sourceforge.phpeclipse.wiki/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.wiki/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.wiki"
    name="Wikipedia Editor Plug-in"
-   version="1.1.1"
+   version="1.1.2"
    provider-name="www.phpeclipse.de"
    class="net.sourceforge.phpeclipse.wiki.editor.WikiEditorPlugin">
 
@@ -15,9 +15,9 @@
       <library name="lib/radeox.jar"/>
       <library name="lib/commons-logging.jar"/>
       <library name="lib/commons-httpclient-2.0.2.jar"/>
-      <library name="lib/java2html_4.1.jar"/>
       <library name="lib/plog4u.jar"/>
       <library name="lib/velocity-dep-1.4.jar"/>
+      <library name="lib/mysql-connector.jar"/>
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
@@ -215,20 +215,25 @@
     
     <extension point="org.eclipse.ui.preferencePages">
       <page
-           name="Wiki Configurations"
+           name="Wikipedia Editor Configurations"
            id="net.sourceforge.phpeclipse.wiki.ui.internal.configurationPreferencePage"
            class="net.sourceforge.phpeclipse.wiki.ui.internal.ConfigurationPreferencePage"/>
       <page
+            name="Templates"
+            category="net.sourceforge.phpeclipse.wiki.ui.internal.configurationPreferencePage"
+            class="net.sourceforge.phpeclipse.wiki.preferences.TemplatesPreferencePage"
+            id="net.sourceforge.phpeclipse.wiki.preferences.TemplatesPreferencePage"/>
+      <page
            name="Wiki Project Defaults"
+           category="net.sourceforge.phpeclipse.wiki.ui.internal.configurationPreferencePage"
            class="net.sourceforge.phpeclipse.wiki.preferences.WikiProjectPreferences"
-           id="net.sourceforge.phpeclipse.wiki.preferences.WikiProjectPreferences">
-      </page>
+           id="net.sourceforge.phpeclipse.wiki.preferences.WikiProjectPreferences"/>
     </extension>
     <extension
          point="org.eclipse.ui.propertyPages">
       <page
             objectClass="org.eclipse.core.resources.IProject"
-            name="Static Wiki Project Settings"
+            name="Wiki Project Settings"
             class="net.sourceforge.phpeclipse.wiki.preferences.WikiProjectPreferences"
             id="net.sourceforge.phpeclipse.wiki.preferences.WikiProjectPreferences">
       </page>
@@ -245,12 +250,6 @@
                menubarPath="additions"
                id="net.sourceforge.phpeclipse.wiki.actions.OpenWikiLinkEditorAction">
          </action>
-         <action
-               label="Post to pLog4U.de"
-               class="net.sourceforge.phpeclipse.wiki.actions.NewPostBlogEditorAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.wiki.actions.NewPostBlogEditorAction">
-         </action>
       </viewerContribution>
       
       <viewerContribution
@@ -262,12 +261,6 @@
                menubarPath="additions"
                id="net.sourceforge.phpeclipse.wiki.actions.OpenWikiLinkEditorAction">
          </action>
-         <action
-               label="Post to pLog4U.de"
-               class="net.sourceforge.phpeclipse.wiki.actions.NewPostBlogEditorAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.wiki.actions.NewPostBlogEditorAction">
-         </action>
       </viewerContribution>
       <viewerContribution
             targetID="#EditorContext"
@@ -278,12 +271,6 @@
                menubarPath="additions"
                id="net.sourceforge.phpeclipse.wiki.actions.OpenWikiLinkEditorAction">
          </action>
-         <action
-               label="Post to pLog4U.de"
-               class="net.sourceforge.phpeclipse.wiki.actions.NewPostBlogEditorAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.wiki.actions.NewPostBlogEditorAction">
-         </action>
       </viewerContribution>            
       <viewerContribution
             targetID="#PHPEditorContext"
@@ -294,39 +281,115 @@
 			path="rest">
 		 </menu>
 		 <action
-               label="Refresh Current Wiki Text (Wikibooks.org)"
-               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.RefreshWikiTextEditorAction"
+               label="Refresh Wikibooks-en"
+               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikibooksENAction"
                menubarPath="mediawikiMenu/additions"
-               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.RefreshWikiTextEditorAction">
+               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikibooksENAction">
          </action>
-         <action
+		 <action
+               label="Refresh Wikipedia-en"
+               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaENAction"
+               menubarPath="mediawikiMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaENAction">
+         </action>
+<!--         <action
                label="Download Link's Wiki Text (Wikibooks.org)"
                class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikiLinkEditorAction"
                menubarPath="mediawikiMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikiLinkEditorAction">
+         </action> -->
+         <action
+               label="Refresh Wikipedia..."
+               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaAction"
+               menubarPath="mediawikiMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaAction">
          </action>
       </viewerContribution>
+            <viewerContribution
+            targetID="#EditorContext"
+            id="net.sourceforge.phpeclipse.wiki.texteditor.viewercontribution">
+         <menu
+			id="blogwikiMenu"
+			label="%BlogWiki.label"
+			path="rest">
+		 </menu>
+		 <action
+               label="Blog a Wiki text"
+               class="net.sourceforge.phpeclipse.wiki.actions.blogwiki.NewPostBlogWikiAction"
+               menubarPath="blogwikiMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.blogwiki.NewPostBlogWikiAction">
+         </action> 
+      </viewerContribution>   
       <viewerContribution
             targetID="#EditorContext"
             id="net.sourceforge.phpeclipse.wiki.texteditor.viewercontribution">
          <menu
-			id="mediawikiMenu"
-			label="%MediaWiki.label"
+			id="bloghtmlMenu"
+			label="%BlogHTML.label"
+			path="rest">
+		 </menu>
+		 <action
+               label="Blog a HTML text"
+               class="net.sourceforge.phpeclipse.wiki.actions.blogwiki.NewPostBlogHTMLAction"
+               menubarPath="bloghtmlMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.blogwiki.NewPostBlogHTMLAction">
+         </action> 
+      </viewerContribution>       
+            <viewerContribution
+            targetID="#EditorContext"
+            id="net.sourceforge.phpeclipse.wiki.texteditor.viewercontribution">
+         <menu
+			id="mediawikiUploadMenu"
+			label="%MediaWiki.upload.label"
 			path="rest">
 		 </menu>
          <action
-               label="Refresh Current Wiki Text (Wikibooks.org)"
-               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.RefreshWikiTextEditorAction"
-               menubarPath="mediawikiMenu/additions"
-               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.RefreshWikiTextEditorAction">
+               label="Upload to Wikipedia..."
+               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.post.StoreWikipediaAction"
+               menubarPath="mediawikiUploadMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.post.StoreWikipediaAction">
+         </action>
+      </viewerContribution>
+      <viewerContribution
+            targetID="#EditorContext"
+            id="net.sourceforge.phpeclipse.wiki.texteditor.viewercontribution">
+         <menu
+			id="mediawikiDownloadMenu"
+			label="%MediaWiki.download.label"
+			path="rest">
+		 </menu>  
+		 <action
+               label="Refresh Text from SQL"
+               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.LoadWikipediaSQLAction"
+               menubarPath="mediawikiDownloadMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.LoadWikipediaSQLAction">
+         </action>
+		 <action
+               label="Download from Wikibooks-en"
+               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikibooksENAction"
+               menubarPath="mediawikiDownloadMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikibooksENAction">
          </action>
          <action
+               label="Download from Wikipedia-en"
+               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaENAction"
+               menubarPath="mediawikiDownloadMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaENAction">
+         </action>
+  <!--       <action 
                label="Download Link's Wiki Text (Wikibooks.org)"
                class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikiLinkEditorAction"
-               menubarPath="mediawikiMenu/additions"
+               menubarPath="mediawikiDownloadMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikiLinkEditorAction">
+         </action> -->
+         <action
+               label="Download from Wikipedia..."
+               class="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaAction"
+               menubarPath="mediawikiDownloadMenu/additions"
+               id="net.sourceforge.phpeclipse.wiki.actions.mediawiki.DownloadWikipediaAction">
          </action>
       </viewerContribution>   
+      
       <viewerContribution
             targetID="#CompilationUnitEditorContext"
             id="net.sourceforge.phpeclipse.wiki.phpeditor.viewercontribution">
@@ -348,7 +411,7 @@
                id="net.sourceforge.phpeclipse.wiki.actions.httpquery.GoogleAction">
          </action>
 		 <action
-               label="Run HTTP Query"
+               label="HTTP Query..."
                class="net.sourceforge.phpeclipse.wiki.actions.httpquery.HTTPQueryAction"
                menubarPath="httpqueryMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.httpquery.HTTPQueryAction">
@@ -375,7 +438,7 @@
                id="net.sourceforge.phpeclipse.wiki.actions.httpquery.GoogleAction">
          </action>
 		 <action
-               label="Run HTTP Query"
+               label="HTTP Query..."
                class="net.sourceforge.phpeclipse.wiki.actions.httpquery.HTTPQueryAction"
                menubarPath="httpqueryMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.httpquery.HTTPQueryAction">
@@ -402,7 +465,7 @@
                id="net.sourceforge.phpeclipse.wiki.actions.httpquery.GoogleAction">
          </action>
 		 <action
-               label="Run HTTP Query"
+               label="HTTP Query..."
                class="net.sourceforge.phpeclipse.wiki.actions.httpquery.HTTPQueryAction"
                menubarPath="httpqueryMenu/additions"
                id="net.sourceforge.phpeclipse.wiki.actions.httpquery.HTTPQueryAction">