[Stump-svn] SF.net SVN: stump:[17] plugin/trunk
Status: Planning
Brought to you by:
rbaranga
|
From: <rba...@us...> - 2010-04-14 20:42:23
|
Revision: 17
http://stump.svn.sourceforge.net/stump/?rev=17&view=rev
Author: rbaranga
Date: 2010-04-14 20:41:59 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
* modified versions
Modified Paths:
--------------
plugin/trunk/META-INF/MANIFEST.MF
plugin/trunk/plugin.xml
plugin/trunk/pom.xml
Modified: plugin/trunk/META-INF/MANIFEST.MF
===================================================================
--- plugin/trunk/META-INF/MANIFEST.MF 2010-04-14 15:32:06 UTC (rev 16)
+++ plugin/trunk/META-INF/MANIFEST.MF 2010-04-14 20:41:59 UTC (rev 17)
@@ -5,21 +5,21 @@
Bundle-Version: 0.1
Bundle-Vendor: stump.sourceforge.net
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.jface;bundle-version="3.5.0",
- org.eclipse.jface.text;bundle-version="3.5.0",
- org.eclipse.jdt.core;bundle-version="3.5.0",
- org.eclipse.jdt.junit;bundle-version="3.5.0",
- org.eclipse.jdt.launching;bundle-version="3.5.0",
- org.eclipse.debug.core;bundle-version="3.5.0",
- org.eclipse.debug.ui;bundle-version="3.5.0",
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.ui.views;bundle-version="3.4.1",
- org.eclipse.ui.workbench.texteditor;bundle-version="3.5.0",
- org.eclipse.ui.workbench;bundle-version="3.5.0",
- org.eclipse.jdt.ui;bundle-version="3.5.0",
- org.eclipse.ltk.core.refactoring;bundle-version="3.5.0"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.3.0",
+ org.eclipse.jface;bundle-version="3.3.0",
+ org.eclipse.jface.text;bundle-version="3.3.0",
+ org.eclipse.jdt.core;bundle-version="3.3.0",
+ org.eclipse.jdt.junit;bundle-version="3.3.0",
+ org.eclipse.jdt.launching;bundle-version="3.3.0",
+ org.eclipse.debug.core;bundle-version="3.3.0",
+ org.eclipse.debug.ui;bundle-version="3.3.0",
+ org.eclipse.ui.editors;bundle-version="3.3.0",
+ org.eclipse.ui.ide;bundle-version="3.3.0",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.3.0",
+ org.eclipse.ui.workbench;bundle-version="3.3.0",
+ org.eclipse.jdt.ui;bundle-version="3.3.0",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.3.0"
Export-Package: net.sf.stump.api.junit;
uses:="com.thoughtworks.selenium,
net.sf.stump.web,
@@ -133,7 +133,7 @@
jms-1.1.jar,
mail-1.4.jar,
javassist-3.1.jar,
- junit-4.4.jar,
+ junit-4.8.1.jar,
junit-addons-1.4.jar,
log4j-1.2.15.jar,
mx4j-tools-3.0.1.jar,
@@ -142,15 +142,15 @@
htmlunit-2.6.jar,
htmlunit-core-js-2.6.jar,
nekohtml-1.9.13.jar,
- annotations-api-6.0.20.jar,
- catalina-6.0.20.jar,
- el-api-6.0.20.jar,
- jasper-6.0.20.jar,
- jasper-el-6.0.20.jar,
- jasper-jdt-6.0.20.jar,
- jsp-api-6.0.20.jar,
- juli-6.0.20.jar,
- servlet-api-6.0.20.jar,
+ annotations-api-6.0.26.jar,
+ catalina-6.0.26.jar,
+ el-api-6.0.26.jar,
+ jasper-6.0.26.jar,
+ jasper-el-6.0.26.jar,
+ jasper-jdt-6.0.26.jar,
+ jsp-api-6.0.26.jar,
+ juli-6.0.26.jar,
+ servlet-api-6.0.26.jar,
hamcrest-all-1.1.jar,
json-20080701.jar,
jetty-6.1.4.jar,
Modified: plugin/trunk/plugin.xml
===================================================================
--- plugin/trunk/plugin.xml 2010-04-14 15:32:06 UTC (rev 16)
+++ plugin/trunk/plugin.xml 2010-04-14 20:41:59 UTC (rev 17)
@@ -2,42 +2,42 @@
<?eclipse version="3.0"?>
<plugin>
- <extension point="org.eclipse.ui.newWizards">
+ <extension point="org.eclipse.ui.newWizards">
<category
name="%NewWizard.category"
- id="stump.eclipse.new">
+ id="net.sf.stump.eclipse.new">
</category>
<wizard
name="%NewWizard.name"
icon="icons/wicket.gif"
- category="stump.eclipse.new"
+ category="net.sf.stump.eclipse.new"
class="net.sf.stump.eclipse.wizard.NewWicketProjectWizard"
project="true"
- id="stump.eclipse.new.project">
+ id="net.sf.stump.eclipse.new.project">
<description>%NewWizard.desc</description>
<selection class="org.eclipse.core.resources.IResource"/>
</wizard>
<wizard
name="%NewPanelWizard.name"
icon="icons/wicket.gif"
- category="stump.eclipse.new"
+ category="net.sf.stump.eclipse.new"
class="net.sf.stump.eclipse.wizard.NewWicketPanelWizard"
- id="stump.eclipse.new.panel">
+ id="net.sf.stump.eclipse.new.panel">
<description>%NewPanelWizard.desc</description>
</wizard>
<wizard
name="%NewWebPageWizard.name"
icon="icons/wicket.gif"
- category="stump.eclipse.new"
+ category="net.sf.stump.eclipse.new"
class="net.sf.stump.eclipse.wizard.NewWebPageWizard"
- id="stump.eclipse.new.webPage">
+ id="net.sf.stump.eclipse.new.webPage">
<description>%NewWebPageWizard.desc</description>
</wizard>
</extension>
<extension point="org.eclipse.ui.propertyPages">
<page
- id="stump.eclipse.PropertyPage1"
+ id="net.sf.stump.eclipse.PropertyPage1"
name="%WicketPropertyPage.name"
objectClass="org.eclipse.core.resources.IProject"
adaptable="true"
@@ -51,7 +51,7 @@
<run class="net.sf.stump.eclipse.metadata.WicketNature"/>
</runtime>
<requires-nature id="org.eclipse.jdt.core.javanature"></requires-nature>
- <builder id="stump.eclipse.editor.associatedMarkupAuditor"/>
+ <builder id="net.sf.stump.eclipse.editor.associatedMarkupAuditor"/>
</extension>
<extension id="associatedMarkupAuditor" name="Wicket associated markup auditor" point="org.eclipse.core.resources.builders">
@@ -82,7 +82,7 @@
<extension point="org.eclipse.jdt.ui.quickFixProcessors">
<quickFixProcessor
class="net.sf.stump.eclipse.editor.ProblemCorrectionQuickFixProcessor"
- id="stump.eclipse.editor.ProblemCorrectionQuickFixProcessor">
+ id="net.sf.stump.eclipse.editor.ProblemCorrectionQuickFixProcessor">
</quickFixProcessor>
</extension>
@@ -94,13 +94,13 @@
</extension>
<extension point="org.eclipse.ui.views">
- <category name="Wicket" id="stump"/>
+ <category name="Wicket" id="net.sf.stump"/>
<view
name="Wicket Stump"
icon="icons/wicket.gif"
category="stump"
class="net.sf.stump.eclipse.WicketPluginView"
- id="stump.eclipse.WicketPluginView">
+ id="net.sf.stump.eclipse.WicketPluginView">
</view>
</extension>
@@ -109,7 +109,7 @@
name="%WicketLaunch.label"
delegate="stump.eclipse.launcher.WicketLaunchConfiguration"
modes="run, debug"
- id="stump.junit.launchconfig"
+ id="net.sf.stump.junit.launchconfig"
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
<fileExtension default="false" extension="java"/>
@@ -124,7 +124,7 @@
helpContextId="org.eclipse.jdt.junit.launch_shortcut"
class="net.sf.stump.eclipse.launcher.WicketLaunchShortcut"
modes="run, debug"
- id="stump.eclipse.wicketShortcut">
+ id="net.sf.stump.eclipse.wicketShortcut">
<contextualLaunch>
<enablement>
<with variable="selection">
@@ -151,13 +151,13 @@
<page
name="Wicket"
class="net.sf.stump.eclipse.configuration.WicketBasePreferencePage"
- id="stump.eclipse.preferences">
+ id="net.sf.stump.eclipse.preferences">
</page>
<page
name="Templates"
- category="stump.eclipse.preferences"
+ category="net.sf.stump.eclipse.preferences"
class="net.sf.stump.eclipse.template.WicketTemplatePreferencePage"
- id="stump.eclipse.preferences.templates">
+ id="net.sf.stump.eclipse.preferences.templates">
</page>
</extension>
@@ -165,7 +165,7 @@
<contextType
name="wicket"
class="net.sf.stump.eclipse.template.WicketProjectContextType"
- id="stump.eclipse.templates.project">
+ id="net.sf.stump.eclipse.templates.project">
</contextType>
<include file="templates/web.xml"></include>
<include file="templates/applicationClass.xml"></include>
@@ -175,7 +175,7 @@
<contextType
name="wicket"
class="net.sf.stump.eclipse.template.WicketClassContextType"
- id="stump.eclipse.templates.class">
+ id="net.sf.stump.eclipse.templates.class">
</contextType>
<include file="templates/panel.xml"></include>
<include file="templates/panel_html.xml"></include>
@@ -186,7 +186,7 @@
<extension point="org.eclipse.ui.editors">
<editor
- id="stump.eclipse.editor"
+ id="net.sf.stump.eclipse.editor"
name="Wicket Editor"
icon="icons/javaclass.gif"
class="net.sf.stump.eclipse.editor.WicketEditor"
@@ -194,7 +194,7 @@
extensions="java">
</editor>
<editor
- id="stump.eclipse.editorLauncher"
+ id="net.sf.stump.eclipse.editorLauncher"
name="Wicket Editor Launcher (configure this as default editor)"
icon="icons/javaclass.gif"
launcher="net.sf.stump.eclipse.editor.WicketEditorLauncher"
@@ -204,24 +204,24 @@
<extension point="org.eclipse.ui.actionSetPartAssociations">
<actionSetPartAssociation targetID="org.eclipse.jdt.ui.CodingActionSet">
- <part id="stump.eclipse.editor" />
+ <part id="net.sf.stump.eclipse.editor" />
</actionSetPartAssociation>
<actionSetPartAssociation targetID="org.eclipse.jdt.ui.SearchActionSet">
- <part id="stump.eclipse.editor" />
+ <part id="net.sf.stump.eclipse.editor" />
</actionSetPartAssociation>
<actionSetPartAssociation targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
- <part id="stump.eclipse.editor" />
+ <part id="net.sf.stump.eclipse.editor" />
</actionSetPartAssociation>
<actionSetPartAssociation targetID="org.eclipse.ui.edit.text.actionSet.presentation">
- <part id="stump.eclipse.editor" />
+ <part id="net.sf.stump.eclipse.editor" />
</actionSetPartAssociation>
<actionSetPartAssociation targetID="org.eclipse.jdt.ui.text.java.actionSet.presentation">
- <part id="stump.eclipse.editor" />
+ <part id="net.sf.stump.eclipse.editor" />
</actionSetPartAssociation>
</extension>
<extension point="org.eclipse.ui.editorActions">
- <editorContribution targetID="stump.eclipse.editor" id="org.eclipse.ui.texteditor.ruler.actions">
+ <editorContribution targetid="net.sf.stump.eclipse.editor" id="org.eclipse.ui.texteditor.ruler.actions">
<action
label="%Dummy.label"
class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
@@ -236,12 +236,12 @@
</action>
</editorContribution>
<editorContribution
- id="stump.eclipse.editor.preview"
- targetID="stump.eclipse.editor">
+ id="net.sf.stump.eclipse.editor.preview"
+ targetid="net.sf.stump.eclipse.editor">
<action
class="net.sf.stump.eclipse.editor.CssEnablement"
icon="icons/css_attach.gif"
- id="stump.eclipse.editor.CssEnablement"
+ id="net.sf.stump.eclipse.editor.CssEnablement"
label="CSS"
state="true"
style="toggle"
@@ -250,7 +250,7 @@
<action
class="net.sf.stump.eclipse.editor.ImageRelocation"
icon="icons/image_reloc.gif"
- id="stump.eclipse.editor.ImageRelocation"
+ id="net.sf.stump.eclipse.editor.ImageRelocation"
label="Image"
state="true"
style="toggle"
@@ -259,7 +259,7 @@
<action
class="net.sf.stump.eclipse.editor.WicketPreview"
icon="icons/wicket_preview.gif"
- id="stump.eclipse.editor.WicketPreview"
+ id="net.sf.stump.eclipse.editor.WicketPreview"
label="WicketPreview"
state="true"
style="toggle"
@@ -270,7 +270,7 @@
<extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
<renameParticipant
- id="stump.eclipse.refactoring.RenameTypeParticipant"
+ id="net.sf.stump.eclipse.refactoring.RenameTypeParticipant"
name="stump.eclipse.refactoring.RenameTypeParticipant"
class="net.sf.stump.eclipse.refactoring.RenameTypeParticipant">
@@ -288,75 +288,75 @@
</extension>
<extension point="org.eclipse.ui.commands">
- <category id="stump.keyCategory" name="Wicket Stump keys"/>
+ <category id="net.sf.stump.keyCategory" name="Wicket Stump keys"/>
<command
- id="stump.eclipse.editor.tabForward"
+ id="net.sf.stump.eclipse.editor.tabForward"
name="Forward tab"
- categoryId="stump.keyCategory">
+ categoryid="net.sf.stump.keyCategory">
</command>
<command
- id="stump.eclipse.editor.tabBackward"
+ id="net.sf.stump.eclipse.editor.tabBackward"
name="Backward tab"
- categoryId="stump.keyCategory">
+ categoryid="net.sf.stump.keyCategory">
</command>
<command
- id="stump.eclipse.editor.newHtmlFile"
+ id="net.sf.stump.eclipse.editor.newHtmlFile"
name="Create new html file"
- categoryId="stump.keyCategory">
+ categoryid="net.sf.stump.keyCategory">
</command>
<command
- id="stump.eclipse.editor.newPropertiesFile"
+ id="net.sf.stump.eclipse.editor.newPropertiesFile"
name="Create new properties file"
- categoryId="stump.keyCategory">
+ categoryid="net.sf.stump.keyCategory">
</command>
</extension>
<extension point="org.eclipse.ui.bindings">
<key
sequence="M1+M3+."
- commandId="stump.eclipse.editor.tabForward"
+ commandid="net.sf.stump.eclipse.editor.tabForward"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
<key
sequence="M1+M3+,"
- commandId="stump.eclipse.editor.tabBackward"
+ commandid="net.sf.stump.eclipse.editor.tabBackward"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
<key
sequence="M1+M2+M3+;"
- commandId="stump.eclipse.editor.newHtmlFile"
+ commandid="net.sf.stump.eclipse.editor.newHtmlFile"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
<key
sequence="M1+M2+M3+:"
- commandId="stump.eclipse.editor.newPropertiesFile"
+ commandid="net.sf.stump.eclipse.editor.newPropertiesFile"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
<key
sequence="M3+M2+X W"
- commandId="stump.eclipse.wicketShortcut"
+ commandid="net.sf.stump.eclipse.wicketShortcut"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
</extension>
<extension point="org.eclipse.ui.editorActions">
<editorContribution
- id="stump.eclipse.editorContribution" targetID="stump.eclipse.editor">
+ id="net.sf.stump.eclipse.editorContribution" targetid="net.sf.stump.eclipse.editor">
<action
class="net.sf.stump.eclipse.editor.TabForwardActionDelegate"
- id="stump.eclipse.editor.tabForward"
+ id="net.sf.stump.eclipse.editor.tabForward"
label="forward"
- definitionId="stump.eclipse.editor.tabForward"/>
+ definitionid="net.sf.stump.eclipse.editor.tabForward"/>
<action
class="net.sf.stump.eclipse.editor.TabBackwardActionDelegate"
- id="stump.eclipse.editor.tabBackward"
+ id="net.sf.stump.eclipse.editor.tabBackward"
label="backward"
- definitionId="stump.eclipse.editor.tabBackward"/>
+ definitionid="net.sf.stump.eclipse.editor.tabBackward"/>
<action
class="net.sf.stump.eclipse.editor.NewHtmlFileActionDelegate"
- id="stump.eclipse.editor.newHtmlFile"
+ id="net.sf.stump.eclipse.editor.newHtmlFile"
label="new html file"
- definitionId="stump.eclipse.editor.newHtmlFile"/>
+ definitionid="net.sf.stump.eclipse.editor.newHtmlFile"/>
<action
class="net.sf.stump.eclipse.editor.NewPropertiesFileActionDelegate"
- id="stump.eclipse.editor.newPropertiesFile"
+ id="net.sf.stump.eclipse.editor.newPropertiesFile"
label="new properties file"
- definitionId="stump.eclipse.editor.newPropertiesFile"/>
+ definitionid="net.sf.stump.eclipse.editor.newPropertiesFile"/>
</editorContribution>
</extension>
@@ -368,7 +368,7 @@
objectClass="org.eclipse.core.resources.IFile">
<action
class="net.sf.stump.eclipse.form.FormGenerationActionDelegate"
- id="stump.eclipse.form.FormGenerationActionDelegate"
+ id="net.sf.stump.eclipse.form.FormGenerationActionDelegate"
menubarPath="additions"
enablesFor="1"
label="Generate Wicket form code"/>
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-04-14 15:32:06 UTC (rev 16)
+++ plugin/trunk/pom.xml 2010-04-14 20:41:59 UTC (rev 17)
@@ -36,38 +36,43 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
<version>1.4.7</version>
+ <scope>provided</scope>
</dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.8.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit-addons</groupId>
<artifactId>junit-addons</artifactId>
<version>1.4</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>mocked</groupId>
<artifactId>mocked</artifactId>
<version>0.3</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
<version>1.0.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
<version>2.0a2</version>
+ <scope>provided</scope>
</dependency>
<!-- Logging -->
@@ -75,37 +80,43 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.4.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
+ <scope>provided</scope>
</dependency>
<!-- Tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.20</version>
+ <version>6.0.26</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jsp-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.26</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.20</version>
+ <version>6.0.26</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -120,6 +131,7 @@
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
<version>3.1</version>
+ <scope>provided</scope>
</dependency>
<!-- JETTY -->
@@ -127,6 +139,7 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.4</version>
+ <scope>provided</scope>
</dependency>
<!-- eclipse -->
@@ -341,10 +354,7 @@
<groupId>org.eclipse.jdt.core</groupId>
<artifactId>manipulation</artifactId>
</exclusion>
-
-
<exclusion>
- <!-- not found -->
<groupId>org.eclipse.equinox.p2.metadata</groupId>
<artifactId>repository</artifactId>
</exclusion>
@@ -639,7 +649,6 @@
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|