stump-svn Mailing List for Wicket Stump
Status: Planning
Brought to you by:
rbaranga
Menu
▾
▴
stump-svn — Svn Commits
You can subscribe to this list here.
| 2010 |
Jan
(1) |
Feb
(7) |
Mar
(2) |
Apr
(14) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <rba...@us...> - 2010-04-19 14:10:29
|
Revision: 24
http://stump.svn.sourceforge.net/stump/?rev=24&view=rev
Author: rbaranga
Date: 2010-04-19 14:10:18 +0000 (Mon, 19 Apr 2010)
Log Message:
-----------
* removed test-release
Modified Paths:
--------------
update/site.xml
Removed Paths:
-------------
update/artifacts.jar
update/content.jar
update/features/net.sf.stump_0.1.0.0.jar
update/plugins/net.sf.stump_0.1.0.0.jar
Deleted: update/artifacts.jar
===================================================================
(Binary files differ)
Deleted: update/content.jar
===================================================================
(Binary files differ)
Deleted: update/features/net.sf.stump_0.1.0.0.jar
===================================================================
(Binary files differ)
Deleted: update/plugins/net.sf.stump_0.1.0.0.jar
===================================================================
(Binary files differ)
Modified: update/site.xml
===================================================================
--- update/site.xml 2010-04-19 13:59:32 UTC (rev 23)
+++ update/site.xml 2010-04-19 14:10:18 UTC (rev 24)
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/net.sf.stump_0.1.0.0.jar" id="net.sf.stump" version="0.1.0.0"/>
</site>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-19 13:59:39
|
Revision: 23
http://stump.svn.sourceforge.net/stump/?rev=23&view=rev
Author: rbaranga
Date: 2010-04-19 13:59:32 +0000 (Mon, 19 Apr 2010)
Log Message:
-----------
* retry deploy
Modified Paths:
--------------
feature/feature.xml
plugin/trunk/pom.xml
plugin/trunk/src/main/resources/plugin.xml
update/site.xml
Added Paths:
-----------
feature/pom.xml
plugin/trunk/src/main/resources/LICENSE.txt
update/artifacts.jar
update/content.jar
update/features/net.sf.stump_0.1.0.0.jar
update/plugins/net.sf.stump_0.1.0.0.jar
Removed Paths:
-------------
feature/build.properties
plugin/trunk/LICENSE.txt
plugin/trunk/src/main/resources/META-INF/
Deleted: feature/build.properties
===================================================================
--- feature/build.properties 2010-04-17 17:45:09 UTC (rev 22)
+++ feature/build.properties 2010-04-19 13:59:32 UTC (rev 23)
@@ -1 +0,0 @@
-bin.includes = feature.xml
Modified: feature/feature.xml
===================================================================
--- feature/feature.xml 2010-04-17 17:45:09 UTC (rev 22)
+++ feature/feature.xml 2010-04-19 13:59:32 UTC (rev 23)
@@ -2,7 +2,7 @@
<feature
id="net.sf.stump"
label="Wicket Stump"
- version="0.1"
+ version="0.1.0.0"
provider-name="stump.sourceforge.net"
plugin="net.sf.stump">
@@ -10,7 +10,7 @@
id="net.sf.stump"
download-size="0"
install-size="0"
- version="0.1"
+ version="0.1.0.0"
unpack="false"/>
</feature>
Added: feature/pom.xml
===================================================================
--- feature/pom.xml (rev 0)
+++ feature/pom.xml 2010-04-19 13:59:32 UTC (rev 23)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>net.sf</groupId>
+ <artifactId>stump-feature</artifactId>
+ <version>1.0.0.0</version>
+
+ <name>Wicket Stump Feature</name>
+ <description>Wicket Stump Feature</description>
+ <inceptionYear>2010</inceptionYear>
+ <url>http://stump.sourceforge.net/</url>
+
+ <packaging>eclipse-feature</packaging>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>
+ scm:https://stump.svn.sourceforge.net/svnroot/stump/
+ </connection>
+ <developerConnection>${project.scm.connection}</developerConnection>
+ </scm>
+
+ <developers>
+ <developer>
+ <id>rbaranga</id>
+ <name>Radu Baranga</name>
+ <email>rba...@us...</email>
+ <url>http://rbaranga.users.sourceforge.net/</url>
+ <timezone>1</timezone>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>embedder</artifactId>
+ <version>(1.0.0,]</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>pde-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <outputDirectory>${basedir}</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Deleted: plugin/trunk/LICENSE.txt
===================================================================
--- plugin/trunk/LICENSE.txt 2010-04-17 17:45:09 UTC (rev 22)
+++ plugin/trunk/LICENSE.txt 2010-04-19 13:59:32 UTC (rev 23)
@@ -1,11 +0,0 @@
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-04-17 17:45:09 UTC (rev 22)
+++ plugin/trunk/pom.xml 2010-04-19 13:59:32 UTC (rev 23)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -11,14 +12,22 @@
<inceptionYear>2010</inceptionYear>
<url>http://stump.sourceforge.net/</url>
- <packaging>jar</packaging>
-
+ <packaging>bundle</packaging>
+
<scm>
<connection>
scm:https://stump.svn.sourceforge.net/svnroot/stump/
</connection>
<developerConnection>${project.scm.connection}</developerConnection>
</scm>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
<developers>
<developer>
@@ -107,20 +116,20 @@
<artifactId>javassist</artifactId>
<version>3.1</version>
</dependency>
-
+
<!-- Wicket -->
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>1.4.7</version>
- </dependency>
-
<dependency>
- <groupId>mocked</groupId>
- <artifactId>mocked</artifactId>
- <version>0.3</version>
- </dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+ <dependency>
+ <groupId>mocked</groupId>
+ <artifactId>mocked</artifactId>
+ <version>0.3</version>
+ </dependency>
+
<!-- JETTY -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -133,25 +142,25 @@
<groupId>org.eclipse.core</groupId>
<artifactId>commands</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>expressions</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>filesystem</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>filebuffers</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -171,31 +180,31 @@
<groupId>org.eclipse.core</groupId>
<artifactId>resources</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>runtime</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>variables</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>jface</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jface</groupId>
<artifactId>text</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -211,7 +220,7 @@
<groupId>org.eclipse</groupId>
<artifactId>text</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -227,13 +236,13 @@
<groupId>org.eclipse</groupId>
<artifactId>swt</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>ui</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -261,7 +270,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -273,7 +282,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>ui</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -351,7 +360,7 @@
<groupId>org.eclipse.debug</groupId>
<artifactId>core</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -367,7 +376,7 @@
<groupId>org.eclipse.debug</groupId>
<artifactId>ui</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.ui</groupId>
@@ -411,7 +420,7 @@
<groupId>org.eclipse.ui.workbench</groupId>
<artifactId>texteditor</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -431,7 +440,7 @@
<groupId>org.eclipse.ui</groupId>
<artifactId>editors</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -455,7 +464,7 @@
<groupId>org.eclipse.ui</groupId>
<artifactId>ide</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.equinox.p2.metadata</groupId>
@@ -467,7 +476,7 @@
<groupId>org.eclipse.ui</groupId>
<artifactId>workbench</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -491,7 +500,7 @@
<groupId>org.eclipse.ltk.core</groupId>
<artifactId>refactoring</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -523,7 +532,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>junit</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -619,7 +628,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>launching</artifactId>
<version>(1.0.0,]</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -660,8 +669,27 @@
<directory>src/test/resources</directory>
</testResource>
</testResources>
+
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <unpackBundle>false</unpackBundle>
+ <instructions>
+ <Bundle-Name>${pom.name}</Bundle-Name>
+ <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Description>${pom.description}</Bundle-Description>
+ <Bundle-Activator>${pom.groupId}.${pom.artifactId}.eclipse.WicketPlugin</Bundle-Activator>
+ <Export-Package>${pom.groupId}.${pom.artifactId}.*</Export-Package>
+ <Include-Resource>{maven-resources}</Include-Resource>
+ <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ </instructions>
+ </configuration>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -669,29 +697,15 @@
<target>1.5</target>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<additionalProjectnatures>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- <projectnature>org.eclipse.pde.api.tools.apiAnalysisNature</projectnature>
</additionalProjectnatures>
<downloadJavadocs>false</downloadJavadocs>
<downloadSources>false</downloadSources>
- <addGroupIdToProjectName>true</addGroupIdToProjectName>
- <additionalBuildcommands>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.api.tools.apiAnalysisBuilder</buildcommand>
- </additionalBuildcommands>
- <!--
- <packaging>eclipse-plugin</packaging>
- <pde>true</pde>
- -->
- <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest>
<linkedResources>
<linkedResource>
<name>icons</name>
@@ -721,90 +735,8 @@
</linkedResources>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>mocked</groupId>
- <artifactId>mocked</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-server</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>juli</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jsp-api</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <silent>true</silent>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
- <finalName>${groupId}.${artifactId}-${version}</finalName>
+ <finalName>${groupId}.${artifactId}_${version}</finalName>
</build>
<repositories>
Copied: plugin/trunk/src/main/resources/LICENSE.txt (from rev 22, plugin/trunk/LICENSE.txt)
===================================================================
--- plugin/trunk/src/main/resources/LICENSE.txt (rev 0)
+++ plugin/trunk/src/main/resources/LICENSE.txt 2010-04-19 13:59:32 UTC (rev 23)
@@ -0,0 +1,11 @@
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
Modified: plugin/trunk/src/main/resources/plugin.xml
===================================================================
--- plugin/trunk/src/main/resources/plugin.xml 2010-04-17 17:45:09 UTC (rev 22)
+++ plugin/trunk/src/main/resources/plugin.xml 2010-04-19 13:59:32 UTC (rev 23)
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-<plugin>
+<plugin
+ id="net.sf.stump"
+ name="Wicket Stump"
+ version="0.1.0.0"
+ provider-name="stump.sourceforge.net"
+ class="net.sf.stump.eclipse.WicketPlugin">
<extension point="org.eclipse.ui.newWizards">
<category
name="%NewWizard.category"
Added: update/artifacts.jar
===================================================================
(Binary files differ)
Property changes on: update/artifacts.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/content.jar
===================================================================
(Binary files differ)
Property changes on: update/content.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/features/net.sf.stump_0.1.0.0.jar
===================================================================
(Binary files differ)
Property changes on: update/features/net.sf.stump_0.1.0.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/plugins/net.sf.stump_0.1.0.0.jar
===================================================================
(Binary files differ)
Property changes on: update/plugins/net.sf.stump_0.1.0.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: update/site.xml
===================================================================
--- update/site.xml 2010-04-17 17:45:09 UTC (rev 22)
+++ update/site.xml 2010-04-19 13:59:32 UTC (rev 23)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/net.sf.stump_0.1.0.jar" id="net.sf.stump" version="0.1"/>
+ <feature url="features/net.sf.stump_0.1.0.0.jar" id="net.sf.stump" version="0.1.0.0"/>
</site>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-17 17:45:15
|
Revision: 22
http://stump.svn.sourceforge.net/stump/?rev=22&view=rev
Author: rbaranga
Date: 2010-04-17 17:45:09 +0000 (Sat, 17 Apr 2010)
Log Message:
-----------
* removed META-INF from root
Removed Paths:
-------------
plugin/trunk/META-INF/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-16 15:05:58
|
Revision: 21
http://stump.svn.sourceforge.net/stump/?rev=21&view=rev
Author: rbaranga
Date: 2010-04-16 15:05:52 +0000 (Fri, 16 Apr 2010)
Log Message:
-----------
* removed release
Removed Paths:
-------------
update/artifacts.jar
update/content.jar
update/features/net.sf.stump_0.1.0.jar
update/plugins/net.sf.stump_0.1.0.jar
Deleted: update/artifacts.jar
===================================================================
(Binary files differ)
Deleted: update/content.jar
===================================================================
(Binary files differ)
Deleted: update/features/net.sf.stump_0.1.0.jar
===================================================================
(Binary files differ)
Deleted: update/plugins/net.sf.stump_0.1.0.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-16 15:03:19
|
Revision: 20
http://stump.svn.sourceforge.net/stump/?rev=20&view=rev
Author: rbaranga
Date: 2010-04-16 15:03:12 +0000 (Fri, 16 Apr 2010)
Log Message:
-----------
* more maven-like deployment
Modified Paths:
--------------
plugin/trunk/pom.xml
Added Paths:
-----------
plugin/trunk/src/main/resources/META-INF/
plugin/trunk/src/main/resources/META-INF/MANIFEST.MF
plugin/trunk/src/main/resources/plugin.xml
Removed Paths:
-------------
plugin/trunk/build.properties
plugin/trunk/plugin.xml
plugin/trunk/src/main/resources/META-INF/MANIFEST.MF
Property Changed:
----------------
plugin/trunk/
plugin/trunk/src/main/resources/
Property changes on: plugin/trunk
___________________________________________________________________
Modified: svn:ignore
- .*
target
bin
*.jar
+ .*
target
bin
Deleted: plugin/trunk/build.properties
===================================================================
--- plugin/trunk/build.properties 2010-04-15 10:49:29 UTC (rev 19)
+++ plugin/trunk/build.properties 2010-04-16 15:03:12 UTC (rev 20)
@@ -1,24 +0,0 @@
-bin.includes = META-INF/,\
- LICENSE.txt,\
- wicket-1.4.7.jar,\
- target/classes/icons/,\
- target/classes/log4j.dtd,\
- target/classes/log4j.xml,\
- target/classes/net/,\
- target/classes/selenium/,\
- target/classes/templates/,\
- plugin.xml,\
- slf4j-api-1.4.2.jar,\
- slf4j-log4j12-1.4.2.jar
-src.includes = META-INF/,\
- LICENSE.txt,\
- plugin.xml,\
- src/main/java/net/,\
- src/main/resources/icons/,\
- src/main/resources/templates/,\
- src/main/resources/log4j.dtd,\
- src/main/resources/log4j.xml,\
- src/main/resources/selenium/,\
- wicket-1.4.7.jar,\
- slf4j-api-1.4.2.jar,\
- slf4j-log4j12-1.4.2.jar
Deleted: plugin/trunk/plugin.xml
===================================================================
--- plugin/trunk/plugin.xml 2010-04-15 10:49:29 UTC (rev 19)
+++ plugin/trunk/plugin.xml 2010-04-16 15:03:12 UTC (rev 20)
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension point="org.eclipse.ui.newWizards">
- <category
- name="%NewWizard.category"
- id="net.sf.stump.eclipse.new">
- </category>
- <wizard
- name="%NewWizard.name"
- icon="icons/wicket.gif"
- category="net.sf.stump.eclipse.new"
- class="net.sf.stump.eclipse.wizard.NewWicketProjectWizard"
- project="true"
- 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="net.sf.stump.eclipse.new"
- class="net.sf.stump.eclipse.wizard.NewWicketPanelWizard"
- id="net.sf.stump.eclipse.new.panel">
- <description>%NewPanelWizard.desc</description>
- </wizard>
- <wizard
- name="%NewWebPageWizard.name"
- icon="icons/wicket.gif"
- category="net.sf.stump.eclipse.new"
- class="net.sf.stump.eclipse.wizard.NewWebPageWizard"
- id="net.sf.stump.eclipse.new.webPage">
- <description>%NewWebPageWizard.desc</description>
- </wizard>
- </extension>
-
- <extension point="org.eclipse.ui.propertyPages">
- <page
- id="net.sf.stump.eclipse.PropertyPage1"
- name="%WicketPropertyPage.name"
- objectClass="org.eclipse.core.resources.IProject"
- adaptable="true"
- class="net.sf.stump.eclipse.configuration.ProjectPropertiesPage">
- <filter name="nature" value="org.eclipse.jdt.core.javanature"></filter>
- </page>
- </extension>
-
- <extension point="org.eclipse.core.resources.natures" id="wicketnature" name="Wicket Nature">
- <runtime>
- <run class="net.sf.stump.eclipse.metadata.WicketNature"/>
- </runtime>
- <requires-nature id="org.eclipse.jdt.core.javanature"></requires-nature>
- <builder id="net.sf.stump.eclipse.editor.associatedMarkupAuditor"/>
- </extension>
-
- <extension id="associatedMarkupAuditor" name="Wicket associated markup auditor" point="org.eclipse.core.resources.builders">
- <builder>
- <run class="net.sf.stump.eclipse.editor.AssociatedMarkupAuditor"/>
- </builder>
- </extension>
-
- <extension id="associatedMarkupAuditorMarkerNoHtml" point="org.eclipse.core.resources.markers" name="Marker for associated markup auditor">
- <super type="org.eclipse.core.resources.problemmarker"/>
- <super type="org.eclipse.core.resources.textmarker"/>
- <persistent value="true"/>
- </extension>
-
- <extension id="associatedMarkupAuditorMarkerParseError" point="org.eclipse.core.resources.markers" name="Marker for associated markup auditor">
- <super type="org.eclipse.core.resources.problemmarker"/>
- <super type="org.eclipse.core.resources.textmarker"/>
- <persistent value="true"/>
- </extension>
-
- <extension point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="net.sf.stump.associatedMarkupAuditorMarkerNoHtml"
- class="net.sf.stump.eclipse.editor.CreateHtmlTemplateQuickFixGenerator">
- </markerResolutionGenerator>
- </extension>
-
- <extension point="org.eclipse.jdt.ui.quickFixProcessors">
- <quickFixProcessor
- class="net.sf.stump.eclipse.editor.ProblemCorrectionQuickFixProcessor"
- id="net.sf.stump.eclipse.editor.ProblemCorrectionQuickFixProcessor">
- </quickFixProcessor>
- </extension>
-
- <extension point="org.eclipse.jdt.core.classpathVariableInitializer">
- <classpathVariableInitializer
- variable="WICKET_HOME"
- class="net.sf.stump.eclipse.configuration.WicketHomeInitializer">
- </classpathVariableInitializer>
- </extension>
-
- <extension point="org.eclipse.ui.views">
- <category name="Wicket" id="net.sf.stump"/>
- <view
- name="Wicket Stump"
- icon="icons/wicket.gif"
- category="net.sf.stump"
- class="net.sf.stump.eclipse.WicketPluginView"
- id="net.sf.stump.eclipse.WicketPluginView">
- </view>
- </extension>
-
- <extension point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- name="%WicketLaunch.label"
- delegate="net.sf.stump.eclipse.launcher.WicketLaunchConfiguration"
- modes="run, debug"
- 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"/>
- <fileExtension default="false" extension="class"/>
- </launchConfigurationType>
- </extension>
-
- <extension point="org.eclipse.debug.ui.launchShortcuts">
- <shortcut
- label="%WicketShortcut.label"
- icon="icons/wicket.gif"
- helpContextId="org.eclipse.jdt.junit.launch_shortcut"
- class="net.sf.stump.eclipse.launcher.WicketLaunchShortcut"
- modes="run, debug"
- id="net.sf.stump.eclipse.wicketShortcut">
- <contextualLaunch>
- <enablement>
- <with variable="selection">
- <count value="1"></count>
- <iterate>
- <or>
- <test property="org.eclipse.debug.ui.matchesPattern" value="*.java"/>
- <test property="org.eclipse.debug.ui.matchesPattern" value="*.class"/>
- <adapt type="org.eclipse.jdt.core.IJavaElement"/>
- </or>
- <test property="org.eclipse.jdt.junit.isTest"/>
- </iterate>
- </with>
- </enablement>
- </contextualLaunch>
- <perspective id="org.eclipse.jdt.ui.JavaPerspective"></perspective>
- <perspective id="org.eclipse.jdt.ui.JavaHierarchyPerspective"></perspective>
- <perspective id="org.eclipse.jdt.ui.JavaBrowsingPerspective"></perspective>
- <perspective id="org.eclipse.debug.ui.DebugPerspective"></perspective>
- </shortcut>
- </extension>
-
- <extension point="org.eclipse.ui.preferencePages">
- <page
- name="Wicket"
- class="net.sf.stump.eclipse.configuration.WicketBasePreferencePage"
- id="net.sf.stump.eclipse.preferences">
- </page>
- <page
- name="Templates"
- category="net.sf.stump.eclipse.preferences"
- class="net.sf.stump.eclipse.template.WicketTemplatePreferencePage"
- id="net.sf.stump.eclipse.preferences.templates">
- </page>
- </extension>
-
- <extension point="org.eclipse.ui.editors.templates">
- <contextType
- name="wicket"
- class="net.sf.stump.eclipse.template.WicketProjectContextType"
- id="net.sf.stump.eclipse.templates.project">
- </contextType>
- <include file="templates/web.xml"></include>
- <include file="templates/applicationClass.xml"></include>
- </extension>
-
- <extension point="org.eclipse.ui.editors.templates">
- <contextType
- name="wicket"
- class="net.sf.stump.eclipse.template.WicketClassContextType"
- id="net.sf.stump.eclipse.templates.class">
- </contextType>
- <include file="templates/panel.xml"></include>
- <include file="templates/panel_html.xml"></include>
- <include file="templates/web_page.xml"></include>
- <include file="templates/web_page_html.xml"></include>
- <include file="templates/form.xml"></include>
- </extension>
-
- <extension point="org.eclipse.ui.editors">
- <editor
- id="net.sf.stump.eclipse.editor"
- name="Wicket Editor"
- icon="icons/javaclass.gif"
- class="net.sf.stump.eclipse.editor.WicketEditor"
- contributorClass="net.sf.stump.eclipse.editor.WicketEditorActionContributor"
- extensions="java">
- </editor>
- <editor
- 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"
- extensions="java">
- </editor>
- </extension>
-
- <extension point="org.eclipse.ui.actionSetPartAssociations">
- <actionSetPartAssociation targetID="org.eclipse.jdt.ui.CodingActionSet">
- <part id="net.sf.stump.eclipse.editor" />
- </actionSetPartAssociation>
- <actionSetPartAssociation targetID="org.eclipse.jdt.ui.SearchActionSet">
- <part id="net.sf.stump.eclipse.editor" />
- </actionSetPartAssociation>
- <actionSetPartAssociation targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
- <part id="net.sf.stump.eclipse.editor" />
- </actionSetPartAssociation>
- <actionSetPartAssociation targetID="org.eclipse.ui.edit.text.actionSet.presentation">
- <part id="net.sf.stump.eclipse.editor" />
- </actionSetPartAssociation>
- <actionSetPartAssociation targetID="org.eclipse.jdt.ui.text.java.actionSet.presentation">
- <part id="net.sf.stump.eclipse.editor" />
- </actionSetPartAssociation>
- </extension>
-
- <extension point="org.eclipse.ui.editorActions">
- <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"
- actionID="RulerDoubleClick"
- id="org.eclipse.debug.ui.actions.RulerToggleBreakpointAction">
- </action>
- <action
- label="%Dummy.label"
- class="org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction"
- actionID="RulerClick"
- id="org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction">
- </action>
- </editorContribution>
- <editorContribution
- 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="net.sf.stump.eclipse.editor.CssEnablement"
- label="CSS"
- state="true"
- style="toggle"
- toolbarPath="Normal/additions"
- tooltip="Inline CSS files in HTML preview"/>
- <action
- class="net.sf.stump.eclipse.editor.ImageRelocation"
- icon="icons/image_reloc.gif"
- id="net.sf.stump.eclipse.editor.ImageRelocation"
- label="Image"
- state="true"
- style="toggle"
- toolbarPath="Normal/additions"
- tooltip="Relocate images in HTML preview"/>
- <action
- class="net.sf.stump.eclipse.editor.WicketPreview"
- icon="icons/wicket_preview.gif"
- id="net.sf.stump.eclipse.editor.WicketPreview"
- label="WicketPreview"
- state="true"
- style="toggle"
- toolbarPath="Normal/additions"
- tooltip="Enable wicket:preview tag"/>
- </editorContribution>
- </extension>
-
- <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
- <renameParticipant
- id="net.sf.stump.eclipse.refactoring.RenameTypeParticipant"
- name="net.sf.stump.eclipse.refactoring.RenameTypeParticipant"
- class="net.sf.stump.eclipse.refactoring.RenameTypeParticipant">
-
- <enablement>
- <with variable="affectedNatures">
- <iterate operator="or">
- <equals value="org.eclipse.jdt.core.javanature"/>
- </iterate>
- </with>
- <with variable="element">
- <instanceof value="org.eclipse.jdt.core.IType"/>
- </with>
- </enablement>
- </renameParticipant>
- </extension>
-
- <extension point="org.eclipse.ui.commands">
- <category id="net.sf.stump.keyCategory" name="Wicket Stump keys"/>
- <command
- id="net.sf.stump.eclipse.editor.tabForward"
- name="Forward tab"
- categoryid="net.sf.stump.keyCategory">
- </command>
- <command
- id="net.sf.stump.eclipse.editor.tabBackward"
- name="Backward tab"
- categoryid="net.sf.stump.keyCategory">
- </command>
- <command
- id="net.sf.stump.eclipse.editor.newHtmlFile"
- name="Create new html file"
- categoryid="net.sf.stump.keyCategory">
- </command>
- <command
- id="net.sf.stump.eclipse.editor.newPropertiesFile"
- name="Create new properties file"
- categoryid="net.sf.stump.keyCategory">
- </command>
- </extension>
-
- <extension point="org.eclipse.ui.bindings">
- <key
- sequence="M1+M3+."
- commandid="net.sf.stump.eclipse.editor.tabForward"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- <key
- sequence="M1+M3+,"
- commandid="net.sf.stump.eclipse.editor.tabBackward"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- <key
- sequence="M1+M2+M3+;"
- commandid="net.sf.stump.eclipse.editor.newHtmlFile"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- <key
- sequence="M1+M2+M3+:"
- commandid="net.sf.stump.eclipse.editor.newPropertiesFile"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- <key
- sequence="M3+M2+X W"
- commandid="net.sf.stump.eclipse.wicketShortcut"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- </extension>
-
- <extension point="org.eclipse.ui.editorActions">
- <editorContribution
- id="net.sf.stump.eclipse.editorContribution" targetID="net.sf.stump.eclipse.editor">
- <action
- class="net.sf.stump.eclipse.editor.TabForwardActionDelegate"
- id="net.sf.stump.eclipse.editor.tabForward"
- label="forward"
- definitionid="net.sf.stump.eclipse.editor.tabForward"/>
- <action
- class="net.sf.stump.eclipse.editor.TabBackwardActionDelegate"
- id="net.sf.stump.eclipse.editor.tabBackward"
- label="backward"
- definitionid="net.sf.stump.eclipse.editor.tabBackward"/>
- <action
- class="net.sf.stump.eclipse.editor.NewHtmlFileActionDelegate"
- id="net.sf.stump.eclipse.editor.newHtmlFile"
- label="new html file"
- definitionid="net.sf.stump.eclipse.editor.newHtmlFile"/>
- <action
- class="net.sf.stump.eclipse.editor.NewPropertiesFileActionDelegate"
- id="net.sf.stump.eclipse.editor.newPropertiesFile"
- label="new properties file"
- definitionid="net.sf.stump.eclipse.editor.newPropertiesFile"/>
- </editorContribution>
- </extension>
-
- <extension point="org.eclipse.ui.popupMenus">
- <objectContribution
- id="net.sf.stump.eclipse.form.FormGeneration"
- adaptable="true"
- nameFilter="*.html"
- objectClass="org.eclipse.core.resources.IFile">
- <action
- class="net.sf.stump.eclipse.form.FormGenerationActionDelegate"
- id="net.sf.stump.eclipse.form.FormGenerationActionDelegate"
- menubarPath="additions"
- enablesFor="1"
- label="Generate Wicket form code"/>
- </objectContribution>
- </extension>
-
-</plugin>
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-04-15 10:49:29 UTC (rev 19)
+++ plugin/trunk/pom.xml 2010-04-16 15:03:12 UTC (rev 20)
@@ -4,7 +4,7 @@
<groupId>net.sf</groupId>
<artifactId>stump</artifactId>
- <version>0.1</version>
+ <version>0.1.0.0</version>
<name>Wicket Stump</name>
<description>Wicket Stump Eclipse plugin</description>
@@ -31,13 +31,6 @@
</developers>
<dependencies>
- <!-- Wicket -->
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>1.4.7</version>
- </dependency>
-
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
@@ -52,12 +45,6 @@
</dependency>
<dependency>
- <groupId>mocked</groupId>
- <artifactId>mocked</artifactId>
- <version>0.3</version>
- </dependency>
-
- <dependency>
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
<version>1.0.2</version>
@@ -94,7 +81,6 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
<version>6.0.26</version>
-
</dependency>
<dependency>
@@ -121,6 +107,19 @@
<artifactId>javassist</artifactId>
<version>3.1</version>
</dependency>
+
+ <!-- Wicket -->
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>mocked</groupId>
+ <artifactId>mocked</artifactId>
+ <version>0.3</version>
+ </dependency>
<!-- JETTY -->
<dependency>
@@ -134,25 +133,25 @@
<groupId>org.eclipse.core</groupId>
<artifactId>commands</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>expressions</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>filesystem</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>filebuffers</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -172,31 +171,31 @@
<groupId>org.eclipse.core</groupId>
<artifactId>resources</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>runtime</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>variables</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>jface</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jface</groupId>
<artifactId>text</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -212,7 +211,7 @@
<groupId>org.eclipse</groupId>
<artifactId>text</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -228,13 +227,13 @@
<groupId>org.eclipse</groupId>
<artifactId>swt</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>ui</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -262,7 +261,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -274,7 +273,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>ui</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -352,7 +351,7 @@
<groupId>org.eclipse.debug</groupId>
<artifactId>core</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -368,7 +367,7 @@
<groupId>org.eclipse.debug</groupId>
<artifactId>ui</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.ui</groupId>
@@ -412,7 +411,7 @@
<groupId>org.eclipse.ui.workbench</groupId>
<artifactId>texteditor</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -432,7 +431,7 @@
<groupId>org.eclipse.ui</groupId>
<artifactId>editors</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -456,7 +455,7 @@
<groupId>org.eclipse.ui</groupId>
<artifactId>ide</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.equinox.p2.metadata</groupId>
@@ -468,7 +467,7 @@
<groupId>org.eclipse.ui</groupId>
<artifactId>workbench</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -492,7 +491,7 @@
<groupId>org.eclipse.ltk.core</groupId>
<artifactId>refactoring</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -524,7 +523,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>junit</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -620,7 +619,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>launching</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -649,14 +648,6 @@
<resource>
<directory>src/main/resources</directory>
</resource>
- <resource>
- <directory>.</directory>
- <includes>
- <include>META-INF/**</include>
- <include>plugin.xml</include>
- <include>*.jar</include>
- </includes>
- </resource>
</resources>
<testResources>
<testResource>
@@ -666,18 +657,9 @@
</excludes>
</testResource>
<testResource>
- <directory>src/main/resources</directory>
+ <directory>src/test/resources</directory>
</testResource>
- <testResource>
- <directory>.</directory>
- <includes>
- <include>META-INF/**</include>
- <include>plugin.xml</include>
- <include>*.jar</include>
- </includes>
- </testResource>
</testResources>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -697,14 +679,46 @@
<projectnature>org.eclipse.pde.PluginNature</projectnature>
<projectnature>org.eclipse.pde.api.tools.apiAnalysisNature</projectnature>
</additionalProjectnatures>
- <downloadJavadocs>true</downloadJavadocs>
- <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ <downloadSources>false</downloadSources>
<addGroupIdToProjectName>true</addGroupIdToProjectName>
<additionalBuildcommands>
<buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
<buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
<buildcommand>org.eclipse.pde.api.tools.apiAnalysisBuilder</buildcommand>
</additionalBuildcommands>
+ <!--
+ <packaging>eclipse-plugin</packaging>
+ <pde>true</pde>
+ -->
+ <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest>
+ <linkedResources>
+ <linkedResource>
+ <name>icons</name>
+ <type>2</type>
+ <location>${basedir}/src/main/resources/icons</location>
+ </linkedResource>
+ <linkedResource>
+ <name>META-INF</name>
+ <type>2</type>
+ <location>${basedir}/src/main/resources/META-INF</location>
+ </linkedResource>
+ <linkedResource>
+ <name>selenium</name>
+ <type>2</type>
+ <location>${basedir}/src/main/resources/selenium</location>
+ </linkedResource>
+ <linkedResource>
+ <name>templates</name>
+ <type>2</type>
+ <location>${basedir}/src/main/resources/templates</location>
+ </linkedResource>
+ <linkedResource>
+ <name>plugin.xml</name>
+ <type>1</type>
+ <location>${basedir}/src/main/resources/plugin.xml</location>
+ </linkedResource>
+ </linkedResources>
</configuration>
</plugin>
@@ -713,37 +727,84 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-dependencies</id>
- <phase>process-sources</phase>
+ <id>copy</id>
+ <phase>process-resources</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>mocked</groupId>
+ <artifactId>mocked</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-server</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jsp-api</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </artifactItem>
+ </artifactItems>
<overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>false</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <silent>true</silent>
</configuration>
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
+ <finalName>${groupId}.${artifactId}-${version}</finalName>
</build>
<repositories>
@@ -773,7 +834,7 @@
<groupId>org.eclipse.swt.win32.win32</groupId>
<artifactId>x86</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
</dependencies>
</profile>
@@ -790,7 +851,7 @@
<groupId>org.eclipse.swt.carbon</groupId>
<artifactId>macosx</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
</dependencies>
</profile>
@@ -806,7 +867,7 @@
<groupId>org.eclipse.swt.gtk.linux</groupId>
<artifactId>x86</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
</dependencies>
</profile>
Property changes on: plugin/trunk/src/main/resources
___________________________________________________________________
Added: svn:ignore
+ *.jar
Deleted: plugin/trunk/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- plugin/trunk/META-INF/MANIFEST.MF 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/resources/META-INF/MANIFEST.MF 2010-04-16 15:03:12 UTC (rev 20)
@@ -1,174 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Wicket Stump
-Bundle-SymbolicName: stump;singleton:=true
-Bundle-Version: 0.1
-Bundle-Vendor: stump.sourceforge.net
-Bundle-Localization: plugin
-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,
- junit.framework,
- org.apache.wicket,
- org.apache.wicket.markup.html.list,
- junitx.util",
- net.sf.stump.api.junit4;uses:="net.sf.stump.junit",
- net.sf.stump.api.metadata,
- net.sf.stump.api.runner;uses:="com.thoughtworks.selenium,org.openqa.jetty.jetty",
- net.sf.stump.api.web,
- net.sf.stump.browser;uses:="org.eclipse.swt.events,org.eclipse.swt.widgets",
- net.sf.stump.eclipse;
- uses:="net.sf.stump.eclipse.template,
- org.eclipse.core.runtime,
- org.eclipse.jface.resource,
- org.eclipse.ui,
- org.eclipse.ui.plugin,
- org.eclipse.ui.part,
- net.sf.stump.browser,
- org.eclipse.core.resources,
- org.eclipse.swt.graphics,
- org.osgi.framework,
- org.eclipse.swt.widgets",
- net.sf.stump.eclipse.configuration;
- uses:="org.eclipse.jface.preference,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.ui.dialogs,
- org.eclipse.swt.widgets",
- net.sf.stump.eclipse.editor;
- uses:="org.eclipse.jface.text,
- org.eclipse.ui.texteditor,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.apache.wicket.markup,
- org.eclipse.ui.part,
- org.eclipse.jface.text.contentassist,
- org.eclipse.jface.action,
- org.eclipse.jdt.ui.text.java,
- org.eclipse.jdt.core,
- org.eclipse.ui.views.contentoutline,
- org.eclipse.core.resources,
- org.eclipse.swt.graphics,
- org.eclipse.jface.viewers,
- org.eclipse.swt.widgets",
- net.sf.stump.eclipse.form;
- uses:="org.eclipse.jface.action,
- net.sf.stump.form,
- net.sf.stump.eclipse.editor,
- org.eclipse.jface.viewers,
- org.eclipse.swt.widgets",
- net.sf.stump.eclipse.launcher;
- uses:="org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.core.runtime,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.jface.viewers",
- net.sf.stump.eclipse.metadata;
- uses:="org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- net.sf.stump.eclipse.wizard",
- net.sf.stump.eclipse.parser;uses:="net.sf.stump.metadata,org.eclipse.core.resources",
- net.sf.stump.eclipse.refactoring;
- uses:="org.eclipse.core.runtime,
- org.eclipse.ltk.core.refactoring.participants,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.ltk.core.refactoring",
- net.sf.stump.eclipse.swt;uses:="org.eclipse.swt.widgets",
- net.sf.stump.eclipse.template;
- uses:="org.eclipse.ui.texteditor.templates,
- org.eclipse.jface.text.templates.persistence,
- net.sf.stump.eclipse.metadata,
- org.eclipse.jface.text.templates",
- net.sf.stump.eclipse.util;
- uses:="org.eclipse.ui.texteditor,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.core.resources",
- net.sf.stump.eclipse.wizard;
- uses:="org.eclipse.jface.wizard,
- org.eclipse.jface.operation,
- org.eclipse.core.runtime,
- org.eclipse.ui.wizards.newresource,
- org.eclipse.jface.text.templates,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui.wizards,
- org.eclipse.core.resources,
- net.sf.stump.eclipse.metadata,
- org.eclipse.ui.dialogs,
- org.eclipse.swt.widgets",
- net.sf.stump.form;uses:="org.apache.wicket.markup",
- net.sf.stump.util;uses:="org.apache.wicket,org.eclipse.core.resources,org.apache.wicket.session"
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: net.sf.stump.eclipse.WicketPlugin
-Bundle-ClassPath: .,
- ant-1.6.5.jar,
- bcprov-jdk15-135.jar,
- google-collections-1.0.jar,
- jmxtools-1.2.1.jar,
- jmxri-1.2.1.jar,
- commons-httpclient-3.1.jar,
- commons-logging-1.1.1.jar,
- activation-1.1.jar,
- jms-1.1.jar,
- mail-1.4.jar,
- javassist-3.1.jar,
- junit-4.8.1.jar,
- junit-addons-1.4.jar,
- log4j-1.2.15.jar,
- mx4j-tools-3.0.1.jar,
- jna-3.2.2.jar,
- cssparser-0.9.5.jar,
- htmlunit-2.6.jar,
- htmlunit-core-js-2.6.jar,
- nekohtml-1.9.13.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,
- jetty-util-6.1.4.jar,
- servlet-api-2.5-6.1.4.jar,
- selenium-chrome-driver-2.0a2.jar,
- selenium-common-2.0a2.jar,
- selenium-firefox-driver-2.0a2.jar,
- selenium-htmlunit-driver-2.0a2.jar,
- selenium-ie-driver-2.0a2.jar,
- selenium-remote-client-2.0a2.jar,
- selenium-remote-common-2.0a2.jar,
- selenium-server-2.0a2.jar,
- selenium-support-2.0a2.jar,
- selenium-java-client-driver-1.0.2.jar,
- sac-1.3.jar,
- serializer-2.7.1.jar,
- xalan-2.7.1.jar,
- xercesImpl-2.6.2.jar,
- xmlParserAPIs-2.6.2.jar,
- xml-apis-1.3.04.jar
Copied: plugin/trunk/src/main/resources/META-INF/MANIFEST.MF (from rev 18, plugin/trunk/META-INF/MANIFEST.MF)
===================================================================
--- plugin/trunk/src/main/resources/META-INF/MANIFEST.MF (rev 0)
+++ plugin/trunk/src/main/resources/META-INF/MANIFEST.MF 2010-04-16 15:03:12 UTC (rev 20)
@@ -0,0 +1,180 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Wicket Stump
+Bundle-SymbolicName: net.sf.stump;singleton:=true
+Bundle-Version: 0.1.0.0
+Bundle-Vendor: stump.sourceforge.net
+Bundle-Localization: plugin
+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.api.web,
+ org.apache.wicket,
+ junit.framework,
+ org.apache.wicket.markup.html.list,
+ junitx.util",
+ net.sf.stump.api.junit4;uses:="net.sf.stump.api.junit",
+ net.sf.stump.api.metadata,
+ net.sf.stump.api.runner;uses:="com.thoughtworks.selenium,org.openqa.jetty.jetty",
+ net.sf.stump.api.web;
+ uses:="org.apache.wicket.protocol.http,
+ org.apache.wicket.behavior,
+ net.sf.stump.api.metadata,
+ org.apache.wicket.markup.html",
+ net.sf.stump.browser;uses:="org.eclipse.swt.events,org.eclipse.swt.widgets",
+ net.sf.stump.eclipse;
+ uses:="net.sf.stump.eclipse.template,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.resource,
+ org.eclipse.ui,
+ org.eclipse.ui.plugin,
+ org.eclipse.ui.part,
+ net.sf.stump.browser,
+ org.eclipse.core.resources,
+ org.eclipse.swt.graphics,
+ org.osgi.framework,
+ org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.configuration;
+ uses:="org.eclipse.jface.preference,
+ org.eclipse.jdt.core,
+ org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.eclipse.ui.dialogs,
+ org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.editor;
+ uses:="org.eclipse.jface.text,
+ org.eclipse.ui.texteditor,
+ org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.apache.wicket.markup,
+ org.eclipse.ui.part,
+ org.eclipse.jface.text.contentassist,
+ org.eclipse.jface.action,
+ org.eclipse.jdt.ui.text.java,
+ org.eclipse.jdt.core,
+ org.eclipse.ui.views.contentoutline,
+ org.eclipse.core.resources,
+ org.eclipse.swt.graphics,
+ org.eclipse.jface.viewers,
+ org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.form;
+ uses:="org.eclipse.jface.action,
+ net.sf.stump.form,
+ net.sf.stump.eclipse.editor,
+ org.eclipse.jface.viewers,
+ org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.launcher;
+ uses:="org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.launching,
+ org.eclipse.jdt.core,
+ org.eclipse.ui,
+ org.eclipse.jface.viewers",
+ net.sf.stump.eclipse.metadata;
+ uses:="org.eclipse.core.runtime,
+ org.eclipse.jdt.core,
+ org.eclipse.core.resources,
+ net.sf.stump.eclipse.wizard",
+ net.sf.stump.eclipse.parser;uses:="net.sf.stump.api.metadata,org.eclipse.core.resources",
+ net.sf.stump.eclipse.refactoring;
+ uses:="org.eclipse.core.runtime,
+ org.eclipse.ltk.core.refactoring.participants,
+ org.eclipse.jdt.core,
+ org.eclipse.core.resources,
+ org.eclipse.ltk.core.refactoring",
+ net.sf.stump.eclipse.swt;uses:="org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.template;
+ uses:="org.eclipse.ui.texteditor.templates,
+ org.eclipse.jface.text.templates.persistence,
+ net.sf.stump.eclipse.metadata,
+ org.eclipse.jface.text.templates",
+ net.sf.stump.eclipse.util;
+ uses:="org.eclipse.ui.texteditor,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.core,
+ org.eclipse.ui,
+ org.eclipse.core.resources",
+ net.sf.stump.eclipse.wizard;
+ uses:="org.eclipse.jface.wizard,
+ org.eclipse.jface.operation,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.wizards.newresource,
+ org.eclipse.jface.text.templates,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.ui.wizards,
+ org.eclipse.core.resources,
+ net.sf.stump.eclipse.metadata,
+ org.eclipse.ui.dialogs,
+ org.eclipse.swt.widgets",
+ net.sf.stump.form;uses:="org.apache.wicket.markup",
+ net.sf.stump.util;uses:="org.apache.wicket,org.eclipse.core.resources,org.apache.wicket.session"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: net.sf.stump.eclipse.WicketPlugin
+Bundle-ClassPath: .,
+ ant-1.6.5.jar,
+ bcprov-jdk15-135.jar,
+ google-collections-1.0.jar,
+ jmxtools-1.2.1.jar,
+ jmxri-1.2.1.jar,
+ commons-httpclient-3.1.jar,
+ commons-logging-1.1.1.jar,
+ activation-1.1.jar,
+ jms-1.1.jar,
+ mail-1.4.jar,
+ servlet-api-2.3.jar,
+ javassist-3.1.jar,
+ junit-4.8.1.jar,
+ junit-addons-1.4.jar,
+ log4j-1.2.15.jar,
+ mocked-0.3.jar,
+ mx4j-tools-3.0.1.jar,
+ jna-3.2.2.jar,
+ cssparser-0.9.5.jar,
+ htmlunit-2.6.jar,
+ htmlunit-core-js-2.6.jar,
+ nekohtml-1.9.13.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,
+ jetty-util-6.1.4.jar,
+ servlet-api-2.5-6.1.4.jar,
+ selenium-chrome-driver-2.0a2.jar,
+ selenium-common-2.0a2.jar,
+ selenium-firefox-driver-2.0a2.jar,
+ selenium-htmlunit-driver-2.0a2.jar,
+ selenium-ie-driver-2.0a2.jar,
+ selenium-remote-client-2.0a2.jar,
+ selenium-remote-common-2.0a2.jar,
+ selenium-server-2.0a2.jar,
+ selenium-support-2.0a2.jar,
+ selenium-java-client-driver-1.0.2.jar,
+ sac-1.3.jar,
+ serializer-2.7.1.jar,
+ xalan-2.7.1.jar,
+ xercesImpl-2.6.2.jar,
+ xmlParserAPIs-2.6.2.jar,
+ xml-apis-1.3.04.jar
Copied: plugin/trunk/src/main/resources/plugin.xml (from rev 18, plugin/trunk/plugin.xml)
===================================================================
--- plugin/trunk/src/main/resources/plugin.xml (rev 0)
+++ plugin/trunk/src/main/resources/plugin.xml 2010-04-16 15:03:12 UTC (rev 20)
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension point="org.eclipse.ui.newWizards">
+ <category
+ name="%NewWizard.category"
+ id="net.sf.stump.eclipse.new">
+ </category>
+ <wizard
+ name="%NewWizard.name"
+ icon="icons/wicket.gif"
+ category="net.sf.stump.eclipse.new"
+ class="net.sf.stump.eclipse.wizard.NewWicketProjectWizard"
+ project="true"
+ 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="net.sf.stump.eclipse.new"
+ class="net.sf.stump.eclipse.wizard.NewWicketPanelWizard"
+ id="net.sf.stump.eclipse.new.panel">
+ <description>%NewPanelWizard.desc</description>
+ </wizard>
+ <wizard
+ name="%NewWebPageWizard.name"
+ icon="icons/wicket.gif"
+ category="net.sf.stump.eclipse.new"
+ class="net.sf.stump.eclipse.wizard.NewWebPageWizard"
+ id="net.sf.stump.eclipse.new.webPage">
+ <description>%NewWebPageWizard.desc</description>
+ </wizard>
+ </extension>
+
+ <extension point="org.eclipse.ui.propertyPages">
+ <page
+ id="net.sf.stump.eclipse.PropertyPage1"
+ name="%WicketPropertyPage.name"
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true"
+ class="net.sf.stump.eclipse.configuration.ProjectPropertiesPage">
+ <filter name="nature" value="org.eclipse.jdt.core.javanature"></filter>
+ </page>
+ </extension>
+
+ <extension point="org.eclipse.core.resources.natures" id="wicketnature" name="Wicket Nature">
+ <runtime>
+ <run class="net.sf.stump.eclipse.metadata.WicketNature"/>
+ </runtime>
+ <requires-nature id="org.eclipse.jdt.core.javanature"></requires-nature>
+ <builder id="net.sf.stump.eclipse.editor.associatedMarkupAuditor"/>
+ </extension>
+
+ <extension id="associatedMarkupAuditor" name="Wicket associated markup auditor" point="org.eclipse.core.resources.builders">
+ <builder>
+ <run class="net.sf.stump.eclipse.editor.AssociatedMarkupAuditor"/>
+ </builder>
+ </extension>
+
+ <extension id="associatedMarkupAuditorMarkerNoHtml" point="org.eclipse.core.resources.markers" name="Marker for associated markup auditor">
+ <super type="org.eclipse.core.resources.problemmarker"/>
+ <super type="org.eclipse.core.resources.textmarker"/>
+ <persistent value="true"/>
+ </extension>
+
+ <extension id="associatedMarkupAuditorMarkerParseError" point="org.eclipse.core.resources.markers" name="Marker for associated markup auditor">
+ <super type="org.eclipse.core.resources.problemmarker"/>
+ <super type="org.eclipse.core.resources.textmarker"/>
+ <persistent value="true"/>
+ </extension>
+
+ <extension point="org.eclipse.ui.ide.markerResolution">
+ <markerResolutionGenerator
+ markerType="net.sf.stump.associatedMarkupAuditorMarkerNoHtml"
+ class="net.sf.stump.eclipse.editor.CreateHtmlTemplateQuickFixGenerator">
+ </markerResolutionGenerator>
+ </extension>
+
+ <extension point="org.eclipse.jdt.ui.quickFixProcessors">
+ <quickFixProcessor
+ class="net.sf.stump.eclipse.editor.ProblemCorrectionQuickFixProcessor"
+ id="net.sf.stump.eclipse.editor.ProblemCorrectionQuickFixProcessor">
+ </quickFixProcessor>
+ </extension>
+
+ <extension point="org.eclipse.jdt.core.classpathVariableInitializer">
+ <classpathVariableInitializer
+ variable="WICKET_HOME"
+ class="net.sf.stump.eclipse.configuration.WicketHomeInitializer">
+ </classpathVariableInitializer>
+ </extension>
+
+ <extension point="org.eclipse.ui.views">
+ <category name="Wicket" id="net.sf.stump"/>
+ <view
+ name="Wicket Stump"
+ icon="icons/wicket.gif"
+ category="net.sf.stump"
+ class="net.sf.stump.eclipse.WicketPluginView"
+ id="net.sf.stump.eclipse.WicketPluginView">
+ </view>
+ </extension>
+
+ <extension point="org.eclipse.debug.core.launchConfigurationTypes">
+ <launchConfigurationType
+ name="%WicketLaunch.label"
+ delegate="net.sf.stump.eclipse.launcher.WicketLaunchConfiguration"
+ modes="run, debug"
+ 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"/>
+ <fileExtension default="false" extension="class"/>
+ </launchConfigurationType>
+ </extension>
+
+ <extension point="org.eclipse.debug.ui.launchShortcuts">
+ <shortcut
+ label="%WicketShortcut.label"
+ icon="icons/wicket.gif"
+ helpContextId="org.eclipse.jdt.junit.launch_shortcut"
+ class="net.sf.stump.eclipse.launcher.WicketLaunchShortcut"
+ modes="run, debug"
+ id="net.sf.stump.eclipse.wicketShortcut">
+ <contextualLaunch>
+ <enablement>
+ <with variable="selection">
+ <count value="1"></count>
+ <iterate>
+ <or>
+ <test property="org.eclipse.debug.ui.matchesPattern" value="*.java"/>
+ <test property="org.eclipse.debug.ui.matchesPattern" value="*.class"/>
+ <adapt type="org.eclipse.jdt.core.IJavaElement"/>
+ </or>
+ <test property="org.eclipse.jdt.junit.isTest"/>
+ </iterate>
+ </with>
+ </enablement>
+ </contextualLaunch>
+ <perspective id="org.eclipse.jdt.ui.JavaPerspective"></perspective>
+ <perspective id="org.eclipse.jdt.ui.JavaHierarchyPerspective"></perspective>
+ <perspective id="org.eclipse.jdt.ui.JavaBrowsingPerspective"></perspective>
+ <perspective id="org.eclipse.debug.ui.DebugPerspective"></perspective>
+ </shortcut>
+ </extension>
+
+ <extension point="org.eclipse.ui.preferencePages">
+ <page
+ name="Wicket"
+ class="net.sf.stump.eclipse.configuration.WicketBasePreferencePage"
+ id="net.sf.stump.eclipse.preferences">
+ </page>
+ <page
+ name="Templates"
+ category="net.sf.stump.eclipse.preferences"
+ class="net.sf.stump.eclipse.template.WicketTemplatePreferencePage"
+ id="net.sf.stump.eclipse.preferences.templates">
+ </page>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors.templates">
+ <contextType
+ name="wicket"
+ class="net.sf.stump.eclipse.template.WicketProjectContextType"
+ id="net.sf.stump.eclipse.templates.project">
+ </contextType>
+ <include file="templates/web.xml"></include>
+ <include file="templates/applicationClass.xml"></include>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors.templates">
+ <contextType
+ name="wicket"
+ class="net.sf.stump.eclipse.template.WicketClassContextType"
+ id="net.sf.stump.eclipse.templates.class">
+ </contextType>
+ <include file="templates/panel.xml"></include>
+ <include file="templates/panel_html.xml"></include>
+ <include file="templates/web_page.xml"></include>
+ <include file="templates/web_page_html.xml"></include>
+ <include file="templates/form.xml"></include>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors">
+ <editor
+ id="net.sf.stump.eclipse.editor"
+ name="Wicket Editor"
+ icon="icons/javaclass.gif"
+ class="net.sf.stump.eclipse.editor.WicketEditor"
+ contributorClass="net.sf.stump.eclipse.editor.WicketEditorActionContributor"
+ extensions="java">
+ </editor>
+ <editor
+ 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"
+ extensions="java">
+ </editor>
+ </extension>
+
+ <extension point="org.eclipse.ui.actionSetPartAssociations">
+ <actionSetPartAssociation targetID="org.eclipse.jdt.ui.CodingActionSet">
+ <part id="net.sf.stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ <actionSetPartAssociation targetID="org.eclipse.jdt.ui.SearchActionSet">
+ <part id="net.sf.stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ <actionSetPartAssociation targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
+ <part id="net.sf.stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ <actionSetPartAssociation targetID="org.eclipse.ui.edit.text.actionSet.presentation">
+ <part id="net.sf.stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ <actionSetPartAssociation targetID="org.eclipse.jdt.ui.text.java.actionSet.presentation">
+ <part id="net.sf.stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ </extension>
+
+ <extension point="org.eclipse.ui.editorActions">
+ <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"
+ actionID="RulerDoubleClick"
+ id="org.eclipse.debug.ui.actions.RulerToggleBreakpointAction">
+ </action>
+ <action
+ label="%Dummy.label"
+ class="org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction"
+ actionID="RulerClick"
+ id="org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction">
+ </action>
+ </editorContribution>
+ <editorContribution
+ 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="net.sf.stump.eclipse.editor.CssEnablement"
+ label="CSS"
+ state="true"
+ style="toggle"
+ toolbarPath="Normal/additions"
+ tooltip="Inline CSS files in HTML preview"/>
+ <action
+ class="net.sf.stump.eclipse.editor.ImageRelocation"
+ icon="icons/image_reloc.gif"
+ id="net.sf.stump.eclipse.editor.ImageRelocation"
+ label="Image"
+ state="true"
+ style="toggle"
+ toolbarPath="Normal/additions"
+ tooltip="Relocate images in HTML preview"/>
+ <action
+ class="net.sf.stump.eclipse.editor.WicketPreview"
+ icon="icons/wicket_preview.gif"
+ id="net.sf.stump.eclipse.editor.WicketPreview"
+ label="WicketPreview"
+ state="true"
+ style="toggle"
+ toolbarPath="Normal/additions"
+ tooltip="Enable wicket:preview tag"/>
+ </editorContribution>
+ </extension>
+
+ <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
+ <renameParticipant
+ id="net.sf.stump.eclipse.refactoring.RenameTypeParticipant"
+ name="net.sf.stump.eclipse.refactoring.RenameTypeParticipant"
+ class="net.sf.stump.eclipse.refactoring.RenameTypeParticipant">
+
+ <enablement>
+ <with variable="affectedNatures">
+ <iterate operator="or">
+ <equals value="org.eclipse.jdt.core.javanature"/>
+ </iterate>
+ </with>
+ <with variable="element">
+ <instanceof value="org.eclipse.jdt.core.IType"/>
+ </with>
+ </enablement>
+ </renameParticipant>
+ </extension>
+
+ <extension point="org.eclipse.ui.commands">
+ <category id="net.sf.stump.keyCategory" name="Wicket Stump keys"/>
+ <command
+ id="net.sf.stump.eclipse.editor.tabForward"
+ name="Forward tab"
+ categoryid="net.sf.stump.keyCategory">
+ </command>
+ <command
+ id="net.sf.stump.eclipse.editor.tabBackward"
+ name="Backward tab"
+ categoryid="net.sf.stump.keyCategory">
+ </command>
+ <command
+ id="net.sf.stump.eclipse.editor.newHtmlFile"
+ name="Create new html file"
+ categoryid="net.sf.stump.keyCategory">
+ </command>
+ <command
+ id="net.sf.stump.eclipse.editor.newPropertiesFile"
+ name="Create new properties file"
+ categoryid="net.sf.stump.keyCategory">
+ </command>
+ </extension>
+
+ <extension point="org.eclipse.ui.bindings">
+ <key
+ sequence="M1+M3+."
+ commandid="net.sf.stump.eclipse.editor.tabForward"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M1+M3+,"
+ commandid="net.sf.stump.eclipse.editor.tabBackward"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M1+M2+M3+;"
+ commandid="net.sf.stump.eclipse.editor.newHtmlFile"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M1+M2+M3+:"
+ commandid="net.sf.stump.eclipse.editor.newPropertiesFile"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M3+M2+X W"
+ commandid="net.sf.stump.eclipse.wicketShortcut"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ </extension>
+
+ <extension point="org.eclipse.ui.editorActions">
+ <editorContribution
+ id="net.sf.stump.eclipse.editorContribution" targetID="net.sf.stump.eclipse.editor">
+ <action
+ class="net.sf.stump.eclipse.editor.TabForwardActionDelegate"
+ id="net.sf.stump.eclipse.editor.tabForward"
+ label="forward"
+ definitionid="net.sf.stump.eclipse.editor.tabForward"/>
+ <action
+ class="net.sf.stump.eclipse.editor.TabBackwardActionDelegate"
+ id="net.sf.stump.eclipse.editor.tabBackward"
+ label="backward"
+ definitionid="net.sf.stump.eclipse.editor.tabBackward"/>
+ <action
+ class="net.sf.stump.eclipse.editor.NewHtmlFileActionDelegate"
+ id="net.sf.stump.eclipse.editor.newHtmlFile"
+ label="new html file"
+ definitionid="net.sf.stump.eclipse.editor.newHtmlFile"/>
+ <action
+ class="net.sf.stump.eclipse.editor.NewPropertiesFileActionDelegate"
+ id="net.sf.stump.eclipse.editor.newPropertiesFile"
+ label="new properties file"
+ definitionid="net.sf.stump.eclipse.editor.newPropertiesFile"/>
+ </editorContribution>
+ </extension>
+
+ <extension point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ id="net.sf.stump.eclipse.form.FormGeneration"
+ adaptable="true"
+ nameFilter="*.html"
+ objectClass="org.eclipse.core.resources.IFile">
+ <action
+ class="net.sf.stump.eclipse.form.FormGenerationActionDelegate"
+ id="net.sf.stump.eclipse.form.FormGenerationActionDelegate"
+ menubarPath="additions"
+ enablesFor="1"
+ label="Generate Wicket form code"/>
+ </objectContribution>
+ </extension>
+
+</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-15 10:49:35
|
Revision: 19
http://stump.svn.sourceforge.net/stump/?rev=19&view=rev
Author: rbaranga
Date: 2010-04-15 10:49:29 +0000 (Thu, 15 Apr 2010)
Log Message:
-----------
* try publish of feature & site
Modified Paths:
--------------
feature/feature.xml
update/site.xml
Added Paths:
-----------
update/artifacts.jar
update/content.jar
update/features/net.sf.stump_0.1.0.jar
update/plugins/net.sf.stump_0.1.0.jar
Modified: feature/feature.xml
===================================================================
--- feature/feature.xml 2010-04-15 10:36:18 UTC (rev 18)
+++ feature/feature.xml 2010-04-15 10:49:29 UTC (rev 19)
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="stump"
+ id="net.sf.stump"
label="Wicket Stump"
- version="0.1">
+ version="0.1"
+ provider-name="stump.sourceforge.net"
+ plugin="net.sf.stump">
<plugin
- id="WicketStump"
+ id="net.sf.stump"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="0.1"
unpack="false"/>
</feature>
Added: update/artifacts.jar
===================================================================
(Binary files differ)
Property changes on: update/artifacts.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/content.jar
===================================================================
(Binary files differ)
Property changes on: update/content.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/features/net.sf.stump_0.1.0.jar
===================================================================
(Binary files differ)
Property changes on: update/features/net.sf.stump_0.1.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/plugins/net.sf.stump_0.1.0.jar
===================================================================
(Binary files differ)
Property changes on: update/plugins/net.sf.stump_0.1.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: update/site.xml
===================================================================
--- update/site.xml 2010-04-15 10:36:18 UTC (rev 18)
+++ update/site.xml 2010-04-15 10:49:29 UTC (rev 19)
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
+ <feature url="features/net.sf.stump_0.1.0.jar" id="net.sf.stump" version="0.1"/>
</site>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-15 10:36:25
|
Revision: 18
http://stump.svn.sourceforge.net/stump/?rev=18&view=rev
Author: rbaranga
Date: 2010-04-15 10:36:18 +0000 (Thu, 15 Apr 2010)
Log Message:
-----------
* fixed dependencies
* fixed ids
* ignore added .jar files (required for eclipse)
Modified Paths:
--------------
plugin/trunk/META-INF/MANIFEST.MF
plugin/trunk/build.properties
plugin/trunk/plugin.xml
plugin/trunk/pom.xml
plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPlugin.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPluginView.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/AssociatedMarkupAuditor.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorLauncher.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorSite.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchConfiguration.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchShortcut.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/metadata/NatureAssociation.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketClassContextType.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketProjectContextType.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketTemplateStore.java
plugin/trunk/src/main/resources/templates/applicationClass.xml
plugin/trunk/src/main/resources/templates/form.xml
plugin/trunk/src/main/resources/templates/panel.xml
plugin/trunk/src/main/resources/templates/panel_html.xml
plugin/trunk/src/main/resources/templates/web.xml
plugin/trunk/src/main/resources/templates/web_page.xml
plugin/trunk/src/main/resources/templates/web_page_html.xml
plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuildPathAssistantTest.java
Property Changed:
----------------
plugin/trunk/
Property changes on: plugin/trunk
___________________________________________________________________
Modified: svn:ignore
- .*
target
bin
+ .*
target
bin
*.jar
Modified: plugin/trunk/META-INF/MANIFEST.MF
===================================================================
--- plugin/trunk/META-INF/MANIFEST.MF 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/META-INF/MANIFEST.MF 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Wicket Stump
-Bundle-SymbolicName: stump;singleton:=true
+Bundle-SymbolicName: net.sf.stump;singleton:=true
Bundle-Version: 0.1
Bundle-Vendor: stump.sourceforge.net
Bundle-Localization: plugin
@@ -22,15 +22,19 @@
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,
+ net.sf.stump.api.web,
+ org.apache.wicket,
junit.framework,
- org.apache.wicket,
org.apache.wicket.markup.html.list,
junitx.util",
- net.sf.stump.api.junit4;uses:="net.sf.stump.junit",
+ net.sf.stump.api.junit4;uses:="net.sf.stump.api.junit",
net.sf.stump.api.metadata,
net.sf.stump.api.runner;uses:="com.thoughtworks.selenium,org.openqa.jetty.jetty",
- net.sf.stump.api.web,
+ net.sf.stump.api.web;
+ uses:="org.apache.wicket.protocol.http,
+ org.apache.wicket.behavior,
+ net.sf.stump.api.metadata,
+ org.apache.wicket.markup.html",
net.sf.stump.browser;uses:="org.eclipse.swt.events,org.eclipse.swt.widgets",
net.sf.stump.eclipse;
uses:="net.sf.stump.eclipse.template,
@@ -86,7 +90,7 @@
org.eclipse.jdt.core,
org.eclipse.core.resources,
net.sf.stump.eclipse.wizard",
- net.sf.stump.eclipse.parser;uses:="net.sf.stump.metadata,org.eclipse.core.resources",
+ net.sf.stump.eclipse.parser;uses:="net.sf.stump.api.metadata,org.eclipse.core.resources",
net.sf.stump.eclipse.refactoring;
uses:="org.eclipse.core.runtime,
org.eclipse.ltk.core.refactoring.participants,
@@ -132,10 +136,12 @@
activation-1.1.jar,
jms-1.1.jar,
mail-1.4.jar,
+ servlet-api-2.3.jar,
javassist-3.1.jar,
junit-4.8.1.jar,
junit-addons-1.4.jar,
log4j-1.2.15.jar,
+ mocked-0.3.jar,
mx4j-tools-3.0.1.jar,
jna-3.2.2.jar,
cssparser-0.9.5.jar,
@@ -171,4 +177,7 @@
xalan-2.7.1.jar,
xercesImpl-2.6.2.jar,
xmlParserAPIs-2.6.2.jar,
- xml-apis-1.3.04.jar
+ xml-apis-1.3.04.jar,
+ wicket-1.4.7.jar,
+ slf4j-api-1.4.2.jar,
+ slf4j-log4j12-1.4.2.jar
Modified: plugin/trunk/build.properties
===================================================================
--- plugin/trunk/build.properties 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/build.properties 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,17 +1,24 @@
-src.includes = src/main/java/net/,\
- src/main/resources/icons/,\
- src/main/resources/selenium/,\
- src/main/resources/templates/,\
- src/main/resources/log4j.xml,\
- src/main/resources/log4j.dtd,\
- plugin.xml,\
- pom.xml,\
- build.properties,\
- META-INF/
-bin.includes = plugin.xml,\
+bin.includes = META-INF/,\
+ LICENSE.txt,\
+ wicket-1.4.7.jar,\
target/classes/icons/,\
+ target/classes/log4j.dtd,\
+ target/classes/log4j.xml,\
target/classes/net/,\
target/classes/selenium/,\
target/classes/templates/,\
- META-INF/
-jars.compile.order =
+ plugin.xml,\
+ slf4j-api-1.4.2.jar,\
+ slf4j-log4j12-1.4.2.jar
+src.includes = META-INF/,\
+ LICENSE.txt,\
+ plugin.xml,\
+ src/main/java/net/,\
+ src/main/resources/icons/,\
+ src/main/resources/templates/,\
+ src/main/resources/log4j.dtd,\
+ src/main/resources/log4j.xml,\
+ src/main/resources/selenium/,\
+ wicket-1.4.7.jar,\
+ slf4j-api-1.4.2.jar,\
+ slf4j-log4j12-1.4.2.jar
Modified: plugin/trunk/plugin.xml
===================================================================
--- plugin/trunk/plugin.xml 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/plugin.xml 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-
<plugin>
<extension point="org.eclipse.ui.newWizards">
<category
@@ -74,7 +73,7 @@
<extension point="org.eclipse.ui.ide.markerResolution">
<markerResolutionGenerator
- markerType="stump.associatedMarkupAuditorMarkerNoHtml"
+ markerType="net.sf.stump.associatedMarkupAuditorMarkerNoHtml"
class="net.sf.stump.eclipse.editor.CreateHtmlTemplateQuickFixGenerator">
</markerResolutionGenerator>
</extension>
@@ -98,7 +97,7 @@
<view
name="Wicket Stump"
icon="icons/wicket.gif"
- category="stump"
+ category="net.sf.stump"
class="net.sf.stump.eclipse.WicketPluginView"
id="net.sf.stump.eclipse.WicketPluginView">
</view>
@@ -107,7 +106,7 @@
<extension point="org.eclipse.debug.core.launchConfigurationTypes">
<launchConfigurationType
name="%WicketLaunch.label"
- delegate="stump.eclipse.launcher.WicketLaunchConfiguration"
+ delegate="net.sf.stump.eclipse.launcher.WicketLaunchConfiguration"
modes="run, debug"
id="net.sf.stump.junit.launchconfig"
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
@@ -221,7 +220,7 @@
</extension>
<extension point="org.eclipse.ui.editorActions">
- <editorContribution targetid="net.sf.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"
@@ -237,7 +236,7 @@
</editorContribution>
<editorContribution
id="net.sf.stump.eclipse.editor.preview"
- targetid="net.sf.stump.eclipse.editor">
+ targetID="net.sf.stump.eclipse.editor">
<action
class="net.sf.stump.eclipse.editor.CssEnablement"
icon="icons/css_attach.gif"
@@ -271,7 +270,7 @@
<extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
<renameParticipant
id="net.sf.stump.eclipse.refactoring.RenameTypeParticipant"
- name="stump.eclipse.refactoring.RenameTypeParticipant"
+ name="net.sf.stump.eclipse.refactoring.RenameTypeParticipant"
class="net.sf.stump.eclipse.refactoring.RenameTypeParticipant">
<enablement>
@@ -336,7 +335,7 @@
<extension point="org.eclipse.ui.editorActions">
<editorContribution
- id="net.sf.stump.eclipse.editorContribution" targetid="net.sf.stump.eclipse.editor">
+ id="net.sf.stump.eclipse.editorContribution" targetID="net.sf.stump.eclipse.editor">
<action
class="net.sf.stump.eclipse.editor.TabForwardActionDelegate"
id="net.sf.stump.eclipse.editor.tabForward"
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/pom.xml 2010-04-15 10:36:18 UTC (rev 18)
@@ -36,7 +36,6 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
<version>1.4.7</version>
- <scope>provided</scope>
</dependency>
<!-- Testing -->
@@ -44,35 +43,30 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<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>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 -->
@@ -80,21 +74,19 @@
<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 -->
@@ -102,28 +94,25 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
<version>6.0.26</version>
- <scope>provided</scope>
+
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jsp-api</artifactId>
<version>6.0.26</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
<version>6.0.26</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.3</version>
- <scope>provided</scope>
</dependency>
<!-- Javassist -->
@@ -131,7 +120,6 @@
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
<version>3.1</version>
- <scope>provided</scope>
</dependency>
<!-- JETTY -->
@@ -139,7 +127,6 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.4</version>
- <scope>provided</scope>
</dependency>
<!-- eclipse -->
@@ -662,6 +649,14 @@
<resource>
<directory>src/main/resources</directory>
</resource>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>META-INF/**</include>
+ <include>plugin.xml</include>
+ <include>*.jar</include>
+ </includes>
+ </resource>
</resources>
<testResources>
<testResource>
@@ -673,6 +668,14 @@
<testResource>
<directory>src/main/resources</directory>
</testResource>
+ <testResource>
+ <directory>.</directory>
+ <includes>
+ <include>META-INF/**</include>
+ <include>plugin.xml</include>
+ <include>*.jar</include>
+ </includes>
+ </testResource>
</testResources>
<plugins>
@@ -689,43 +692,57 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
- <classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
- <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
- </classpathContainers>
- <projectnatures>
+ <additionalProjectnatures>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
<projectnature>org.eclipse.pde.PluginNature</projectnature>
- </projectnatures>
+ <projectnature>org.eclipse.pde.api.tools.apiAnalysisNature</projectnature>
+ </additionalProjectnatures>
<downloadJavadocs>true</downloadJavadocs>
<downloadSources>true</downloadSources>
- <!--
- <buildcommands>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- <buildcommand>org.maven.ide.eclipse.maven2Builder</buildcommand>
- </buildcommands>
- -->
- <pde>true</pde>
+ <addGroupIdToProjectName>true</addGroupIdToProjectName>
+ <additionalBuildcommands>
+ <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.api.tools.apiAnalysisBuilder</buildcommand>
+ </additionalBuildcommands>
</configuration>
</plugin>
- <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
+ <phase>process-sources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <configuration>
+ <outputDirectory>${basedir}</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
</execution>
</executions>
</plugin>
- -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPlugin.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPlugin.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPlugin.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -33,7 +33,7 @@
* @author Joni Suominen
*/
public class WicketPlugin extends AbstractUIPlugin {
- public static final String PLUGIN_ID = "stump";
+ public static final String PLUGIN_ID = "net.sf.stump";
public static String WICKET_HOME = "WICKET_HOME";
private static Image WICKET_ICON;
private static WicketPlugin plugin;
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPluginView.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPluginView.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPluginView.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -11,7 +11,7 @@
* @author Joni Suominen
*/
public class WicketPluginView extends ViewPart {
- public static final String ID = "stump.eclipse.WicketPluginView";
+ public static final String ID = "net.sf.stump.eclipse.WicketPluginView";
private SwtBrowser browser;
@Override
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/AssociatedMarkupAuditor.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/AssociatedMarkupAuditor.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/AssociatedMarkupAuditor.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -32,7 +32,7 @@
* @author Joni Freeman
*/
public class AssociatedMarkupAuditor extends IncrementalProjectBuilder {
- public static final String ID = "stump.associatedMarkupAuditor";
+ public static final String ID = "net.sf.stump.associatedMarkupAuditor";
@Override
@SuppressWarnings("unchecked")
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -49,7 +49,7 @@
ITextEditorExtension, ITextEditorExtension2, ITextEditorExtension3,
INavigationLocationProvider {
- public static final String ID = "stump.eclipse.editor";
+ public static final String ID = "net.sf.stump.eclipse.editor";
private IType type;
private WicketEditorManager editorManager = new WicketEditorManager(this,
this);
@@ -79,6 +79,7 @@
@Override
protected void createPages() {
+
addEditors();
setActivePage(0);
updatePartName();
@@ -193,7 +194,7 @@
.getElementName(), fragment.getNonJavaResources()));
}
}
-
+
createEditorForJavaResource();
createEditorsForNonJavaResources(resources);
} catch (final Exception e) {
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorLauncher.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorLauncher.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorLauncher.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -22,7 +22,7 @@
* @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=127437
*/
public class WicketEditorLauncher implements IEditorLauncher {
- public static final String ID = "stump.eclipse.editorLauncher";
+ public static final String ID = "net.sf.stump.eclipse.editorLauncher";
public void open(IPath location) {
IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(location);
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorSite.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorSite.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorSite.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -15,7 +15,7 @@
@Override
public String getId() {
- return "stump.eclipse.editor";
+ return "net.sf.stump.eclipse.editor";
}
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchConfiguration.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchConfiguration.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchConfiguration.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -23,7 +23,7 @@
* @author Joni Suominen
*/
public class WicketLaunchConfiguration extends JavaLaunchDelegate {
- public static final String ID = "stump.junit.launchconfig";
+ public static final String ID = "net.sf.stump.junit.launchconfig";
public static final String PORT_ATTR = WicketPlugin.PLUGIN_ID + ".PORT";
private ILaunch launch;
@@ -48,6 +48,7 @@
BuildPathAssistant assistant = new BuildPathAssistant();
try {
+ // TODO: change to new structure
for (String jar : assistant.getAllJars()) {
entries.add(Platform.asLocalURL(new URL(url, "lib/" + jar)).getFile());
}
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchShortcut.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchShortcut.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchShortcut.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -15,7 +15,7 @@
* @author Joni Suominen
*/
public class WicketLaunchShortcut extends BaseLaunchShortcut {
- public static final String ID = "stump.eclipse.wicketShortcut";
+ public static final String ID = "net.sf.stump.eclipse.wicketShortcut";
@Override
protected void addAttributes(ILaunchConfigurationWorkingCopy configuration,
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/metadata/NatureAssociation.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/metadata/NatureAssociation.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/metadata/NatureAssociation.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -15,7 +15,7 @@
* @author Joni Suominen
*/
public class NatureAssociation {
- public static final String NATURE_ID = "stump.wicketnature";
+ public static final String NATURE_ID = "net.sf.stump.wicketnature";
public void doAssociate(IProject project) {
IProjectDescription description = ProjectHelper.getDescription(project);
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketClassContextType.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketClassContextType.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketClassContextType.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -9,7 +9,7 @@
* @author Joni Suominen
*/
public class WicketClassContextType extends TemplateContextType {
- public static final String ID = "stump.eclipse.templates.class";
+ public static final String ID = "net.sf.stump.eclipse.templates.class";
public WicketClassContextType() {
addResolver(new GlobalTemplateVariables.Cursor());
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketProjectContextType.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketProjectContextType.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketProjectContextType.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -9,7 +9,7 @@
* @author Joni Suominen
*/
public class WicketProjectContextType extends TemplateContextType {
- public static final String ID = "stump.eclipse.templates.project";
+ public static final String ID = "net.sf.stump.eclipse.templates.project";
public WicketProjectContextType() {
addResolver(new GlobalTemplateVariables.Cursor());
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketTemplateStore.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketTemplateStore.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketTemplateStore.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -15,7 +15,7 @@
* @author Joni Suominen
*/
public class WicketTemplateStore {
- public static final String CUSTOM_TEMPLATES_KEY = "stump.eclipse.customtemplates";
+ public static final String CUSTOM_TEMPLATES_KEY = "net.sf.stump.eclipse.customtemplates";
private ContributionTemplateStore templateStore;
private ContributionContextTypeRegistry registry;
Modified: plugin/trunk/src/main/resources/templates/applicationClass.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/applicationClass.xml 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/resources/templates/applicationClass.xml 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template context="stump.eclipse.templates.project"
- description="Wicket application class" id="stump.eclipse.applicationClass"
+ <template context="net.sf.stump.eclipse.templates.project"
+ description="Wicket application class" id="net.sf.stump.eclipse.applicationClass"
name="wicket.applicationClass"><![CDATA[package ${applicationClassPackageName};
import org.apache.wicket.protocol.http.WebApplication;
Modified: plugin/trunk/src/main/resources/templates/form.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/form.xml 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/resources/templates/form.xml 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template context="stump.eclipse.templates.class" description="Wicket form class"
- id="stump.eclipse.formClass" name="wicket.formClass"><![CDATA[
+ <template context="net.sf.stump.eclipse.templates.class" description="Wicket form class"
+ id="net.sf.stump.eclipse.formClass" name="wicket.formClass"><![CDATA[
class ${classShortName} extends Form {
public ${classShortName}(String id, IModel model) {
super(id, model);
Modified: plugin/trunk/src/main/resources/templates/panel.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/panel.xml 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/resources/templates/panel.xml 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template context="stump.eclipse.templates.class" description="Wicket panel class"
- id="stump.eclipse.panelClass" name="wicket.panelClass"><![CDATA[package ${packageName};
+ <template context="net.sf.stump.eclipse.templates.class" description="Wicket panel class"
+ id="net.sf.stump.eclipse.panelClass" name="wicket.panelClass"><![CDATA[package ${packageName};
import org.apache.wicket.markup.html.panel.Panel;
Modified: plugin/trunk/src/main/resources/templates/panel_html.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/panel_html.xml 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/resources/templates/panel_html.xml 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template context="stump.eclipse.templates.class" description="Wicket panel HTML"
- id="stump.eclipse.panelHtml" name="wicket.panelHtml"><![CDATA[<html xmlns:wicket>
+ <template context="net.sf.stump.eclipse.templates.class" description="Wicket panel HTML"
+ id="net.sf.stump.eclipse.panelHtml" name="wicket.panelHtml"><![CDATA[<html xmlns:wicket>
<wicket:panel>
${cursor}
</wicket:panel>
Modified: plugin/trunk/src/main/resources/templates/web.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/web.xml 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/resources/templates/web.xml 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template context="stump.eclipse.templates.project"
- description="web.xml" id="stump.eclipse.web.xml" name="wicket.web.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ <template context="net.sf.stump.eclipse.templates.project"
+ description="web.xml" id="net.sf.stump.eclipse.web.xml" name="wicket.web.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
Modified: plugin/trunk/src/main/resources/templates/web_page.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/web_page.xml 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/resources/templates/web_page.xml 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template context="stump.eclipse.templates.class" description="Wicket web page class"
- id="stump.eclipse.webPageClass" name="wicket.webPageClass"><![CDATA[package ${packageName};
+ <template context="net.sf.stump.eclipse.templates.class" description="Wicket web page class"
+ id="net.sf.stump.eclipse.webPageClass" name="wicket.webPageClass"><![CDATA[package ${packageName};
import org.apache.wicket.markup.html.WebPage;
Modified: plugin/trunk/src/main/resources/templates/web_page_html.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/web_page_html.xml 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/main/resources/templates/web_page_html.xml 2010-04-15 10:36:18 UTC (rev 18)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template context="stump.eclipse.templates.class" description="Wicket web page HTML"
- id="stump.eclipse.webPageHtml" name="wicket.webPageHtml"><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ <template context="net.sf.stump.eclipse.templates.class" description="Wicket web page HTML"
+ id="net.sf.stump.eclipse.webPageHtml" name="wicket.webPageHtml"><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
Modified: plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuildPathAssistantTest.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuildPathAssistantTest.java 2010-04-14 20:41:59 UTC (rev 17)
+++ plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuildPathAssistantTest.java 2010-04-15 10:36:18 UTC (rev 18)
@@ -37,12 +37,12 @@
public List<String> getJarNames() {
List<String> jarNames = new ArrayList<String>();
// TODO: generate dinamicly
- jarNames.add("wicket-1.4.5.jar");
+ jarNames.add("wicket-1.4.7.jar");
jarNames.add("log4j-1.2.15.jar");
- jarNames.add("stump-0.1.jar");
- jarNames.add("selenium-server-0.8.1.jar");
- jarNames.add("jetty-5.1.10.jar");
- jarNames.add("junit-4.4.jar");
+ // jarNames.add("stump-0.1.jar");
+ jarNames.add("selenium-server-2.0a2.jar");
+ jarNames.add("jetty-6.1.4.jar");
+ jarNames.add("junit-4.8.1.jar");
return jarNames;
}
});
@@ -59,12 +59,12 @@
public void testGetAllJars() throws Exception {
List<String> allJars = assistant.getAllJars();
List<String> expected = new ArrayList<String>();
- expected.add("wicket-1.4.5.jar");
+ expected.add("wicket-1.4.7.jar");
expected.add("log4j-1.2.15.jar");
- expected.add("stump-0.1.jar");
- expected.add("selenium-server-0.8.1.jar");
- expected.add("jetty-5.1.10.jar");
- expected.add("junit-4.4.jar");
+ // expected.add("stump-0.1.jar");
+ expected.add("selenium-server-2.0a2.jar");
+ expected.add("jetty-6.1.4.jar");
+ expected.add("junit-4.8.1.jar");
assertEquals(expected, allJars);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <rba...@us...> - 2010-04-14 15:32:14
|
Revision: 16
http://stump.svn.sourceforge.net/stump/?rev=16&view=rev
Author: rbaranga
Date: 2010-04-14 15:32:06 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
* moved packages
* re-added manifest & build.properties
Modified Paths:
--------------
plugin/trunk/plugin.xml
plugin/trunk/pom.xml
plugin/trunk/src/main/java/net/sf/stump/api/junit/AbstractTestSuite.java
plugin/trunk/src/main/java/net/sf/stump/api/junit/PackageMatchingFilter.java
plugin/trunk/src/main/java/net/sf/stump/api/junit/StumpTestCase.java
plugin/trunk/src/main/java/net/sf/stump/api/junit4/PreparePreview.java
plugin/trunk/src/main/java/net/sf/stump/api/junit4/StumpTestCase.java
plugin/trunk/src/main/java/net/sf/stump/api/metadata/ProjectMetadata.java
plugin/trunk/src/main/java/net/sf/stump/api/runner/Launcher.java
plugin/trunk/src/main/java/net/sf/stump/api/runner/Main.java
plugin/trunk/src/main/java/net/sf/stump/api/runner/Servers.java
plugin/trunk/src/main/java/net/sf/stump/api/runner/ServletContainer.java
plugin/trunk/src/main/java/net/sf/stump/api/web/HomePage.java
plugin/trunk/src/main/java/net/sf/stump/api/web/IComponentFactory.java
plugin/trunk/src/main/java/net/sf/stump/api/web/StaticHeaderContributor.java
plugin/trunk/src/main/java/net/sf/stump/api/web/Stump.java
plugin/trunk/src/main/java/net/sf/stump/api/web/StumpApplication.java
plugin/trunk/src/main/java/net/sf/stump/api/web/StumpApplicationFactory.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/WebResourceConfiguration.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/PreviewEditor.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchShortcut.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/PreviewParser.java
plugin/trunk/src/test/java/net/sf/stump/api/junit/StumpTestCaseTest.java
plugin/trunk/src/test/java/net/sf/stump/api/metadata/ProjectMetadataTest.java
plugin/trunk/src/test/java/net/sf/stump/api/runner/LauncherTest.java
plugin/trunk/src/test/java/net/sf/stump/api/web/CustomWebApplication.java
plugin/trunk/src/test/java/net/sf/stump/api/web/StaticHeaderContributorTest.java
plugin/trunk/src/test/java/net/sf/stump/api/web/StumpApplicationFactoryTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/PreviewParserTest.java
Added Paths:
-----------
plugin/trunk/META-INF/
plugin/trunk/META-INF/MANIFEST.MF
plugin/trunk/build.properties
plugin/trunk/src/main/java/net/sf/stump/api/
plugin/trunk/src/main/java/net/sf/stump/api/junit/
plugin/trunk/src/main/java/net/sf/stump/api/junit4/
plugin/trunk/src/main/java/net/sf/stump/api/metadata/
plugin/trunk/src/main/java/net/sf/stump/api/runner/
plugin/trunk/src/main/java/net/sf/stump/api/web/
plugin/trunk/src/test/java/net/sf/stump/api/
plugin/trunk/src/test/java/net/sf/stump/api/junit/
plugin/trunk/src/test/java/net/sf/stump/api/metadata/
plugin/trunk/src/test/java/net/sf/stump/api/runner/
plugin/trunk/src/test/java/net/sf/stump/api/web/
Removed Paths:
-------------
plugin/trunk/src/main/java/net/sf/stump/junit/
plugin/trunk/src/main/java/net/sf/stump/junit4/
plugin/trunk/src/main/java/net/sf/stump/metadata/
plugin/trunk/src/main/java/net/sf/stump/runner/
plugin/trunk/src/main/java/net/sf/stump/web/
plugin/trunk/src/test/java/net/sf/stump/junit/
plugin/trunk/src/test/java/net/sf/stump/metadata/
plugin/trunk/src/test/java/net/sf/stump/runner/
plugin/trunk/src/test/java/net/sf/stump/web/
Added: plugin/trunk/META-INF/MANIFEST.MF
===================================================================
--- plugin/trunk/META-INF/MANIFEST.MF (rev 0)
+++ plugin/trunk/META-INF/MANIFEST.MF 2010-04-14 15:32:06 UTC (rev 16)
@@ -0,0 +1,174 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Wicket Stump
+Bundle-SymbolicName: stump;singleton:=true
+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"
+Export-Package: net.sf.stump.api.junit;
+ uses:="com.thoughtworks.selenium,
+ net.sf.stump.web,
+ junit.framework,
+ org.apache.wicket,
+ org.apache.wicket.markup.html.list,
+ junitx.util",
+ net.sf.stump.api.junit4;uses:="net.sf.stump.junit",
+ net.sf.stump.api.metadata,
+ net.sf.stump.api.runner;uses:="com.thoughtworks.selenium,org.openqa.jetty.jetty",
+ net.sf.stump.api.web,
+ net.sf.stump.browser;uses:="org.eclipse.swt.events,org.eclipse.swt.widgets",
+ net.sf.stump.eclipse;
+ uses:="net.sf.stump.eclipse.template,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.resource,
+ org.eclipse.ui,
+ org.eclipse.ui.plugin,
+ org.eclipse.ui.part,
+ net.sf.stump.browser,
+ org.eclipse.core.resources,
+ org.eclipse.swt.graphics,
+ org.osgi.framework,
+ org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.configuration;
+ uses:="org.eclipse.jface.preference,
+ org.eclipse.jdt.core,
+ org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.eclipse.ui.dialogs,
+ org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.editor;
+ uses:="org.eclipse.jface.text,
+ org.eclipse.ui.texteditor,
+ org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.apache.wicket.markup,
+ org.eclipse.ui.part,
+ org.eclipse.jface.text.contentassist,
+ org.eclipse.jface.action,
+ org.eclipse.jdt.ui.text.java,
+ org.eclipse.jdt.core,
+ org.eclipse.ui.views.contentoutline,
+ org.eclipse.core.resources,
+ org.eclipse.swt.graphics,
+ org.eclipse.jface.viewers,
+ org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.form;
+ uses:="org.eclipse.jface.action,
+ net.sf.stump.form,
+ net.sf.stump.eclipse.editor,
+ org.eclipse.jface.viewers,
+ org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.launcher;
+ uses:="org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.launching,
+ org.eclipse.jdt.core,
+ org.eclipse.ui,
+ org.eclipse.jface.viewers",
+ net.sf.stump.eclipse.metadata;
+ uses:="org.eclipse.core.runtime,
+ org.eclipse.jdt.core,
+ org.eclipse.core.resources,
+ net.sf.stump.eclipse.wizard",
+ net.sf.stump.eclipse.parser;uses:="net.sf.stump.metadata,org.eclipse.core.resources",
+ net.sf.stump.eclipse.refactoring;
+ uses:="org.eclipse.core.runtime,
+ org.eclipse.ltk.core.refactoring.participants,
+ org.eclipse.jdt.core,
+ org.eclipse.core.resources,
+ org.eclipse.ltk.core.refactoring",
+ net.sf.stump.eclipse.swt;uses:="org.eclipse.swt.widgets",
+ net.sf.stump.eclipse.template;
+ uses:="org.eclipse.ui.texteditor.templates,
+ org.eclipse.jface.text.templates.persistence,
+ net.sf.stump.eclipse.metadata,
+ org.eclipse.jface.text.templates",
+ net.sf.stump.eclipse.util;
+ uses:="org.eclipse.ui.texteditor,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.core,
+ org.eclipse.ui,
+ org.eclipse.core.resources",
+ net.sf.stump.eclipse.wizard;
+ uses:="org.eclipse.jface.wizard,
+ org.eclipse.jface.operation,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.wizards.newresource,
+ org.eclipse.jface.text.templates,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.ui.wizards,
+ org.eclipse.core.resources,
+ net.sf.stump.eclipse.metadata,
+ org.eclipse.ui.dialogs,
+ org.eclipse.swt.widgets",
+ net.sf.stump.form;uses:="org.apache.wicket.markup",
+ net.sf.stump.util;uses:="org.apache.wicket,org.eclipse.core.resources,org.apache.wicket.session"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: net.sf.stump.eclipse.WicketPlugin
+Bundle-ClassPath: .,
+ ant-1.6.5.jar,
+ bcprov-jdk15-135.jar,
+ google-collections-1.0.jar,
+ jmxtools-1.2.1.jar,
+ jmxri-1.2.1.jar,
+ commons-httpclient-3.1.jar,
+ commons-logging-1.1.1.jar,
+ activation-1.1.jar,
+ jms-1.1.jar,
+ mail-1.4.jar,
+ javassist-3.1.jar,
+ junit-4.4.jar,
+ junit-addons-1.4.jar,
+ log4j-1.2.15.jar,
+ mx4j-tools-3.0.1.jar,
+ jna-3.2.2.jar,
+ cssparser-0.9.5.jar,
+ 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,
+ hamcrest-all-1.1.jar,
+ json-20080701.jar,
+ jetty-6.1.4.jar,
+ jetty-util-6.1.4.jar,
+ servlet-api-2.5-6.1.4.jar,
+ selenium-chrome-driver-2.0a2.jar,
+ selenium-common-2.0a2.jar,
+ selenium-firefox-driver-2.0a2.jar,
+ selenium-htmlunit-driver-2.0a2.jar,
+ selenium-ie-driver-2.0a2.jar,
+ selenium-remote-client-2.0a2.jar,
+ selenium-remote-common-2.0a2.jar,
+ selenium-server-2.0a2.jar,
+ selenium-support-2.0a2.jar,
+ selenium-java-client-driver-1.0.2.jar,
+ sac-1.3.jar,
+ serializer-2.7.1.jar,
+ xalan-2.7.1.jar,
+ xercesImpl-2.6.2.jar,
+ xmlParserAPIs-2.6.2.jar,
+ xml-apis-1.3.04.jar
Property changes on: plugin/trunk/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: plugin/trunk/build.properties
===================================================================
--- plugin/trunk/build.properties (rev 0)
+++ plugin/trunk/build.properties 2010-04-14 15:32:06 UTC (rev 16)
@@ -0,0 +1,17 @@
+src.includes = src/main/java/net/,\
+ src/main/resources/icons/,\
+ src/main/resources/selenium/,\
+ src/main/resources/templates/,\
+ src/main/resources/log4j.xml,\
+ src/main/resources/log4j.dtd,\
+ plugin.xml,\
+ pom.xml,\
+ build.properties,\
+ META-INF/
+bin.includes = plugin.xml,\
+ target/classes/icons/,\
+ target/classes/net/,\
+ target/classes/selenium/,\
+ target/classes/templates/,\
+ META-INF/
+jars.compile.order =
Property changes on: plugin/trunk/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: plugin/trunk/plugin.xml
===================================================================
--- plugin/trunk/plugin.xml 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/plugin.xml 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,13 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-<plugin
- id="stump"
- name="stump"
- version="0.1.0.0"
->
-
- <extension point="org.eclipse.ui.newWizards">
+<plugin>
+ <extension point="org.eclipse.ui.newWizards">
<category
name="%NewWizard.category"
id="stump.eclipse.new">
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/pom.xml 2010-04-14 15:32:06 UTC (rev 16)
@@ -121,16 +121,16 @@
<artifactId>javassist</artifactId>
<version>3.1</version>
</dependency>
-
- <!-- JETTY -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.4</version>
- </dependency>
-
+
+ <!-- JETTY -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.4</version>
+ </dependency>
+
<!-- eclipse -->
- <dependency>
+ <dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>commands</artifactId>
<version>(1.0.0,]</version>
@@ -148,27 +148,27 @@
<version>(1.0.0,]</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>filebuffers</artifactId>
<version>(1.0.0,]</version>
<scope>provided</scope>
- <exclusions>
+ <exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
<artifactId>runtime</artifactId>
</exclusion>
- <exclusion>
+ <exclusion>
<groupId>org.eclipse.core</groupId>
<artifactId>filesystem</artifactId>
</exclusion>
- <exclusion>
+ <exclusion>
<groupId>org.eclipse</groupId>
<artifactId>text</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>resources</artifactId>
<version>(1.0.0,]</version>
@@ -186,7 +186,7 @@
<version>(1.0.0,]</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>jface</artifactId>
<version>(1.0.0,]</version>
@@ -208,7 +208,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>text</artifactId>
<version>(1.0.0,]</version>
@@ -224,13 +224,13 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>swt</artifactId>
<version>(1.0.0,]</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>ui</artifactId>
<version>(1.0.0,]</version>
@@ -265,10 +265,10 @@
<scope>provided</scope>
<exclusions>
<exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
@@ -277,9 +277,9 @@
<scope>provided</scope>
<exclusions>
<exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.eclipse.core</groupId>
<artifactId>expressions</artifactId>
@@ -296,283 +296,359 @@
<groupId>org.eclipse.core</groupId>
<artifactId>variables</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ltk.core</groupId>
- <artifactId>refactoring</artifactId>
- </exclusion>
- <!-- -->
- <exclusion>
- <groupId>org.eclipse.ltk.ui</groupId>
- <artifactId>refactoring</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>console</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>compare</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ui.views.properties</groupId>
- <artifactId>tabbed</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt.core</groupId>
- <artifactId>manipulation</artifactId>
- </exclusion>
-
-
- <exclusion>
- <!-- not found -->
- <groupId>org.eclipse.equinox.p2.metadata</groupId>
- <artifactId>repository</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ltk.core</groupId>
+ <artifactId>refactoring</artifactId>
+ </exclusion>
+ <!-- -->
+ <exclusion>
+ <groupId>org.eclipse.ltk.ui</groupId>
+ <artifactId>refactoring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>compare</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.views.properties</groupId>
+ <artifactId>tabbed</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt.core</groupId>
+ <artifactId>manipulation</artifactId>
+ </exclusion>
+
+
+ <exclusion>
+ <!-- not found -->
+ <groupId>org.eclipse.equinox.p2.metadata</groupId>
+ <artifactId>repository</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>core</artifactId>
- <version>(1.0.0,]</version>
+
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ <version>(1.0.0,]</version>
<scope>provided</scope>
- <exclusions>
+ <exclusions>
<exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <version>(1.0.0,]</version>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>ui</artifactId>
+ <version>(1.0.0,]</version>
<scope>provided</scope>
- <exclusions>
+ <exclusions>
<exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.compare</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- <version>(1.0.0,]</version>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox.p2.metadata</groupId>
+ <artifactId>repository</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ <version>(1.0.0,]</version>
<scope>provided</scope>
- <exclusions>
+ <exclusions>
<exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filebuffers</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ltk.core</groupId>
- <artifactId>refactoring</artifactId>
- <version>(1.0.0,]</version>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.compare</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
+ <version>(1.0.0,]</version>
<scope>provided</scope>
- <exclusions>
+ <exclusions>
<exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>commands</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filebuffers</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>text</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>junit</artifactId>
- <version>(1.0.0,]</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filebuffers</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>variables</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>compare</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>console</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ui.views.properties</groupId>
- <artifactId>tabbed</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ltk.core</groupId>
- <artifactId>refactoring</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.ltk.ui</groupId>
- <artifactId>refactoring</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>debug</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt.core</groupId>
- <artifactId>manipulation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt.junit</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>frameworkadmin</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.equinox.p2.metadata</groupId>
- <artifactId>repository</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.equinox.simpleconfigurator</groupId>
- <artifactId>manipulator</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
- <version>(1.0.0,]</version>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filebuffers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>ide</artifactId>
+ <version>(1.0.0,]</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>debug</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.equinox.p2.metadata</groupId>
+ <artifactId>repository</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>workbench</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>databinding</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>observable</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>property</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ltk.core</groupId>
+ <artifactId>refactoring</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filebuffers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>junit</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filebuffers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>compare</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.views.properties</groupId>
+ <artifactId>tabbed</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ltk.core</groupId>
+ <artifactId>refactoring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ltk.ui</groupId>
+ <artifactId>refactoring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt.core</groupId>
+ <artifactId>manipulation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt.junit</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>frameworkadmin</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox.p2.metadata</groupId>
+ <artifactId>repository</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox.simpleconfigurator</groupId>
+ <artifactId>manipulator</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/java</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.properties</include>
- <include>**/*.js</include>
- <include>**/*.xml</include>
- <include>**/*.css</include>
- </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
@@ -581,14 +657,13 @@
<testResources>
<testResource>
<directory>src/test/java</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.properties</include>
- <include>**/*.js</include>
- <include>**/*.xml</include>
- <include>**/*.css</include>
- </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
+ <testResource>
+ <directory>src/main/resources</directory>
+ </testResource>
</testResources>
<plugins>
@@ -604,9 +679,47 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+ </classpathContainers>
+ <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ </projectnatures>
+ <downloadJavadocs>true</downloadJavadocs>
+ <downloadSources>true</downloadSources>
+ <!--
+ <buildcommands>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
+ <buildcommand>org.maven.ide.eclipse.maven2Builder</buildcommand>
+ </buildcommands>
+ -->
+ <pde>true</pde>
+ </configuration>
</plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
</plugins>
</build>
+
<repositories>
<repository>
<id>Laughingpanda Repo</id>
Modified: plugin/trunk/src/main/java/net/sf/stump/api/junit/AbstractTestSuite.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/junit/AbstractTestSuite.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/junit/AbstractTestSuite.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,6 +1,6 @@
-package net.sf.stump.junit;
+package net.sf.stump.api.junit;
-import net.sf.stump.runner.Servers;
+import net.sf.stump.api.runner.Servers;
import com.thoughtworks.selenium.Selenium;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/junit/PackageMatchingFilter.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/junit/PackageMatchingFilter.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/junit/PackageMatchingFilter.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.junit;
+package net.sf.stump.api.junit;
import java.util.regex.Pattern;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/junit/StumpTestCase.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/junit/StumpTestCase.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/junit/StumpTestCase.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,12 +1,12 @@
-package net.sf.stump.junit;
+package net.sf.stump.api.junit;
import java.util.Iterator;
import junit.framework.TestCase;
-import net.sf.stump.runner.Servers;
-import net.sf.stump.web.IComponentFactory;
-import net.sf.stump.web.Stump;
+import net.sf.stump.api.runner.Servers;
+import net.sf.stump.api.web.IComponentFactory;
+import net.sf.stump.api.web.Stump;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/junit4/PreparePreview.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/junit4/PreparePreview.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/junit4/PreparePreview.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.junit4;
+package net.sf.stump.api.junit4;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/junit4/StumpTestCase.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/junit4/StumpTestCase.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/junit4/StumpTestCase.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.junit4;
+package net.sf.stump.api.junit4;
import org.junit.After;
import org.junit.Before;
@@ -8,13 +8,13 @@
/**
- * A JUnit 4 adaptation of {@link net.sf.stump.junit.StumpTestCase}.
+ * A JUnit 4 adaptation of {@link net.sf.stump.api.junit.StumpTestCase}.
*
* @author Paul Mogren
*/
@RunWith(JUnit4ClassRunner.class)
public abstract class StumpTestCase
- extends net.sf.stump.junit.StumpTestCase {
+ extends net.sf.stump.api.junit.StumpTestCase {
/**
* This method serves two purposes:
@@ -25,7 +25,7 @@
* <li>To prevent servers from being started before each test method.</li>
* </ul>
*
- * @see net.sf.stump.junit.StumpTestCase#setUp()
+ * @see net.sf.stump.api.junit.StumpTestCase#setUp()
*/
@Before @Override
public void setUp() throws Exception {
@@ -35,7 +35,7 @@
/**
* This method is hooked into the test lifecycle during @After.
*
- * @see net.sf.stump.junit.StumpTestCase#tearDown()
+ * @see net.sf.stump.api.junit.StumpTestCase#tearDown()
*/
@After @Override
public void tearDown() throws Exception {
@@ -46,7 +46,7 @@
* Adds the necessary annotations to the inherited method for launching the
* component under test.
*
- * @see net.sf.stump.junit.StumpTestCase#launchPanel()
+ * @see net.sf.stump.api.junit.StumpTestCase#launchPanel()
*/
@Override @PreparePreview @Test
public void launchPanel() {
Modified: plugin/trunk/src/main/java/net/sf/stump/api/metadata/ProjectMetadata.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/metadata/ProjectMetadata.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/metadata/ProjectMetadata.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.metadata;
+package net.sf.stump.api.metadata;
import java.io.File;
import java.io.FileInputStream;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/runner/Launcher.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/runner/Launcher.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/runner/Launcher.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.runner;
+package net.sf.stump.api.runner;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
@@ -15,8 +15,8 @@
import junit.framework.TestResult;
import junit.framework.TestSuite;
-import net.sf.stump.junit.StumpTestCase;
-import net.sf.stump.junit4.PreparePreview;
+import net.sf.stump.api.junit.StumpTestCase;
+import net.sf.stump.api.junit4.PreparePreview;
import org.junit.runner.Description;
import org.junit.runner.manipulation.Filter;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/runner/Main.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/runner/Main.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/runner/Main.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,6 +1,6 @@
-package net.sf.stump.runner;
+package net.sf.stump.api.runner;
-import net.sf.stump.web.Stump;
+import net.sf.stump.api.web.Stump;
/**
Modified: plugin/trunk/src/main/java/net/sf/stump/api/runner/Servers.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/runner/Servers.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/runner/Servers.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.runner;
+package net.sf.stump.api.runner;
import com.thoughtworks.selenium.DefaultSelenium;
import com.thoughtworks.selenium.Selenium;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/runner/ServletContainer.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/runner/ServletContainer.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/runner/ServletContainer.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,10 +1,10 @@
-package net.sf.stump.runner;
+package net.sf.stump.api.runner;
import java.io.IOException;
-import net.sf.stump.metadata.ProjectMetadata;
-import net.sf.stump.web.Stump;
-import net.sf.stump.web.StumpApplicationFactory;
+import net.sf.stump.api.metadata.ProjectMetadata;
+import net.sf.stump.api.web.Stump;
+import net.sf.stump.api.web.StumpApplicationFactory;
import org.apache.wicket.protocol.http.WicketFilter;
import org.openqa.jetty.jetty.Server;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/web/HomePage.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/web/HomePage.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/web/HomePage.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,6 +1,6 @@
-package net.sf.stump.web;
+package net.sf.stump.api.web;
-import net.sf.stump.junit.StumpTestCase;
+import net.sf.stump.api.junit.StumpTestCase;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/web/IComponentFactory.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/web/IComponentFactory.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/web/IComponentFactory.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.web;
+package net.sf.stump.api.web;
import org.apache.wicket.Component;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/web/StaticHeaderContributor.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/web/StaticHeaderContributor.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/web/StaticHeaderContributor.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.web;
+package net.sf.stump.api.web;
import java.util.Collection;
import java.util.Iterator;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/web/Stump.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/web/Stump.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/web/Stump.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,8 +1,8 @@
-package net.sf.stump.web;
+package net.sf.stump.api.web;
import java.util.List;
-import net.sf.stump.metadata.ProjectMetadata;
+import net.sf.stump.api.metadata.ProjectMetadata;
/**
* @author Ville Peurala
Modified: plugin/trunk/src/main/java/net/sf/stump/api/web/StumpApplication.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/web/StumpApplication.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/web/StumpApplication.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.web;
+package net.sf.stump.api.web;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.time.Duration;
Modified: plugin/trunk/src/main/java/net/sf/stump/api/web/StumpApplicationFactory.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/web/StumpApplicationFactory.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/api/web/StumpApplicationFactory.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.web;
+package net.sf.stump.api.web;
import org.apache.wicket.protocol.http.IWebApplicationFactory;
import org.apache.wicket.protocol.http.WebApplication;
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/WebResourceConfiguration.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/WebResourceConfiguration.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/WebResourceConfiguration.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,7 +1,7 @@
package net.sf.stump.eclipse.configuration;
+import net.sf.stump.api.metadata.ProjectMetadata;
import net.sf.stump.eclipse.swt.LabelledText;
-import net.sf.stump.metadata.ProjectMetadata;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.preference.IPreferenceStore;
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/PreviewEditor.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/PreviewEditor.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/PreviewEditor.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,9 +1,9 @@
package net.sf.stump.eclipse.editor;
+import net.sf.stump.api.metadata.ProjectMetadata;
import net.sf.stump.eclipse.WicketPlugin;
import net.sf.stump.eclipse.parser.PreviewConfiguration;
import net.sf.stump.eclipse.parser.PreviewParser;
-import net.sf.stump.metadata.ProjectMetadata;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.swt.SWT;
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -45,9 +45,9 @@
* @author Igor Vaynberg
*/
public class WicketEditor extends MultiPageEditorPart implements
- EditorProvider, EditorManagerListener, ITextEditor,
- ITextEditorExtension, ITextEditorExtension2, ITextEditorExtension3,
- INavigationLocationProvider {
+EditorProvider, EditorManagerListener, ITextEditor,
+ITextEditorExtension, ITextEditorExtension2, ITextEditorExtension3,
+INavigationLocationProvider {
public static final String ID = "stump.eclipse.editor";
private IType type;
@@ -86,12 +86,12 @@
@Override
public void init(final IEditorSite site, final IEditorInput input)
- throws PartInitException {
+ throws PartInitException {
super.init(site, input);
final IFileEditorInput classFile = (IFileEditorInput) input;
final ICompilationUnit unit = (ICompilationUnit) JavaCore
- .create(classFile.getFile());
+ .create(classFile.getFile());
type = unit.getType(new JavaProjectHelper().getSimpleTypeName(input));
// TODO review for possible solution?
@@ -104,9 +104,9 @@
public IType getJavaType() {
final ICompilationUnit unit = (ICompilationUnit) JavaCore
- .create(((IFileEditorInput) getEditorInput()).getFile());
+ .create(((IFileEditorInput) getEditorInput()).getFile());
return unit.getType(new JavaProjectHelper()
- .getSimpleTypeName(getEditorInput()));
+ .getSimpleTypeName(getEditorInput()));
}
/*
@@ -221,7 +221,7 @@
}
private void addPreviewPageIfHtmlResource(final IFile file)
- throws PartInitException {
+ throws PartInitException {
if (file.getFileExtension().equals("html")) {
final int index = addPage(new PreviewEditor(), new FileEditorInput(
file));
@@ -394,7 +394,7 @@
public void showHighlightRangeOnly(final boolean showHighlightRangeOnly) {
((ITextEditor) getJavaEditor())
- .showHighlightRangeOnly(showHighlightRangeOnly);
+ .showHighlightRangeOnly(showHighlightRangeOnly);
}
public void setHighlightRange(final int offset, final int length,
@@ -435,14 +435,14 @@
public void showChangeInformation(final boolean show) {
if (isTextEditorExtension3()) {
((ITextEditorExtension3) getActiveEditor())
- .showChangeInformation(show);
+ .showChangeInformation(show);
}
}
public boolean isChangeInformationShowing() {
if (isTextEditorExtension3()) {
return ((ITextEditorExtension3) getActiveEditor())
- .isChangeInformationShowing();
+ .isChangeInformationShowing();
}
return false;
}
@@ -465,7 +465,7 @@
public boolean isEditorInputReadOnly() {
if (isTextEditorExtension()) {
return ((ITextEditorExtension) getActiveEditor())
- .isEditorInputReadOnly();
+ .isEditorInputReadOnly();
}
return false;
}
@@ -473,14 +473,14 @@
public void addRulerContextMenuListener(final IMenuListener listener) {
if (isTextEditorExtension()) {
((ITextEditorExtension) getActiveEditor())
- .addRulerContextMenuListener(listener);
+ .addRulerContextMenuListener(listener);
}
}
public void removeRulerContextMenuListener(final IMenuListener listener) {
if (isTextEditorExtension()) {
((ITextEditorExtension) getActiveEditor())
- .removeRulerContextMenuListener(listener);
+ .removeRulerContextMenuListener(listener);
}
}
@@ -494,18 +494,18 @@
public INavigationLocation createEmptyNavigationLocation() {
return ((INavigationLocationProvider) getJavaEditor())
- .createEmptyNavigationLocation();
+ .createEmptyNavigationLocation();
}
public INavigationLocation createNavigationLocation() {
return ((INavigationLocationProvider) getJavaEditor())
- .createNavigationLocation();
+ .createNavigationLocation();
}
public boolean isEditorInputModifiable() {
if (isTextEditorExtension2()) {
return ((ITextEditorExtension2) getActiveEditor())
- .isEditorInputModifiable();
+ .isEditorInputModifiable();
}
return false;
}
@@ -513,7 +513,7 @@
public boolean validateEditorInputState() {
if (isTextEditorExtension2()) {
return ((ITextEditorExtension2) getActiveEditor())
- .validateEditorInputState();
+ .validateEditorInputState();
}
return false;
}
@@ -559,7 +559,7 @@
if (source instanceof IEditorPart) {
final IEditorPart editor = (IEditorPart) source;
final IFileEditorInput input = (IFileEditorInput) editor
- .getEditorInput();
+ .getEditorInput();
final int index = indexOf(editor);
if (index != -1) {
final String dirtyMarker = editor.isDirty() ? "* " : "";
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchShortcut.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchShortcut.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchShortcut.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,8 +1,8 @@
package net.sf.stump.eclipse.launcher;
+import net.sf.stump.api.runner.Main;
+import net.sf.stump.api.web.Stump;
import net.sf.stump.eclipse.WicketPluginView;
-import net.sf.stump.runner.Main;
-import net.sf.stump.web.Stump;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/PreviewParser.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/PreviewParser.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/PreviewParser.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -5,7 +5,7 @@
import java.io.IOException;
import java.util.Stack;
-import net.sf.stump.metadata.ProjectMetadata;
+import net.sf.stump.api.metadata.ProjectMetadata;
import net.sf.stump.util.InputStreamReader;
import net.sf.stump.util.ParserApplication;
Modified: plugin/trunk/src/test/java/net/sf/stump/api/junit/StumpTestCaseTest.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/junit/StumpTestCaseTest.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/test/java/net/sf/stump/api/junit/StumpTestCaseTest.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,7 +1,7 @@
-package net.sf.stump.junit;
+package net.sf.stump.api.junit;
-import net.sf.stump.junit.StumpTestCase;
-import net.sf.stump.web.IComponentFactory;
+import net.sf.stump.api.junit.StumpTestCase;
+import net.sf.stump.api.web.IComponentFactory;
import junit.framework.TestCase;
/**
Modified: plugin/trunk/src/test/java/net/sf/stump/api/metadata/ProjectMetadataTest.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/metadata/ProjectMetadataTest.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/test/java/net/sf/stump/api/metadata/ProjectMetadataTest.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -2,11 +2,11 @@
* Copyright (c) 2006 Reaktor Innovations Oy
* All rights reserved.
*/
-package net.sf.stump.metadata;
+package net.sf.stump.api.metadata;
import java.util.Arrays;
-import net.sf.stump.metadata.ProjectMetadata;
+import net.sf.stump.api.metadata.ProjectMetadata;
import junit.framework.TestCase;
Modified: plugin/trunk/src/test/java/net/sf/stump/api/runner/LauncherTest.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/runner/LauncherTest.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/test/java/net/sf/stump/api/runner/LauncherTest.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,11 +1,11 @@
-package net.sf.stump.runner;
+package net.sf.stump.api.runner;
import java.lang.reflect.Method;
import java.util.Arrays;
-import net.sf.stump.junit.StumpTestCase;
-import net.sf.stump.runner.Launcher;
-import net.sf.stump.web.IComponentFactory;
+import net.sf.stump.api.junit.StumpTestCase;
+import net.sf.stump.api.runner.Launcher;
+import net.sf.stump.api.web.IComponentFactory;
import junit.framework.TestCase;
import junit.framework.TestResult;
Modified: plugin/trunk/src/test/java/net/sf/stump/api/web/CustomWebApplication.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/web/CustomWebApplication.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/test/java/net/sf/stump/api/web/CustomWebApplication.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,4 +1,4 @@
-package net.sf.stump.web;
+package net.sf.stump.api.web;
import org.apache.wicket.markup.html.pages.AccessDeniedPage;
import org.apache.wicket.protocol.http.WebApplication;
Modified: plugin/trunk/src/test/java/net/sf/stump/api/web/StaticHeaderContributorTest.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/web/StaticHeaderContributorTest.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/test/java/net/sf/stump/api/web/StaticHeaderContributorTest.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,10 +1,10 @@
-package net.sf.stump.web;
+package net.sf.stump.api.web;
import java.util.Arrays;
import junit.framework.TestCase;
-import net.sf.stump.web.StaticHeaderContributor;
+import net.sf.stump.api.web.StaticHeaderContributor;
import org.apache.wicket.markup.html.IHeaderContributor;
Modified: plugin/trunk/src/test/java/net/sf/stump/api/web/StumpApplicationFactoryTest.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/web/StumpApplicationFactoryTest.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/test/java/net/sf/stump/api/web/StumpApplicationFactoryTest.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -1,10 +1,10 @@
-package net.sf.stump.web;
+package net.sf.stump.api.web;
import junit.framework.TestCase;
-import net.sf.stump.web.Stump;
-import net.sf.stump.web.StumpApplication;
-import net.sf.stump.web.StumpApplicationFactory;
+import net.sf.stump.api.web.Stump;
+import net.sf.stump.api.web.StumpApplication;
+import net.sf.stump.api.web.StumpApplicationFactory;
import org.apache.wicket.protocol.http.WebApplication;
Modified: plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/PreviewParserTest.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/PreviewParserTest.java 2010-04-13 21:26:33 UTC (rev 15)
+++ plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/PreviewParserTest.java 2010-04-14 15:32:06 UTC (rev 16)
@@ -2,9 +2,9 @@
import java.io.IOException;
+import net.sf.stump.api.metadata.ProjectMetadata;
import net.sf.stump.eclipse.parser.PreviewConfiguration;
import net.sf.stump.eclipse.parser.PreviewParser;
-import net.sf.stump.metadata.ProjectMetadata;
import junit.framework.TestCase;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-13 21:26:45
|
Revision: 15
http://stump.svn.sourceforge.net/stump/?rev=15&view=rev
Author: rbaranga
Date: 2010-04-13 21:26:33 +0000 (Tue, 13 Apr 2010)
Log Message:
-----------
* more exclude
Modified Paths:
--------------
plugin/trunk/pom.xml
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-04-13 15:37:49 UTC (rev 14)
+++ plugin/trunk/pom.xml 2010-04-13 21:26:33 UTC (rev 15)
@@ -447,7 +447,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>junit</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.core</groupId>
@@ -533,6 +533,10 @@
<groupId>org.eclipse.equinox.p2.metadata</groupId>
<artifactId>repository</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox.simpleconfigurator</groupId>
+ <artifactId>manipulator</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-13 15:37:55
|
Revision: 14
http://stump.svn.sourceforge.net/stump/?rev=14&view=rev
Author: rbaranga
Date: 2010-04-13 15:37:49 +0000 (Tue, 13 Apr 2010)
Log Message:
-----------
* removed comments in pom
Modified Paths:
--------------
plugin/trunk/pom.xml
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-04-13 15:35:38 UTC (rev 13)
+++ plugin/trunk/pom.xml 2010-04-13 15:37:49 UTC (rev 14)
@@ -128,19 +128,7 @@
<artifactId>jetty</artifactId>
<version>6.1.4</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>5.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-management</artifactId>
- <version>5.1.6</version>
- </dependency>
- -->
-
+
<!-- eclipse -->
<dependency>
<groupId>org.eclipse.core</groupId>
@@ -612,19 +600,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <!--
- <configuration> <projectnatures>
- <projectnature>org.eclipse.jdt.core.javanature</projectnature>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- </projectnatures> <buildcommands>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- </buildcommands> <pde>true</pde>
- <downloadJavadocs>false</downloadJavadocs>
- <downloadSources>false</downloadSources> </configuration>
- -->
-
</plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-13 15:35:45
|
Revision: 13
http://stump.svn.sourceforge.net/stump/?rev=13&view=rev
Author: rbaranga
Date: 2010-04-13 15:35:38 +0000 (Tue, 13 Apr 2010)
Log Message:
-----------
* fixed pom dependencies / exclusions
* fix migration to jetty6
* fix changed API
Modified Paths:
--------------
plugin/trunk/pom.xml
plugin/trunk/src/main/java/net/sf/stump/eclipse/refactoring/RenameTypeParticipant.java
plugin/trunk/src/main/java/net/sf/stump/runner/ServletContainer.java
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-04-12 15:07:49 UTC (rev 12)
+++ plugin/trunk/pom.xml 2010-04-13 15:35:38 UTC (rev 13)
@@ -121,35 +121,66 @@
<artifactId>javassist</artifactId>
<version>3.1</version>
</dependency>
+
+ <!-- JETTY -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.4</version>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>5.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-management</artifactId>
+ <version>5.1.6</version>
+ </dependency>
+ -->
<!-- eclipse -->
- <dependency>
+ <dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>commands</artifactId>
<version>(1.0.0,]</version>
<scope>provided</scope>
</dependency>
- <!--
<dependency>
- <groupId>org.eclipse.core.databinding</groupId>
- <artifactId>observable</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
<version>(1.0.0,]</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core.databinding</groupId>
- <artifactId>property</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
<version>(1.0.0,]</version>
<scope>provided</scope>
</dependency>
- -->
- <dependency>
+ <dependency>
<groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
+ <artifactId>filebuffers</artifactId>
<version>(1.0.0,]</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>resources</artifactId>
<version>(1.0.0,]</version>
@@ -162,6 +193,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>jface</artifactId>
<version>(1.0.0,]</version>
@@ -183,7 +220,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>text</artifactId>
<version>(1.0.0,]</version>
@@ -199,38 +236,338 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>swt</artifactId>
<version>(1.0.0,]</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>ui</artifactId>
<version>(1.0.0,]</version>
<scope>provided</scope>
<exclusions>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
- </exclusion>
- <!--
- <exclusion>
- <groupId>org.eclipse.core.databinding</groupId>
- <artifactId>observable</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.core.databinding</groupId>
- <artifactId>property</artifactId>
- </exclusion>
- -->
- </exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>databinding</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>observable</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>property</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>ui</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filebuffers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ltk.core</groupId>
+ <artifactId>refactoring</artifactId>
+ </exclusion>
+ <!-- -->
+ <exclusion>
+ <groupId>org.eclipse.ltk.ui</groupId>
+ <artifactId>refactoring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>compare</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.views.properties</groupId>
+ <artifactId>tabbed</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt.core</groupId>
+ <artifactId>manipulation</artifactId>
+ </exclusion>
+
+
+ <exclusion>
+ <!-- not found -->
+ <groupId>org.eclipse.equinox.p2.metadata</groupId>
+ <artifactId>repository</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.compare</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filebuffers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ltk.core</groupId>
+ <artifactId>refactoring</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filebuffers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>junit</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filebuffers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>compare</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.views.properties</groupId>
+ <artifactId>tabbed</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ltk.core</groupId>
+ <artifactId>refactoring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.ltk.ui</groupId>
+ <artifactId>refactoring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt.core</groupId>
+ <artifactId>manipulation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt.junit</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>frameworkadmin</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox.p2.metadata</groupId>
+ <artifactId>repository</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
<build>
@@ -284,9 +621,10 @@
<buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
<buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
</buildcommands> <pde>true</pde>
- <downloadJavadocs>true</downloadJavadocs>
- <downloadSources>true</downloadSources> </configuration>
+ <downloadJavadocs>false</downloadJavadocs>
+ <downloadSources>false</downloadSources> </configuration>
-->
+
</plugin>
</plugins>
</build>
@@ -308,7 +646,6 @@
<id>org.eclipse.swt.win32</id>
<activation>
<os>
- <!--<name>windows xp</name>-->
<family>Windows</family>
<arch>x86</arch>
</os>
@@ -318,7 +655,7 @@
<groupId>org.eclipse.swt.win32.win32</groupId>
<artifactId>x86</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
@@ -335,7 +672,7 @@
<groupId>org.eclipse.swt.carbon</groupId>
<artifactId>macosx</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
@@ -351,7 +688,7 @@
<groupId>org.eclipse.swt.gtk.linux</groupId>
<artifactId>x86</artifactId>
<version>(1.0.0,]</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/refactoring/RenameTypeParticipant.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/refactoring/RenameTypeParticipant.java 2010-04-12 15:07:49 UTC (rev 12)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/refactoring/RenameTypeParticipant.java 2010-04-13 15:35:38 UTC (rev 13)
@@ -9,12 +9,12 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.corext.refactoring.changes.RenameResourceChange;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
+import org.eclipse.ltk.core.refactoring.resource.RenameResourceChange;
/**
@@ -28,7 +28,7 @@
private IType type;
@Override
- protected boolean initialize(Object element) {
+ protected boolean initialize(final Object element) {
type = (IType) element;
// TODO also need to take care of any inner types of this type that are containers
return new TypeHelper().isMarkupContainer(type);
@@ -40,13 +40,13 @@
}
@Override
- public RefactoringStatus checkConditions(IProgressMonitor pm,
- CheckConditionsContext context) throws OperationCanceledException {
+ public RefactoringStatus checkConditions(final IProgressMonitor pm,
+ final CheckConditionsContext context) throws OperationCanceledException {
return new RefactoringStatus();// OK
}
@Override
- public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
+ public Change createChange(final IProgressMonitor pm) throws CoreException, OperationCanceledException {
final String typeName = getTypeName(type);
/*
@@ -58,14 +58,15 @@
/*
* rename all relevant non-java resources
*/
- Object[] objects = type.getPackageFragment().getNonJavaResources();
- List<IResource> resources = new TypeHelper().getResources(typeName, objects);
- for (IResource resource : resources) {
+ final Object[] objects = type.getPackageFragment().getNonJavaResources();
+ final List<IResource> resources = new TypeHelper().getResources(typeName, objects);
+ for (final IResource resource : resources) {
final String newName = constructNewName(resource);
if (change == null) {
change = new CompositeChange("Renaming wicket-related files");
}
- change.add(new RenameResourceChange(null, resource, newName, ""));
+ //null, resource, newName, ""
+ change.add(new RenameResourceChange(resource.getFullPath(), newName));
}
return change;
@@ -78,7 +79,7 @@
* resource to be renamed
* @return name the resource should be renamed to
*/
- protected String constructNewName(IResource resource) {
+ protected String constructNewName(final IResource resource) {
final String typeName = getTypeName(type);
/* construct new name for the resource */
@@ -99,10 +100,10 @@
* type
* @return name of the type without the package path
*/
- protected String getTypeName(IType type) {
+ protected String getTypeName(final IType type) {
String name = type.getFullyQualifiedName();
- String packageName = type.getPackageFragment().getElementName();
+ final String packageName = type.getPackageFragment().getElementName();
if (packageName != null && packageName.length() > 0) {
name = name.substring(packageName.length() + 1);
Modified: plugin/trunk/src/main/java/net/sf/stump/runner/ServletContainer.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/runner/ServletContainer.java 2010-04-12 15:07:49 UTC (rev 12)
+++ plugin/trunk/src/main/java/net/sf/stump/runner/ServletContainer.java 2010-04-13 15:35:38 UTC (rev 13)
@@ -7,55 +7,55 @@
import net.sf.stump.web.StumpApplicationFactory;
import org.apache.wicket.protocol.http.WicketFilter;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Dispatcher;
-import org.mortbay.jetty.servlet.FilterHolder;
-import org.mortbay.jetty.servlet.WebApplicationContext;
-import org.mortbay.jetty.servlet.WebApplicationHandler;
+import org.openqa.jetty.jetty.Server;
+import org.openqa.jetty.jetty.servlet.Dispatcher;
+import org.openqa.jetty.jetty.servlet.FilterHolder;
+import org.openqa.jetty.jetty.servlet.WebApplicationContext;
+import org.openqa.jetty.jetty.servlet.WebApplicationHandler;
/**
* @author Joni Freeman
*/
public class ServletContainer {
- private final Server server;
- private final int port;
+ private final Server server;
+ private final int port;
- public ServletContainer(int port) {
- server = new Server();
- this.port = port;
- }
+ public ServletContainer(final int port) {
+ server = new Server();
+ this.port = port;
+ }
- public void init() throws IOException {
- server.addListener(":" + port);
- System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
- WebApplicationContext context = new WebApplicationContext();
- ProjectMetadata metadata = new ProjectMetadata().load();
- Stump.setProjectMetadata(metadata);
- context.setResourceBase(metadata.getContextRoot());
- WebApplicationHandler webapp = new WebApplicationHandler();
- FilterHolder filter = webapp.defineFilter("wicketFilter", WicketFilter.class.getName());
- filter.setInitParameter("applicationFactoryClassName", StumpApplicationFactory.class.getName());
- filter.setInitParameter("filterMappingUrlPattern", "/*");
- webapp.addFilterPathMapping("/*", "wicketFilter", Dispatcher.__ALL);
- context.setContextPath("wicket");
- context.addHandler(webapp);
- server.addContext(context);
- }
+ public void init() throws IOException {
+ server.addListener(":" + port);
+ System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
+ final WebApplicationContext context = new WebApplicationContext();
+ final ProjectMetadata metadata = new ProjectMetadata().load();
+ Stump.setProjectMetadata(metadata);
+ context.setResourceBase(metadata.getContextRoot());
+ final WebApplicationHandler webapp = new WebApplicationHandler();
+ final FilterHolder filter = webapp.defineFilter("wicketFilter", WicketFilter.class.getName());
+ filter.setInitParameter("applicationFactoryClassName", StumpApplicationFactory.class.getName());
+ filter.setInitParameter("filterMappingUrlPattern", "/*");
+ webapp.addFilterPathMapping("/*", "wicketFilter", Dispatcher.__ALL);
+ context.setContextPath("wicket");
+ context.addHandler(webapp);
+ server.addContext(context);
+ }
- public void start() throws Exception {
- server.start();
- }
-
- public void stop() {
- try {
- server.stop();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
+ public void start() throws Exception {
+ server.start();
+ }
- public Server getServer() {
- return server;
- }
+ public void stop() {
+ try {
+ server.stop();
+ } catch (final InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public Server getServer() {
+ return server;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-12 15:07:58
|
Revision: 12
http://stump.svn.sourceforge.net/stump/?rev=12&view=rev
Author: rbaranga
Date: 2010-04-12 15:07:49 +0000 (Mon, 12 Apr 2010)
Log Message:
-----------
* partially fix dependencies
Modified Paths:
--------------
plugin/trunk/pom.xml
Property Changed:
----------------
plugin/trunk/
Property changes on: plugin/trunk
___________________________________________________________________
Modified: svn:ignore
- .*
target
+ .*
target
bin
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-04-09 13:56:03 UTC (rev 11)
+++ plugin/trunk/pom.xml 2010-04-12 15:07:49 UTC (rev 12)
@@ -33,9 +33,9 @@
<dependencies>
<!-- Wicket -->
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>1.4.7</version>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>1.4.7</version>
</dependency>
<!-- Testing -->
@@ -44,12 +44,12 @@
<artifactId>junit</artifactId>
<version>4.4</version>
</dependency>
-
+
<dependency>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- <version>1.4</version>
- </dependency>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ <version>1.4</version>
+ </dependency>
<dependency>
<groupId>mocked</groupId>
@@ -59,68 +59,178 @@
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>1.0.2</version>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-server</artifactId>
- <version>2.0a2</version>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-server</artifactId>
+ <version>2.0a2</version>
</dependency>
-
+
<!-- Logging -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
</dependency>
-
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.4.2</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.2</version>
</dependency>
-
+
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
</dependency>
-
+
<!-- Tomcat -->
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>juli</artifactId>
- <version>6.0.20</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.20</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jsp-api</artifactId>
- <version>6.0.20</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>6.0.20</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper</artifactId>
- <version>6.0.20</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ <version>6.0.20</version>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.3</version>
<scope>provided</scope>
</dependency>
-
+
<!-- Javassist -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.1</version>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.1</version>
</dependency>
+
+ <!-- eclipse -->
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>observable</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>property</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>jface</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>text</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>swt</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>ui</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ </exclusion>
+ <!--
+ <exclusion>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>observable</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>property</artifactId>
+ </exclusion>
+ -->
+ </exclusions>
+ </dependency>
</dependencies>
<build>
@@ -165,33 +275,85 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
- <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
- </classpathContainers>
- <projectnatures>
- <projectnature>org.eclipse.jdt.core.javanature</projectnature>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </projectnatures>
- <buildcommands>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- <buildcommand>org.maven.ide.eclipse.maven2Builder</buildcommand>
- </buildcommands>
- <pde>true</pde>
+ <!--
+ <configuration> <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ </projectnatures> <buildcommands>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
+ </buildcommands> <pde>true</pde>
<downloadJavadocs>true</downloadJavadocs>
- <downloadSources>true</downloadSources>
- </configuration>
+ <downloadSources>true</downloadSources> </configuration>
+ -->
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>Laughingpanda Repo</id>
- <url>http://www.laughingpanda.org/maven2/</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>Laughingpanda Repo</id>
+ <url>http://www.laughingpanda.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <properties>
+ <maven.release>true</maven.release>
+ </properties>
+ </profile>
+ <profile>
+ <id>org.eclipse.swt.win32</id>
+ <activation>
+ <os>
+ <!--<name>windows xp</name>-->
+ <family>Windows</family>
+ <arch>x86</arch>
+ </os>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.swt.win32.win32</groupId>
+ <artifactId>x86</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>org.eclipse.swt.macosx</id>
+ <activation>
+ <os>
+ <name>mac os x</name>
+ <arch>i386</arch>
+ </os>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.swt.carbon</groupId>
+ <artifactId>macosx</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>org.eclipse.swt.linux</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ </os>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.swt.gtk.linux</groupId>
+ <artifactId>x86</artifactId>
+ <version>(1.0.0,]</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-04-09 13:56:09
|
Revision: 11
http://stump.svn.sourceforge.net/stump/?rev=11&view=rev
Author: rbaranga
Date: 2010-04-09 13:56:03 +0000 (Fri, 09 Apr 2010)
Log Message:
-----------
* removed generated resources
* removed eclipse dependencies for now
Modified Paths:
--------------
plugin/trunk/plugin.xml
plugin/trunk/pom.xml
Added Paths:
-----------
plugin/trunk/LICENSE.txt
Removed Paths:
-------------
plugin/trunk/LICENCE.txt
plugin/trunk/META-INF/
plugin/trunk/build.properties
Deleted: plugin/trunk/LICENCE.txt
===================================================================
--- plugin/trunk/LICENCE.txt 2010-03-10 06:50:19 UTC (rev 10)
+++ plugin/trunk/LICENCE.txt 2010-04-09 13:56:03 UTC (rev 11)
@@ -1,11 +0,0 @@
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
Copied: plugin/trunk/LICENSE.txt (from rev 10, plugin/trunk/LICENCE.txt)
===================================================================
--- plugin/trunk/LICENSE.txt (rev 0)
+++ plugin/trunk/LICENSE.txt 2010-04-09 13:56:03 UTC (rev 11)
@@ -0,0 +1,11 @@
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
Deleted: plugin/trunk/build.properties
===================================================================
--- plugin/trunk/build.properties 2010-03-10 06:50:19 UTC (rev 10)
+++ plugin/trunk/build.properties 2010-04-09 13:56:03 UTC (rev 11)
@@ -1,11 +0,0 @@
-src.includes = src/,\
- pom.xml,\
- plugin.xml,\
- build.properties,\
- LICENCE.txt,\
- META-INF/
-bin.includes = target/classes/,\
- META-INF/,\
- LICENCE.txt,\
- plugin.xml,\
- build.properties
Modified: plugin/trunk/plugin.xml
===================================================================
--- plugin/trunk/plugin.xml 2010-03-10 06:50:19 UTC (rev 10)
+++ plugin/trunk/plugin.xml 2010-04-09 13:56:03 UTC (rev 11)
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-<plugin>
+<plugin
+ id="stump"
+ name="stump"
+ version="0.1.0.0"
+>
<extension point="org.eclipse.ui.newWizards">
<category
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-03-10 06:50:19 UTC (rev 10)
+++ plugin/trunk/pom.xml 2010-04-09 13:56:03 UTC (rev 11)
@@ -121,167 +121,6 @@
<artifactId>javassist</artifactId>
<version>3.1</version>
</dependency>
-
- <!-- Eclipse -->
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>text</artifactId>
- <version>3.2.0-v20060605-1400</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <version>3.5.0.v20090520</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse Core -->
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <version>3.2.1-R32x_v20060914</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <version>3.2.0-v20060603</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
- <version>3.2.1-r321_v20060721</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse JDT -->
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- <version>3.3.0-v_771</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
- <version>3.3.0-v20070510</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>ui</artifactId>
- <version>3.3.0-v20070607-0010</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>junit</artifactId>
- <version>3.3.0-v20070606-0010</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse JFace -->
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>jface</artifactId>
- <version>3.2.1-M20060908-1000</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- <version>3.3.0-v20070606-0010</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse UI -->
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- <version>3.3.0-v20070606-0010</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
- <version>3.2.100-I20070319-0010</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
- <version>3.3.0-I20070620</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>workbench</artifactId>
- <version>3.3.0-I20070608-1100</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <version>3.3.0-v20070606-0010</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse Debug -->
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>core</artifactId>
- <version>3.3.0-v20070607-1800</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>ui</artifactId>
- <version>3.3.0-v20070607-1800</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse LTK -->
- <dependency>
- <groupId>org.eclipse.ltk.core</groupId>
- <artifactId>refactoring</artifactId>
- <version>3.3.0-v20070606-0010</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse Equinox -->
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <version>3.3.0-v20070426</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
- <version>1.0.0-v20070606</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>swt</artifactId>
- <version>3.3.0-v3346</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -314,11 +153,9 @@
</testResources>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -328,7 +165,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
<configuration>
<classpathContainers>
<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
@@ -352,5 +188,10 @@
</plugin>
</plugins>
</build>
-
+ <repositories>
+ <repository>
+ <id>Laughingpanda Repo</id>
+ <url>http://www.laughingpanda.org/maven2/</url>
+ </repository>
+ </repositories>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-03-10 06:50:28
|
Revision: 10
http://stump.svn.sourceforge.net/stump/?rev=10&view=rev
Author: rbaranga
Date: 2010-03-10 06:50:19 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
* dependency changes
Modified Paths:
--------------
plugin/trunk/META-INF/MANIFEST.MF
plugin/trunk/pom.xml
Added Paths:
-----------
plugin/trunk/build.properties
Modified: plugin/trunk/META-INF/MANIFEST.MF
===================================================================
--- plugin/trunk/META-INF/MANIFEST.MF 2010-03-02 22:40:18 UTC (rev 9)
+++ plugin/trunk/META-INF/MANIFEST.MF 2010-03-10 06:50:19 UTC (rev 10)
@@ -40,26 +40,4 @@
net.sf.stump.form,
net.sf.stump.runner,
net.sf.stump.util
-Bundle-ClassPath: .,
- jmxtools-1.2.1.jar,
- jmxri-1.2.1.jar,
- activation-1.1.jar,
- jms-1.1.jar,
- mail-1.4.jar,
- javassist-3.1.jar,
- junit-4.4.jar,
- junit-addons-1.4.jar,
- log4j-1.2.15.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,
- selenium-java-client-driver-0.8.1.jar,
- selenium-server-0.8.1.jar,
- xercesImpl-2.6.2.jar,
- xmlParserAPIs-2.6.2.jar
+Bundle-ClassPath: .
Added: plugin/trunk/build.properties
===================================================================
--- plugin/trunk/build.properties (rev 0)
+++ plugin/trunk/build.properties 2010-03-10 06:50:19 UTC (rev 10)
@@ -0,0 +1,11 @@
+src.includes = src/,\
+ pom.xml,\
+ plugin.xml,\
+ build.properties,\
+ LICENCE.txt,\
+ META-INF/
+bin.includes = target/classes/,\
+ META-INF/,\
+ LICENCE.txt,\
+ plugin.xml,\
+ build.properties
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-03-02 22:40:18 UTC (rev 9)
+++ plugin/trunk/pom.xml 2010-03-10 06:50:19 UTC (rev 10)
@@ -13,10 +13,6 @@
<packaging>jar</packaging>
- <properties>
- <eclipse.version>3.3.1</eclipse.version>
- </properties>
-
<scm>
<connection>
scm:https://stump.svn.sourceforge.net/svnroot/stump/
@@ -35,7 +31,15 @@
</developers>
<dependencies>
+ <!-- Wicket -->
<dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+
+ <!-- Testing -->
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
@@ -45,7 +49,7 @@
<groupId>junit-addons</groupId>
<artifactId>junit-addons</artifactId>
<version>1.4</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>mocked</groupId>
@@ -55,24 +59,19 @@
</dependency>
<dependency>
- <groupId>selenium</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>0.8.1</version>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
- <groupId>selenium</groupId>
- <artifactId>selenium-server</artifactId>
- <version>0.8.1</version>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-server</artifactId>
+ <version>2.0a2</version>
</dependency>
+ <!-- Logging -->
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>1.4.5</version>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.2</version>
@@ -90,6 +89,7 @@
<version>1.2.15</version>
</dependency>
+ <!-- Tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
@@ -109,149 +109,177 @@
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Javassist -->
+ <dependency>
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
<version>3.1</version>
</dependency>
+ <!-- Eclipse -->
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>org.eclipse.jface</artifactId>
- <version>${eclipse.version}</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ <version>3.2.0-v20060605-1400</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>org.eclipse.jface.text</artifactId>
- <version>${eclipse.version}</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <version>3.5.0.v20090520</version>
<scope>provided</scope>
</dependency>
-
+
+ <!-- Eclipse Core -->
<dependency>
- <groupId>org.eclipse.text</groupId>
- <artifactId>org.eclipse.text</artifactId>
- <version>3.3.0</version>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
+ <version>3.2.1-R32x_v20060914</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.resources</artifactId>
- <version>3.3.0</version>
+ <artifactId>runtime</artifactId>
+ <version>3.2.0-v20060603</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.runtime</artifactId>
- <version>3.3.100</version>
+ <artifactId>expressions</artifactId>
+ <version>3.2.1-r321_v20060721</version>
<scope>provided</scope>
</dependency>
+ <!-- Eclipse JDT -->
<dependency>
<groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- <version>${eclipse.version}</version>
+ <artifactId>core</artifactId>
+ <version>3.3.0-v_771</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.launching</artifactId>
- <version>${eclipse.version}</version>
+ <artifactId>launching</artifactId>
+ <version>3.3.0-v20070510</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.ui</artifactId>
- <version>${eclipse.version}</version>
+ <artifactId>ui</artifactId>
+ <version>3.3.0-v20070607-0010</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
- <version>${eclipse.version}</version>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.3.0-v20070606-0010</version>
<scope>provided</scope>
</dependency>
-
+
+ <!-- Eclipse JFace -->
<dependency>
- <groupId>org.eclipse.ltk</groupId>
- <artifactId>org.eclipse.ltk.core.refactoring</artifactId>
- <version>${eclipse.version}</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>jface</artifactId>
+ <version>3.2.1-M20060908-1000</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${eclipse.version}</version>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>text</artifactId>
+ <version>3.3.0-v20070606-0010</version>
<scope>provided</scope>
</dependency>
-
+
+ <!-- Eclipse UI -->
<dependency>
<groupId>org.eclipse.ui</groupId>
- <artifactId>org.eclipse.ui.workbench</artifactId>
- <version>${eclipse.version}</version>
+ <artifactId>editors</artifactId>
+ <version>3.3.0-v20070606-0010</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.eclipse.ui</groupId>
- <artifactId>org.eclipse.ui.editors</artifactId>
- <version>${eclipse.version}</version>
+ <artifactId>views</artifactId>
+ <version>3.2.100-I20070319-0010</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.ui</groupId>
- <artifactId>org.eclipse.ui.views</artifactId>
- <version>3.2.101</version>
+ <artifactId>ide</artifactId>
+ <version>3.3.0-I20070620</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.ui</groupId>
- <artifactId>org.eclipse.ui.ide</artifactId>
- <version>${eclipse.version}</version>
+ <artifactId>workbench</artifactId>
+ <version>3.3.0-I20070608-1100</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ <version>3.3.0-v20070606-0010</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Eclipse Debug -->
<dependency>
<groupId>org.eclipse.debug</groupId>
- <artifactId>org.eclipse.debug.core</artifactId>
- <version>${eclipse.version}</version>
+ <artifactId>core</artifactId>
+ <version>3.3.0-v20070607-1800</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.debug</groupId>
- <artifactId>org.eclipse.debug.ui</artifactId>
- <version>${eclipse.version}</version>
+ <artifactId>ui</artifactId>
+ <version>3.3.0-v20070607-1800</version>
<scope>provided</scope>
</dependency>
-
+
+ <!-- Eclipse LTK -->
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.junit</artifactId>
- <version>${eclipse.version}</version>
+ <groupId>org.eclipse.ltk.core</groupId>
+ <artifactId>refactoring</artifactId>
+ <version>3.3.0-v20070606-0010</version>
<scope>provided</scope>
</dependency>
-
+
+ <!-- Eclipse Equinox -->
<dependency>
- <groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
- <version>${eclipse.version}</version>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ <version>3.3.0-v20070426</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>app</artifactId>
+ <version>1.0.0-v20070606</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <type>jar</type>
+ <groupId>org.eclipse</groupId>
+ <artifactId>swt</artifactId>
+ <version>3.3.0-v3346</version>
<scope>provided</scope>
</dependency>
</dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-03-02 22:40:41
|
Revision: 9
http://stump.svn.sourceforge.net/stump/?rev=9&view=rev
Author: rbaranga
Date: 2010-03-02 22:40:18 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
* removed empty package
* pom update
Modified Paths:
--------------
plugin/trunk/META-INF/MANIFEST.MF
plugin/trunk/pom.xml
Removed Paths:
-------------
plugin/trunk/src/main/java/junitx/
Modified: plugin/trunk/META-INF/MANIFEST.MF
===================================================================
--- plugin/trunk/META-INF/MANIFEST.MF 2010-02-28 22:51:38 UTC (rev 8)
+++ plugin/trunk/META-INF/MANIFEST.MF 2010-03-02 22:40:18 UTC (rev 9)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Wicket Stump Eclipse Plug-in
-Bundle-SymbolicName: WicketStump;singleton:=true
+Bundle-Name: Wicket Stump
+Bundle-SymbolicName: stump;singleton:=true
Bundle-Version: 0.1
Bundle-Activator: net.sf.stump.eclipse.WicketPlugin
Bundle-Localization: plugin
@@ -40,3 +40,26 @@
net.sf.stump.form,
net.sf.stump.runner,
net.sf.stump.util
+Bundle-ClassPath: .,
+ jmxtools-1.2.1.jar,
+ jmxri-1.2.1.jar,
+ activation-1.1.jar,
+ jms-1.1.jar,
+ mail-1.4.jar,
+ javassist-3.1.jar,
+ junit-4.4.jar,
+ junit-addons-1.4.jar,
+ log4j-1.2.15.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,
+ selenium-java-client-driver-0.8.1.jar,
+ selenium-server-0.8.1.jar,
+ xercesImpl-2.6.2.jar,
+ xmlParserAPIs-2.6.2.jar
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-02-28 22:51:38 UTC (rev 8)
+++ plugin/trunk/pom.xml 2010-03-02 22:40:18 UTC (rev 9)
@@ -21,7 +21,7 @@
<connection>
scm:https://stump.svn.sourceforge.net/svnroot/stump/
</connection>
- <developerConnection>${scm.connection}</developerConnection>
+ <developerConnection>${project.scm.connection}</developerConnection>
</scm>
<developers>
@@ -241,13 +241,6 @@
</dependency>
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- <version>${eclipse.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
<version>${eclipse.version}</version>
@@ -297,6 +290,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -304,35 +298,28 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
<configuration>
<classpathContainers>
- <java.lang.String>
- org.eclipse.jdt.launching.JRE_CONTAINER
- </java.lang.String>
- <java.lang.String>
- org.eclipse.pde.core.requiredPlugins
- </java.lang.String>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
</classpathContainers>
<projectnatures>
- <java.lang.String>
- org.eclipse.jdt.core.javanature
- </java.lang.String>
- <java.lang.String>
- org.eclipse.pde.PluginNature
- </java.lang.String>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</projectnatures>
<buildcommands>
- <java.lang.String>
- org.eclipse.jdt.core.javabuilder
- </java.lang.String>
- <java.lang.String>
- org.eclipse.pde.ManifestBuilder
- </java.lang.String>
- <java.lang.String>
- org.eclipse.pde.SchemaBuilder
- </java.lang.String>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
+ <buildcommand>org.maven.ide.eclipse.maven2Builder</buildcommand>
</buildcommands>
+ <pde>true</pde>
+ <downloadJavadocs>true</downloadJavadocs>
+ <downloadSources>true</downloadSources>
</configuration>
</plugin>
</plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-02-28 22:51:56
|
Revision: 8
http://stump.svn.sourceforge.net/stump/?rev=8&view=rev
Author: rbaranga
Date: 2010-02-28 22:51:38 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
* moved classes to available dependency
Modified Paths:
--------------
plugin/trunk/pom.xml
Removed Paths:
-------------
plugin/trunk/src/main/java/junitx/util/
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-02-28 22:15:45 UTC (rev 7)
+++ plugin/trunk/pom.xml 2010-02-28 22:51:38 UTC (rev 8)
@@ -39,8 +39,13 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
- <scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ <version>1.4</version>
+ </dependency>
<dependency>
<groupId>mocked</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-02-28 22:15:51
|
Revision: 7
http://stump.svn.sourceforge.net/stump/?rev=7&view=rev
Author: rbaranga
Date: 2010-02-28 22:15:45 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
* removed test-release
* added log4j config file
* some minor editing
Modified Paths:
--------------
plugin/trunk/plugin.xml
plugin/trunk/src/main/java/net/sf/stump/junit4/PreparePreview.java
plugin/trunk/src/main/java/net/sf/stump/runner/Launcher.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuildPathAssistantTest.java
update/site.xml
Added Paths:
-----------
plugin/trunk/src/main/resources/log4j.dtd
plugin/trunk/src/main/resources/log4j.xml
Removed Paths:
-------------
update/artifacts.jar
update/content.jar
update/features/stump_0.1.0.jar
update/plugins/WicketStump_0.1.0.jar
Modified: plugin/trunk/plugin.xml
===================================================================
--- plugin/trunk/plugin.xml 2010-02-28 15:47:26 UTC (rev 6)
+++ plugin/trunk/plugin.xml 2010-02-28 22:15:45 UTC (rev 7)
@@ -97,7 +97,7 @@
<extension point="org.eclipse.ui.views">
<category name="Wicket" id="stump"/>
<view
- name="Wicket Bench"
+ name="Wicket Stump"
icon="icons/wicket.gif"
category="stump"
class="net.sf.stump.eclipse.WicketPluginView"
@@ -289,7 +289,7 @@
</extension>
<extension point="org.eclipse.ui.commands">
- <category id="stump.keyCategory" name="Wicket Bench keys"/>
+ <category id="stump.keyCategory" name="Wicket Stump keys"/>
<command
id="stump.eclipse.editor.tabForward"
name="Forward tab"
@@ -329,6 +329,10 @@
sequence="M1+M2+M3+:"
commandId="stump.eclipse.editor.newPropertiesFile"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M3+M2+X W"
+ commandId="stump.eclipse.wicketShortcut"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
</extension>
<extension point="org.eclipse.ui.editorActions">
Modified: plugin/trunk/src/main/java/net/sf/stump/junit4/PreparePreview.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/junit4/PreparePreview.java 2010-02-28 15:47:26 UTC (rev 6)
+++ plugin/trunk/src/main/java/net/sf/stump/junit4/PreparePreview.java 2010-02-28 22:15:45 UTC (rev 7)
@@ -6,9 +6,9 @@
import java.lang.annotation.Target;
/**
- * When using an annotation-driven JUnit 4 test case to enable the Wicket Bench
+ * When using an annotation-driven JUnit 4 test case to enable the Wicket Stump
* preview launcher, place this annotation on a method which prepares Wicket
- * Bench with your component.
+ * Stump with your component.
*
* @author Paul Mogren
*/
Modified: plugin/trunk/src/main/java/net/sf/stump/runner/Launcher.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/runner/Launcher.java 2010-02-28 15:47:26 UTC (rev 6)
+++ plugin/trunk/src/main/java/net/sf/stump/runner/Launcher.java 2010-02-28 22:15:45 UTC (rev 7)
@@ -68,7 +68,7 @@
Filter filter = new Filter() {
@Override
public String describe() {
- return "Wicket Bench launch filter";
+ return "Wicket Stump launch filter";
}
@Override
public boolean shouldRun(Description description) {
Added: plugin/trunk/src/main/resources/log4j.dtd
===================================================================
--- plugin/trunk/src/main/resources/log4j.dtd (rev 0)
+++ plugin/trunk/src/main/resources/log4j.dtd 2010-02-28 22:15:45 UTC (rev 7)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
+ categoryFactory?)>
+
+<!-- The "threshold" attribute takes a level value such that all -->
+<!-- logging statements with a level equal or below this value are -->
+<!-- disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging -->
+<!-- statements. -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field -->
+<!-- keeps its old value. -->
+
+<!ATTLIST log4j:configuration
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ threshold (all|debug|info|warn|error|fatal|off|null) "null"
+ debug (true|false|null) "null"
+>
+
+<!-- renderer elements allow the user to customize the conversion of -->
+<!-- message objects to String. -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+ renderedClass CDATA #REQUIRED
+ renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+ name ID #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+ class CDATA #REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
+<!ATTLIST errorHandler
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+ ref IDREF #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+ class CDATA #IMPLIED
+ name CDATA #REQUIRED
+ additivity (true|false) "true"
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+ name ID #REQUIRED
+ additivity (true|false) "true"
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory
+ class CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+ ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!-- A logging event -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ version (1.1|1.2) "1.2"
+ includesLocationInfo (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+ log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+ logger CDATA #REQUIRED
+ level CDATA #REQUIRED
+ thread CDATA #REQUIRED
+ timestamp CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+ class CDATA #REQUIRED
+ method CDATA #REQUIRED
+ file CDATA #REQUIRED
+ line CDATA #REQUIRED
+>
Added: plugin/trunk/src/main/resources/log4j.xml
===================================================================
--- plugin/trunk/src/main/resources/log4j.xml (rev 0)
+++ plugin/trunk/src/main/resources/log4j.xml 2010-02-28 22:15:45 UTC (rev 7)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration debug="false"
+ xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="DEBUG" />
+ <param name="Target" value="System.out" />
+ <layout class="org.apache.log4j.PatternLayout" />
+ </appender>
+
+ <logger name="net.sf.stump">
+ <level value="DEBUG"></level>
+ </logger>
+
+ <root>
+ <param name="Level" value="WARN" />
+ <appender-ref ref="CONSOLE" />
+ </root>
+</log4j:configuration>
\ No newline at end of file
Modified: plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuildPathAssistantTest.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuildPathAssistantTest.java 2010-02-28 15:47:26 UTC (rev 6)
+++ plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuildPathAssistantTest.java 2010-02-28 22:15:45 UTC (rev 7)
@@ -36,10 +36,11 @@
assistant.setJarListProvider(new JarListProvider() {
public List<String> getJarNames() {
List<String> jarNames = new ArrayList<String>();
- jarNames.add("wicket-1.2-20060227-0200.jar");
- jarNames.add("log4j-1.2.12.jar");
- jarNames.add("wicket-bench-0.2.6.jar");
- jarNames.add("selenium-0.6.0.jar");
+ // TODO: generate dinamicly
+ jarNames.add("wicket-1.4.5.jar");
+ jarNames.add("log4j-1.2.15.jar");
+ jarNames.add("stump-0.1.jar");
+ jarNames.add("selenium-server-0.8.1.jar");
jarNames.add("jetty-5.1.10.jar");
jarNames.add("junit-4.4.jar");
return jarNames;
@@ -58,12 +59,13 @@
public void testGetAllJars() throws Exception {
List<String> allJars = assistant.getAllJars();
List<String> expected = new ArrayList<String>();
- expected.add("wicket-1.2-20060227-0200.jar");
- expected.add("log4j-1.2.12.jar");
- expected.add("wicket-bench-0.2.6.jar");
- expected.add("selenium-0.6.0.jar");
+ expected.add("wicket-1.4.5.jar");
+ expected.add("log4j-1.2.15.jar");
+ expected.add("stump-0.1.jar");
+ expected.add("selenium-server-0.8.1.jar");
expected.add("jetty-5.1.10.jar");
expected.add("junit-4.4.jar");
+
assertEquals(expected, allJars);
}
Deleted: update/artifacts.jar
===================================================================
(Binary files differ)
Deleted: update/content.jar
===================================================================
(Binary files differ)
Deleted: update/features/stump_0.1.0.jar
===================================================================
(Binary files differ)
Deleted: update/plugins/WicketStump_0.1.0.jar
===================================================================
(Binary files differ)
Modified: update/site.xml
===================================================================
--- update/site.xml 2010-02-28 15:47:26 UTC (rev 6)
+++ update/site.xml 2010-02-28 22:15:45 UTC (rev 7)
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/stump_0.1.0.jar" id="stump" version="0.1"/>
</site>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-02-28 15:47:34
|
Revision: 6
http://stump.svn.sourceforge.net/stump/?rev=6&view=rev
Author: rbaranga
Date: 2010-02-28 15:47:26 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
* removed unused dir
* fixed classes in plugin.xml
Modified Paths:
--------------
plugin/trunk/plugin.xml
Removed Paths:
-------------
plugin/trunk/wicket-stump-feature/
Modified: plugin/trunk/plugin.xml
===================================================================
--- plugin/trunk/plugin.xml 2010-02-28 15:04:14 UTC (rev 5)
+++ plugin/trunk/plugin.xml 2010-02-28 15:47:26 UTC (rev 6)
@@ -12,7 +12,7 @@
name="%NewWizard.name"
icon="icons/wicket.gif"
category="stump.eclipse.new"
- class="stump.eclipse.wizard.NewWicketProjectWizard"
+ class="net.sf.stump.eclipse.wizard.NewWicketProjectWizard"
project="true"
id="stump.eclipse.new.project">
<description>%NewWizard.desc</description>
@@ -22,7 +22,7 @@
name="%NewPanelWizard.name"
icon="icons/wicket.gif"
category="stump.eclipse.new"
- class="stump.eclipse.wizard.NewWicketPanelWizard"
+ class="net.sf.stump.eclipse.wizard.NewWicketPanelWizard"
id="stump.eclipse.new.panel">
<description>%NewPanelWizard.desc</description>
</wizard>
@@ -30,7 +30,7 @@
name="%NewWebPageWizard.name"
icon="icons/wicket.gif"
category="stump.eclipse.new"
- class="stump.eclipse.wizard.NewWebPageWizard"
+ class="net.sf.stump.eclipse.wizard.NewWebPageWizard"
id="stump.eclipse.new.webPage">
<description>%NewWebPageWizard.desc</description>
</wizard>
@@ -42,14 +42,14 @@
name="%WicketPropertyPage.name"
objectClass="org.eclipse.core.resources.IProject"
adaptable="true"
- class="stump.eclipse.configuration.ProjectPropertiesPage">
+ class="net.sf.stump.eclipse.configuration.ProjectPropertiesPage">
<filter name="nature" value="org.eclipse.jdt.core.javanature"></filter>
</page>
</extension>
<extension point="org.eclipse.core.resources.natures" id="wicketnature" name="Wicket Nature">
<runtime>
- <run class="stump.eclipse.metadata.WicketNature"/>
+ <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"/>
@@ -57,7 +57,7 @@
<extension id="associatedMarkupAuditor" name="Wicket associated markup auditor" point="org.eclipse.core.resources.builders">
<builder>
- <run class="stump.eclipse.editor.AssociatedMarkupAuditor"/>
+ <run class="net.sf.stump.eclipse.editor.AssociatedMarkupAuditor"/>
</builder>
</extension>
@@ -76,13 +76,13 @@
<extension point="org.eclipse.ui.ide.markerResolution">
<markerResolutionGenerator
markerType="stump.associatedMarkupAuditorMarkerNoHtml"
- class="stump.eclipse.editor.CreateHtmlTemplateQuickFixGenerator">
+ class="net.sf.stump.eclipse.editor.CreateHtmlTemplateQuickFixGenerator">
</markerResolutionGenerator>
</extension>
<extension point="org.eclipse.jdt.ui.quickFixProcessors">
<quickFixProcessor
- class="stump.eclipse.editor.ProblemCorrectionQuickFixProcessor"
+ class="net.sf.stump.eclipse.editor.ProblemCorrectionQuickFixProcessor"
id="stump.eclipse.editor.ProblemCorrectionQuickFixProcessor">
</quickFixProcessor>
</extension>
@@ -90,7 +90,7 @@
<extension point="org.eclipse.jdt.core.classpathVariableInitializer">
<classpathVariableInitializer
variable="WICKET_HOME"
- class="stump.eclipse.configuration.WicketHomeInitializer">
+ class="net.sf.stump.eclipse.configuration.WicketHomeInitializer">
</classpathVariableInitializer>
</extension>
@@ -100,7 +100,7 @@
name="Wicket Bench"
icon="icons/wicket.gif"
category="stump"
- class="stump.eclipse.WicketPluginView"
+ class="net.sf.stump.eclipse.WicketPluginView"
id="stump.eclipse.WicketPluginView">
</view>
</extension>
@@ -123,7 +123,7 @@
label="%WicketShortcut.label"
icon="icons/wicket.gif"
helpContextId="org.eclipse.jdt.junit.launch_shortcut"
- class="stump.eclipse.launcher.WicketLaunchShortcut"
+ class="net.sf.stump.eclipse.launcher.WicketLaunchShortcut"
modes="run, debug"
id="stump.eclipse.wicketShortcut">
<contextualLaunch>
@@ -151,13 +151,13 @@
<extension point="org.eclipse.ui.preferencePages">
<page
name="Wicket"
- class="stump.eclipse.configuration.WicketBasePreferencePage"
+ class="net.sf.stump.eclipse.configuration.WicketBasePreferencePage"
id="stump.eclipse.preferences">
</page>
<page
name="Templates"
category="stump.eclipse.preferences"
- class="stump.eclipse.template.WicketTemplatePreferencePage"
+ class="net.sf.stump.eclipse.template.WicketTemplatePreferencePage"
id="stump.eclipse.preferences.templates">
</page>
</extension>
@@ -165,7 +165,7 @@
<extension point="org.eclipse.ui.editors.templates">
<contextType
name="wicket"
- class="stump.eclipse.template.WicketProjectContextType"
+ class="net.sf.stump.eclipse.template.WicketProjectContextType"
id="stump.eclipse.templates.project">
</contextType>
<include file="templates/web.xml"></include>
@@ -175,7 +175,7 @@
<extension point="org.eclipse.ui.editors.templates">
<contextType
name="wicket"
- class="stump.eclipse.template.WicketClassContextType"
+ class="net.sf.stump.eclipse.template.WicketClassContextType"
id="stump.eclipse.templates.class">
</contextType>
<include file="templates/panel.xml"></include>
@@ -190,15 +190,15 @@
id="stump.eclipse.editor"
name="Wicket Editor"
icon="icons/javaclass.gif"
- class="stump.eclipse.editor.WicketEditor"
- contributorClass="stump.eclipse.editor.WicketEditorActionContributor"
+ class="net.sf.stump.eclipse.editor.WicketEditor"
+ contributorClass="net.sf.stump.eclipse.editor.WicketEditorActionContributor"
extensions="java">
</editor>
<editor
id="stump.eclipse.editorLauncher"
name="Wicket Editor Launcher (configure this as default editor)"
icon="icons/javaclass.gif"
- launcher="stump.eclipse.editor.WicketEditorLauncher"
+ launcher="net.sf.stump.eclipse.editor.WicketEditorLauncher"
extensions="java">
</editor>
</extension>
@@ -240,7 +240,7 @@
id="stump.eclipse.editor.preview"
targetID="stump.eclipse.editor">
<action
- class="stump.eclipse.editor.CssEnablement"
+ class="net.sf.stump.eclipse.editor.CssEnablement"
icon="icons/css_attach.gif"
id="stump.eclipse.editor.CssEnablement"
label="CSS"
@@ -249,7 +249,7 @@
toolbarPath="Normal/additions"
tooltip="Inline CSS files in HTML preview"/>
<action
- class="stump.eclipse.editor.ImageRelocation"
+ class="net.sf.stump.eclipse.editor.ImageRelocation"
icon="icons/image_reloc.gif"
id="stump.eclipse.editor.ImageRelocation"
label="Image"
@@ -258,7 +258,7 @@
toolbarPath="Normal/additions"
tooltip="Relocate images in HTML preview"/>
<action
- class="stump.eclipse.editor.WicketPreview"
+ class="net.sf.stump.eclipse.editor.WicketPreview"
icon="icons/wicket_preview.gif"
id="stump.eclipse.editor.WicketPreview"
label="WicketPreview"
@@ -273,7 +273,7 @@
<renameParticipant
id="stump.eclipse.refactoring.RenameTypeParticipant"
name="stump.eclipse.refactoring.RenameTypeParticipant"
- class="stump.eclipse.refactoring.RenameTypeParticipant">
+ class="net.sf.stump.eclipse.refactoring.RenameTypeParticipant">
<enablement>
<with variable="affectedNatures">
@@ -335,22 +335,22 @@
<editorContribution
id="stump.eclipse.editorContribution" targetID="stump.eclipse.editor">
<action
- class="stump.eclipse.editor.TabForwardActionDelegate"
+ class="net.sf.stump.eclipse.editor.TabForwardActionDelegate"
id="stump.eclipse.editor.tabForward"
label="forward"
definitionId="stump.eclipse.editor.tabForward"/>
<action
- class="stump.eclipse.editor.TabBackwardActionDelegate"
+ class="net.sf.stump.eclipse.editor.TabBackwardActionDelegate"
id="stump.eclipse.editor.tabBackward"
label="backward"
definitionId="stump.eclipse.editor.tabBackward"/>
<action
- class="stump.eclipse.editor.NewHtmlFileActionDelegate"
+ class="net.sf.stump.eclipse.editor.NewHtmlFileActionDelegate"
id="stump.eclipse.editor.newHtmlFile"
label="new html file"
definitionId="stump.eclipse.editor.newHtmlFile"/>
<action
- class="stump.eclipse.editor.NewPropertiesFileActionDelegate"
+ class="net.sf.stump.eclipse.editor.NewPropertiesFileActionDelegate"
id="stump.eclipse.editor.newPropertiesFile"
label="new properties file"
definitionId="stump.eclipse.editor.newPropertiesFile"/>
@@ -359,12 +359,12 @@
<extension point="org.eclipse.ui.popupMenus">
<objectContribution
- id="stump.eclipse.form.FormGeneration"
+ id="net.sf.stump.eclipse.form.FormGeneration"
adaptable="true"
nameFilter="*.html"
objectClass="org.eclipse.core.resources.IFile">
<action
- class="stump.eclipse.form.FormGenerationActionDelegate"
+ class="net.sf.stump.eclipse.form.FormGenerationActionDelegate"
id="stump.eclipse.form.FormGenerationActionDelegate"
menubarPath="additions"
enablesFor="1"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-02-28 15:04:24
|
Revision: 5
http://stump.svn.sourceforge.net/stump/?rev=5&view=rev
Author: rbaranga
Date: 2010-02-28 15:04:14 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
* removed generated site
Removed Paths:
-------------
update/index.html
update/web/
Deleted: update/index.html
===================================================================
--- update/index.html 2010-02-28 14:55:14 UTC (rev 4)
+++ update/index.html 2010-02-28 15:04:14 UTC (rev 5)
@@ -1,60 +0,0 @@
-<html>
-<head>
-<title>wicket-stump-update</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<style>@import url("web/site.css");</style>
-<script type="text/javascript">
- var returnval = 0;
- var stylesheet, xmlFile, cache, doc;
- function init(){
- // NSCP 7.1+ / Mozilla 1.4.1+ / Safari
- // Use the standard DOM Level 2 technique, if it is supported
- if (document.implementation && document.implementation.createDocument) {
- xmlFile = document.implementation.createDocument("", "", null);
- stylesheet = document.implementation.createDocument("", "", null);
- if (xmlFile.load){
- xmlFile.load("site.xml");
- stylesheet.load("web/site.xsl");
- } else {
- alert("Document could not be loaded by browser.");
- }
- xmlFile.addEventListener("load", transform, false);
- stylesheet.addEventListener("load", transform, false);
- }
- //IE 6.0+ solution
- else if (window.ActiveXObject) {
- xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
- xmlFile.async = false;
- xmlFile.load("site.xml");
- stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
- stylesheet.async = false;
- stylesheet.load("web/site.xsl");
- cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
- cache.stylesheet = stylesheet;
- transformData();
- }
- }
- // separate transformation function for IE 6.0+
- function transformData(){
- var processor = cache.createProcessor();
- processor.input = xmlFile;
- processor.transform();
- data.innerHTML = processor.output;
- }
- // separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+
- function transform(){
- returnval+=1;
- if (returnval==2){
- var processor = new XSLTProcessor();
- processor.importStylesheet(stylesheet);
- doc = processor.transformToDocument(xmlFile);
- document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
- }
- }
-</script>
-</head>
-<body onload="init();">
-<!--[insert static HTML here]-->
-<div id="data"><!-- this is where the transformed data goes --></div>
-</body>
-</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-02-28 14:55:29
|
Revision: 4
http://stump.svn.sourceforge.net/stump/?rev=4&view=rev
Author: rbaranga
Date: 2010-02-28 14:55:14 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
* format plugin
* added feature & update site
Modified Paths:
--------------
plugin/trunk/pom.xml
plugin/trunk/src/main/java/net/sf/stump/web/HomePage.html
plugin/trunk/src/main/resources/templates/applicationClass.xml
plugin/trunk/src/main/resources/templates/form.xml
plugin/trunk/src/main/resources/templates/panel.xml
plugin/trunk/src/main/resources/templates/panel_html.xml
plugin/trunk/src/main/resources/templates/web.xml
plugin/trunk/src/main/resources/templates/web_page.xml
plugin/trunk/src/main/resources/templates/web_page_html.xml
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/PreviewParserTest.java
Added Paths:
-----------
feature/
feature/.project
feature/build.properties
feature/feature.xml
update/
update/.project
update/artifacts.jar
update/content.jar
update/features/
update/features/stump_0.1.0.jar
update/index.html
update/plugins/
update/plugins/WicketStump_0.1.0.jar
update/site.xml
update/web/
update/web/site.css
update/web/site.xsl
Added: feature/.project
===================================================================
--- feature/.project (rev 0)
+++ feature/.project 2010-02-28 14:55:14 UTC (rev 4)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>wicket-stump-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Added: feature/build.properties
===================================================================
--- feature/build.properties (rev 0)
+++ feature/build.properties 2010-02-28 14:55:14 UTC (rev 4)
@@ -0,0 +1 @@
+bin.includes = feature.xml
Added: feature/feature.xml
===================================================================
--- feature/feature.xml (rev 0)
+++ feature/feature.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="stump"
+ label="Wicket Stump"
+ version="0.1">
+
+ <plugin
+ id="WicketStump"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/pom.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -4,7 +4,7 @@
<groupId>net.sf</groupId>
<artifactId>stump</artifactId>
- <version>0.6</version>
+ <version>0.1</version>
<name>Wicket Stump</name>
<description>Wicket Stump Eclipse plugin</description>
Modified: plugin/trunk/src/main/java/net/sf/stump/web/HomePage.html
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/web/HomePage.html 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/src/main/java/net/sf/stump/web/HomePage.html 2010-02-28 14:55:14 UTC (rev 4)
@@ -1,13 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" wicket="http://www.wicketframework.org/">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ wicket="http://www.wicketframework.org/">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head>
<body>
-
+
<span wicket:id="component" />
</body>
Modified: plugin/trunk/src/main/resources/templates/applicationClass.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/applicationClass.xml 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/src/main/resources/templates/applicationClass.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template
- context="stump.eclipse.templates.project"
- description="Wicket application class"
- id="stump.eclipse.applicationClass"
- name="wicket.applicationClass"><![CDATA[package ${applicationClassPackageName};
+ <template context="stump.eclipse.templates.project"
+ description="Wicket application class" id="stump.eclipse.applicationClass"
+ name="wicket.applicationClass"><![CDATA[package ${applicationClassPackageName};
import org.apache.wicket.protocol.http.WebApplication;
@@ -21,5 +19,5 @@
}
}]]>
- </template>
+ </template>
</templates>
\ No newline at end of file
Modified: plugin/trunk/src/main/resources/templates/form.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/form.xml 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/src/main/resources/templates/form.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template
- context="stump.eclipse.templates.class"
- description="Wicket form class"
- id="stump.eclipse.formClass"
- name="wicket.formClass"><![CDATA[
+ <template context="stump.eclipse.templates.class" description="Wicket form class"
+ id="stump.eclipse.formClass" name="wicket.formClass"><![CDATA[
class ${classShortName} extends Form {
public ${classShortName}(String id, IModel model) {
super(id, model);
@@ -16,5 +13,5 @@
protected void onSubmit() {
}
}]]>
- </template>
+ </template>
</templates>
Modified: plugin/trunk/src/main/resources/templates/panel.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/panel.xml 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/src/main/resources/templates/panel.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template
- context="stump.eclipse.templates.class"
- description="Wicket panel class"
- id="stump.eclipse.panelClass"
- name="wicket.panelClass"><![CDATA[package ${packageName};
+ <template context="stump.eclipse.templates.class" description="Wicket panel class"
+ id="stump.eclipse.panelClass" name="wicket.panelClass"><![CDATA[package ${packageName};
import org.apache.wicket.markup.html.panel.Panel;
@@ -18,5 +15,5 @@
${cursor}
}
}]]>
-</template>
+ </template>
</templates>
\ No newline at end of file
Modified: plugin/trunk/src/main/resources/templates/panel_html.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/panel_html.xml 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/src/main/resources/templates/panel_html.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template
- context="stump.eclipse.templates.class"
- description="Wicket panel HTML"
- id="stump.eclipse.panelHtml"
- name="wicket.panelHtml"><![CDATA[<html xmlns:wicket>
+ <template context="stump.eclipse.templates.class" description="Wicket panel HTML"
+ id="stump.eclipse.panelHtml" name="wicket.panelHtml"><![CDATA[<html xmlns:wicket>
<wicket:panel>
${cursor}
</wicket:panel>
</html>]]>
- </template>
+ </template>
</templates>
\ No newline at end of file
Modified: plugin/trunk/src/main/resources/templates/web.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/web.xml 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/src/main/resources/templates/web.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template
- context="stump.eclipse.templates.project"
- description="web.xml"
- id="stump.eclipse.web.xml"
- name="wicket.web.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ <template context="stump.eclipse.templates.project"
+ description="web.xml" id="stump.eclipse.web.xml" name="wicket.web.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
@@ -28,5 +25,5 @@
</filter-mapping>
</web-app>]]>
- </template>
+ </template>
</templates>
\ No newline at end of file
Modified: plugin/trunk/src/main/resources/templates/web_page.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/web_page.xml 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/src/main/resources/templates/web_page.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template
- context="stump.eclipse.templates.class"
- description="Wicket web page class"
- id="stump.eclipse.webPageClass"
- name="wicket.webPageClass"><![CDATA[package ${packageName};
+ <template context="stump.eclipse.templates.class" description="Wicket web page class"
+ id="stump.eclipse.webPageClass" name="wicket.webPageClass"><![CDATA[package ${packageName};
import org.apache.wicket.markup.html.WebPage;
@@ -17,5 +14,5 @@
${cursor}
}
}]]>
-</template>
+ </template>
</templates>
\ No newline at end of file
Modified: plugin/trunk/src/main/resources/templates/web_page_html.xml
===================================================================
--- plugin/trunk/src/main/resources/templates/web_page_html.xml 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/src/main/resources/templates/web_page_html.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates>
- <template
- context="stump.eclipse.templates.class"
- description="Wicket web page HTML"
- id="stump.eclipse.webPageHtml"
- name="wicket.webPageHtml"><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ <template context="stump.eclipse.templates.class" description="Wicket web page HTML"
+ id="stump.eclipse.webPageHtml" name="wicket.webPageHtml"><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,5 +11,5 @@
</body>
</html>
]]>
-</template>
+ </template>
</templates>
\ No newline at end of file
Modified: plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/PreviewParserTest.java
===================================================================
--- plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/PreviewParserTest.java 2010-02-28 14:45:35 UTC (rev 3)
+++ plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/PreviewParserTest.java 2010-02-28 14:55:14 UTC (rev 4)
@@ -60,6 +60,6 @@
metadata.setContextRoot(".");
String html = new PreviewParser(new FileStub("sub/Panel1.html"), metadata).parse(
new PreviewConfiguration().setInlineCss(false).setWicketPreview(false).setRelocate(false));
- assertEquals("Hello <wicket:container wicket:preview=\"Panel2.html\" wicket:id=\"panel\"/>", html);
+ assertEquals("Hello <wicket:container wicket:id=\"panel\" wicket:preview=\"Panel2.html\"/>", html);
}
}
Added: update/.project
===================================================================
--- update/.project (rev 0)
+++ update/.project 2010-02-28 14:55:14 UTC (rev 4)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>wicket-stump-update</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.UpdateSiteBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.UpdateSiteNature</nature>
+ </natures>
+</projectDescription>
Added: update/artifacts.jar
===================================================================
(Binary files differ)
Property changes on: update/artifacts.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/content.jar
===================================================================
(Binary files differ)
Property changes on: update/content.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/features/stump_0.1.0.jar
===================================================================
(Binary files differ)
Property changes on: update/features/stump_0.1.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/index.html
===================================================================
--- update/index.html (rev 0)
+++ update/index.html 2010-02-28 14:55:14 UTC (rev 4)
@@ -0,0 +1,60 @@
+<html>
+<head>
+<title>wicket-stump-update</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style>@import url("web/site.css");</style>
+<script type="text/javascript">
+ var returnval = 0;
+ var stylesheet, xmlFile, cache, doc;
+ function init(){
+ // NSCP 7.1+ / Mozilla 1.4.1+ / Safari
+ // Use the standard DOM Level 2 technique, if it is supported
+ if (document.implementation && document.implementation.createDocument) {
+ xmlFile = document.implementation.createDocument("", "", null);
+ stylesheet = document.implementation.createDocument("", "", null);
+ if (xmlFile.load){
+ xmlFile.load("site.xml");
+ stylesheet.load("web/site.xsl");
+ } else {
+ alert("Document could not be loaded by browser.");
+ }
+ xmlFile.addEventListener("load", transform, false);
+ stylesheet.addEventListener("load", transform, false);
+ }
+ //IE 6.0+ solution
+ else if (window.ActiveXObject) {
+ xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
+ xmlFile.async = false;
+ xmlFile.load("site.xml");
+ stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
+ stylesheet.async = false;
+ stylesheet.load("web/site.xsl");
+ cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
+ cache.stylesheet = stylesheet;
+ transformData();
+ }
+ }
+ // separate transformation function for IE 6.0+
+ function transformData(){
+ var processor = cache.createProcessor();
+ processor.input = xmlFile;
+ processor.transform();
+ data.innerHTML = processor.output;
+ }
+ // separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+
+ function transform(){
+ returnval+=1;
+ if (returnval==2){
+ var processor = new XSLTProcessor();
+ processor.importStylesheet(stylesheet);
+ doc = processor.transformToDocument(xmlFile);
+ document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
+ }
+ }
+</script>
+</head>
+<body onload="init();">
+<!--[insert static HTML here]-->
+<div id="data"><!-- this is where the transformed data goes --></div>
+</body>
+</html>
Added: update/plugins/WicketStump_0.1.0.jar
===================================================================
(Binary files differ)
Property changes on: update/plugins/WicketStump_0.1.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: update/site.xml
===================================================================
--- update/site.xml (rev 0)
+++ update/site.xml 2010-02-28 14:55:14 UTC (rev 4)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/stump_0.1.0.jar" id="stump" version="0.1"/>
+</site>
Added: update/web/site.css
===================================================================
--- update/web/site.css (rev 0)
+++ update/web/site.css 2010-02-28 14:55:14 UTC (rev 4)
@@ -0,0 +1,12 @@
+<STYLE type="text/css">
+td.spacer {padding-bottom: 10px; padding-top: 10px;}
+.title { font-family: sans-serif; color: #99AACC;}
+.bodyText { font-family: sans-serif; font-size: 9pt; color:#000000; }
+.sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;}
+.log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;}
+.big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;}
+.light-row {background:#FFFFFF}
+.dark-row {background:#EEEEFF}
+.header {background:#99AADD}
+#indent {word-wrap : break-word;width :300px;text-indent:10px;}
+</STYLE>
Added: update/web/site.xsl
===================================================================
--- update/web/site.xsl (rev 0)
+++ update/web/site.xsl 2010-02-28 14:55:14 UTC (rev 4)
@@ -0,0 +1,214 @@
+<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt">
+<xsl:output method="html" encoding="UTF-8"/>
+<xsl:key name="cat" match="category" use="@name"/>
+<xsl:template match="/">
+<xsl:for-each select="site">
+ <html>
+ <head>
+ <title>wicket-stump-update</title>
+ <style>@import url("web/site.css");</style>
+ </head>
+ <body>
+ <h1 class="title">wicket-stump-update</h1>
+ <p class="bodyText"><xsl:value-of select="description"/></p>
+ <table width="100%" border="0" cellspacing="1" cellpadding="2">
+ <xsl:for-each select="category-def">
+ <xsl:sort select="@label" order="ascending" case-order="upper-first"/>
+ <xsl:sort select="@name" order="ascending" case-order="upper-first"/>
+ <xsl:if test="count(key('cat',@name)) != 0">
+ <tr class="header">
+ <td class="sub-header" width="30%">
+ <xsl:value-of select="@name"/>
+ </td>
+ <td class="sub-header" width="70%">
+ <xsl:value-of select="@label"/>
+ </td>
+ </tr>
+ <xsl:for-each select="key('cat',@name)">
+ <xsl:sort select="ancestor::feature//@version" order="ascending"/>
+ <xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/>
+ <tr>
+ <xsl:choose>
+ <xsl:when test="(position() mod 2 = 1)">
+ <xsl:attribute name="class">dark-row</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="class">light-row</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ <td class="log-text" id="indent">
+ <xsl:choose>
+ <xsl:when test="ancestor::feature//@label">
+ <a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a>
+ <br/>
+ <div id="indent">
+ (<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>)
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a>
+ </xsl:otherwise>
+ </xsl:choose>
+ <br />
+ </td>
+ <td>
+ <table>
+ <xsl:if test="ancestor::feature//@os">
+ <tr><td class="log-text" id="indent">Operating Systems:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="ancestor::feature//@ws">
+ <tr><td class="log-text" id="indent">Windows Systems:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="ancestor::feature//@nl">
+ <tr><td class="log-text" id="indent">Languages:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="ancestor::feature//@arch">
+ <tr><td class="log-text" id="indent">Architecture:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td>
+ </tr>
+ </xsl:if>
+ </table>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:if test="count(feature) > count(feature/category)">
+ <tr class="header">
+ <td class="sub-header" colspan="2">
+ Uncategorized
+ </td>
+ </tr>
+ </xsl:if>
+ <xsl:choose>
+ <xsl:when test="function-available('msxsl:node-set')">
+ <xsl:variable name="rtf-nodes">
+ <xsl:for-each select="feature[not(category)]">
+ <xsl:sort select="@id" order="ascending" case-order="upper-first"/>
+ <xsl:sort select="@version" order="ascending" />
+ <xsl:value-of select="."/>
+ <xsl:copy-of select="." />
+ </xsl:for-each>
+ </xsl:variable>
+ <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/>
+ <xsl:for-each select="$myNodeSet">
+ <tr>
+ <xsl:choose>
+ <xsl:when test="position() mod 2 = 1">
+ <xsl:attribute name="class">dark-row</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="class">light-row</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ <td class="log-text" id="indent">
+ <xsl:choose>
+ <xsl:when test="@label">
+ <a href="{@url}"><xsl:value-of select="@label"/></a>
+ <br />
+ <div id="indent">
+ (<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
+ </xsl:otherwise>
+ </xsl:choose>
+ <br /><br />
+ </td>
+ <td>
+ <table>
+ <xsl:if test="@os">
+ <tr><td class="log-text" id="indent">Operating Systems:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="@ws">
+ <tr><td class="log-text" id="indent">Windows Systems:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="@nl">
+ <tr><td class="log-text" id="indent">Languages:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="@arch">
+ <tr><td class="log-text" id="indent">Architecture:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
+ </tr>
+ </xsl:if>
+ </table>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="feature[not(category)]">
+ <xsl:sort select="@id" order="ascending" case-order="upper-first"/>
+ <xsl:sort select="@version" order="ascending" />
+ <tr>
+ <xsl:choose>
+ <xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
+ <xsl:attribute name="class">dark-row</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="class">light-row</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ <td class="log-text" id="indent">
+ <xsl:choose>
+ <xsl:when test="@label">
+ <a href="{@url}"><xsl:value-of select="@label"/></a>
+ <br />
+ <div id="indent">
+ (<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
+ </xsl:otherwise>
+ </xsl:choose>
+ <br /><br />
+ </td>
+ <td>
+ <table>
+ <xsl:if test="@os">
+ <tr><td class="log-text" id="indent">Operating Systems:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="@ws">
+ <tr><td class="log-text" id="indent">Windows Systems:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="@nl">
+ <tr><td class="log-text" id="indent">Languages:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:if test="@arch">
+ <tr><td class="log-text" id="indent">Architecture:</td>
+ <td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
+ </tr>
+ </xsl:if>
+ </table>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+ </table>
+ </body>
+ </html>
+</xsl:for-each>
+</xsl:template>
+</xsl:stylesheet>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-02-28 14:45:43
|
Revision: 3
http://stump.svn.sourceforge.net/stump/?rev=3&view=rev
Author: rbaranga
Date: 2010-02-28 14:45:35 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
Added Paths:
-----------
plugin/trunk/wicket-stump-feature/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-02-01 16:36:54
|
Revision: 2
http://stump.svn.sourceforge.net/stump/?rev=2&view=rev
Author: rbaranga
Date: 2010-02-01 16:36:41 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
* search all resources under right package structure for html/css /etc..
* renamed artifact
Modified Paths:
--------------
plugin/trunk/pom.xml
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java
Modified: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml 2010-01-28 20:25:22 UTC (rev 1)
+++ plugin/trunk/pom.xml 2010-02-01 16:36:41 UTC (rev 2)
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>net.sf.stump</groupId>
- <artifactId>plugin</artifactId>
+ <groupId>net.sf</groupId>
+ <artifactId>stump</artifactId>
<version>0.6</version>
<name>Wicket Stump</name>
Modified: plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java
===================================================================
--- plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java 2010-01-28 20:25:22 UTC (rev 1)
+++ plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java 2010-02-01 16:36:41 UTC (rev 2)
@@ -13,6 +13,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
@@ -39,484 +40,535 @@
import org.eclipse.ui.texteditor.ITextEditorExtension3;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
/**
* @author Joni Freeman
* @author Igor Vaynberg
*/
-public class WicketEditor extends MultiPageEditorPart implements EditorProvider,
- EditorManagerListener, ITextEditor, ITextEditorExtension, ITextEditorExtension2,
- ITextEditorExtension3, INavigationLocationProvider {
+public class WicketEditor extends MultiPageEditorPart implements
+ EditorProvider, EditorManagerListener, ITextEditor,
+ ITextEditorExtension, ITextEditorExtension2, ITextEditorExtension3,
+ INavigationLocationProvider {
- public static final String ID = "stump.eclipse.editor";
- private IType type;
- private WicketEditorManager editorManager = new WicketEditorManager(this, this);
- private MultiContentOutlinePage outlinePage;
- private ComponentTree componentTree;
+ public static final String ID = "stump.eclipse.editor";
+ private IType type;
+ private WicketEditorManager editorManager = new WicketEditorManager(this,
+ this);
+ private MultiContentOutlinePage outlinePage;
+ private ComponentTree componentTree;
- public WicketEditor() {
- ResourcesPlugin.getWorkspace().addResourceChangeListener(editorManager);
- }
-
- @Override
- protected IEditorSite createSite(IEditorPart editor) {
- return new WicketEditorSite(this, editor);
- }
+ public WicketEditor() {
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(editorManager);
+ }
- @Override
- public void dispose() {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(editorManager);
- if (componentTree != null) {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(componentTree);
- }
- outlinePage.dispose();
- super.dispose();
- }
+ @Override
+ protected IEditorSite createSite(final IEditorPart editor) {
+ return new WicketEditorSite(this, editor);
+ }
- @Override
- protected void createPages() {
- addEditors();
- setActivePage(0);
- updatePartName();
- }
+ @Override
+ public void dispose() {
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(
+ editorManager);
+ if (componentTree != null) {
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(
+ componentTree);
+ }
+ outlinePage.dispose();
+ super.dispose();
+ }
- @Override
- public void init(IEditorSite site, IEditorInput input) throws PartInitException {
- super.init(site, input);
- IFileEditorInput classFile = (IFileEditorInput) input;
+ @Override
+ protected void createPages() {
+ addEditors();
+ setActivePage(0);
+ updatePartName();
+ }
- ICompilationUnit unit = (ICompilationUnit) JavaCore.create(classFile.getFile());
- type = unit.getType(new JavaProjectHelper().getSimpleTypeName(input));
-
- // TODO review for possible solution?
- // this causes problems when using eclipse quick fixes. for example
- // creating a new method will fail because the editor is opened, then
- // closed and when the new java editor is opened it doesnt know about
- // the quickfix.
- // openWithDefaultJavaEditorIfNotPanel(input);
- }
+ @Override
+ public void init(final IEditorSite site, final IEditorInput input)
+ throws PartInitException {
+ super.init(site, input);
+ final IFileEditorInput classFile = (IFileEditorInput) input;
- public IType getJavaType() {
- ICompilationUnit unit = (ICompilationUnit) JavaCore.create(((IFileEditorInput) getEditorInput()).getFile());
- return unit.getType(new JavaProjectHelper().getSimpleTypeName(getEditorInput()));
- }
+ final ICompilationUnit unit = (ICompilationUnit) JavaCore
+ .create(classFile.getFile());
+ type = unit.getType(new JavaProjectHelper().getSimpleTypeName(input));
- /*
- * private void openWithDefaultJavaEditorIfNotPanel(final IEditorInput input) { final
- * IEditorPart thisEditor = this; if (!(new TypeHelper().isTypeOf(type, Panel.class.getName()))) {
- * WicketPlugin.getDisplay().asyncExec(new Runnable() { public void run() {
- * getEditorSite().getPage().closeEditor(thisEditor, false); try {
- * getEditorSite().getPage().openEditor(input, findDescriptor("java").getId()); } catch
- * (PartInitException e) { throw new RuntimeException(e); } } }); } }
- */
+ // TODO review for possible solution?
+ // this causes problems when using eclipse quick fixes. for example
+ // creating a new method will fail because the editor is opened, then
+ // closed and when the new java editor is opened it doesnt know about
+ // the quickfix.
+ // openWithDefaultJavaEditorIfNotPanel(input);
+ }
- private void updatePartName() {
- IWorkbenchPart2 part = (IWorkbenchPart2) getActiveEditor();
- if (part != null) {
- setPartName(part.getPartName());
- }
- }
+ public IType getJavaType() {
+ final ICompilationUnit unit = (ICompilationUnit) JavaCore
+ .create(((IFileEditorInput) getEditorInput()).getFile());
+ return unit.getType(new JavaProjectHelper()
+ .getSimpleTypeName(getEditorInput()));
+ }
- @Override
- protected void pageChange(int newPageIndex) {
- super.pageChange(newPageIndex);
- updatePartName();
- updateOutline();
- }
+ /*
+ * private void openWithDefaultJavaEditorIfNotPanel(final IEditorInput
+ * input) { final IEditorPart thisEditor = this; if (!(new
+ * TypeHelper().isTypeOf(type, Panel.class.getName()))) {
+ * WicketPlugin.getDisplay().asyncExec(new Runnable() { public void run() {
+ * getEditorSite().getPage().closeEditor(thisEditor, false); try {
+ * getEditorSite().getPage().openEditor(input,
+ * findDescriptor("java").getId()); } catch (PartInitException e) { throw
+ * new RuntimeException(e); } } }); } }
+ */
- private void updateOutline() {
- MultiContentOutlinePage outline = getMultiContentOutlinePage();
- outline.setPageActive((IContentOutlinePage) getActiveEditor().getAdapter(
- IContentOutlinePage.class));
- }
+ private void updatePartName() {
+ final IWorkbenchPart2 part = (IWorkbenchPart2) getActiveEditor();
+ if (part != null) {
+ setPartName(part.getPartName());
+ }
+ }
- @Override
- @SuppressWarnings("unchecked")
- public Object getAdapter(Class adapter) {
- if (IContentOutlinePage.class.equals(adapter)) {
- return getMultiContentOutlinePage();
- }
- return super.getAdapter(adapter);
- }
+ @Override
+ protected void pageChange(final int newPageIndex) {
+ super.pageChange(newPageIndex);
+ updatePartName();
+ updateOutline();
+ }
- private MultiContentOutlinePage getMultiContentOutlinePage() {
- if (outlinePage == null) {
- List<IResource> resources = getHtmlResources();
- if (!resources.isEmpty()) {
- createComponentTree(resources);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(componentTree);
- }
- outlinePage = new MultiContentOutlinePage(this,componentTree);
- updateOutline();
- }
- return outlinePage;
- }
+ private void updateOutline() {
+ final MultiContentOutlinePage outline = getMultiContentOutlinePage();
+ outline.setPageActive((IContentOutlinePage) getActiveEditor()
+ .getAdapter(IContentOutlinePage.class));
+ }
- private void createComponentTree(List<IResource> resources) {
- componentTree = new ComponentTree(type,(IFile) resources.get(0));
- try {
- componentTree.parse();
- } catch (MarkupException e) {
- // intentional
- }
- }
+ @Override
+ @SuppressWarnings("unchecked")
+ public Object getAdapter(final Class adapter) {
+ if (IContentOutlinePage.class.equals(adapter)) {
+ return getMultiContentOutlinePage();
+ }
+ return super.getAdapter(adapter);
+ }
- private List<IResource> getHtmlResources() {
- try {
- return new TypeHelper().getResources(type.getElementName(), type.getPackageFragment()
- .getNonJavaResources(), "html");
- } catch (JavaModelException e) {
- throw new RuntimeException(e);
- }
- }
+ private MultiContentOutlinePage getMultiContentOutlinePage() {
+ if (outlinePage == null) {
+ final List<IResource> resources = getHtmlResources();
+ if (!resources.isEmpty()) {
+ createComponentTree(resources);
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(
+ componentTree);
+ }
+ outlinePage = new MultiContentOutlinePage(this, componentTree);
+ updateOutline();
+ }
+ return outlinePage;
+ }
-
- private void addEditors() {
- try {
- List<IResource> resources = new TypeHelper().getResources(type.getElementName(), type
- .getPackageFragment().getNonJavaResources());
- createEditorForJavaResource();
- createEditorsForNonJavaResources(resources);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
+ private void createComponentTree(final List<IResource> resources) {
+ componentTree = new ComponentTree(type, (IFile) resources.get(0));
+ try {
+ componentTree.parse();
+ } catch (final MarkupException e) {
+ // intentional
+ }
+ }
- private void createEditorForJavaResource() throws PartInitException {
- IEditorPart editor = selectEditor((IFileEditorInput) getEditorInput(), "java");
- int index = addPage(editor, getEditorInput());
- setPageText(index, "java");
- }
+ private List<IResource> getHtmlResources() {
+ try {
+ return new TypeHelper().getResources(type.getElementName(), type
+ .getPackageFragment().getNonJavaResources(), "html");
+ } catch (final JavaModelException e) {
+ throw new RuntimeException(e);
+ }
+ }
- private void createEditorsForNonJavaResources(List<IResource> resources)
- throws PartInitException {
- for (IResource resource : resources) {
- if (resource instanceof IFile) {
- IFile file = (IFile) resource;
- IFileEditorInput input = new FileEditorInput(file);
- addPage(input);
- addPreviewPageIfHtmlResource(file);
- }
- }
- }
+ private void addEditors() {
+ try {
+ final List<IResource> resources = new ArrayList<IResource>();
+ final IPackageFragment packageFragment = type.getPackageFragment();
+ for (final IPackageFragment fragment : type.getJavaProject()
+ .getPackageFragments()) {
+ if (packageFragment.getElementName().equalsIgnoreCase(
+ fragment.getElementName())) {
+ resources.addAll(new TypeHelper().getResources(type
+ .getElementName(), fragment.getNonJavaResources()));
+ }
+ }
- private void addPreviewPageIfHtmlResource(IFile file) throws PartInitException {
- if (file.getFileExtension().equals("html")) {
- int index = addPage(new PreviewEditor(), new FileEditorInput(file));
- setPageText(index, "preview");
- }
- }
+ createEditorForJavaResource();
+ createEditorsForNonJavaResources(resources);
+ } catch (final Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
- private void addPage(IFileEditorInput input) throws PartInitException {
- IEditorPart editor = selectEditor(input, input.getFile().getFileExtension());
- int index = addPage(editor, input);
- setPageText(index, input.getFile().getFileExtension());
- }
+ private void createEditorForJavaResource() throws PartInitException {
+ final IEditorPart editor = selectEditor(
+ (IFileEditorInput) getEditorInput(), "java");
+ final int index = addPage(editor, getEditorInput());
+ setPageText(index, "java");
+ }
- private IEditorPart selectEditor(IFileEditorInput input, String extension) {
- EditorSelector selector = new EditorSelector();
- IEditorPart editor = selector.selectEditor(input, extension);
- editor.addPropertyListener(propertyListener);
- return editor;
- }
+ private void createEditorsForNonJavaResources(
+ final List<IResource> resources) throws PartInitException {
+ for (final IResource resource : resources) {
+ if (resource instanceof IFile) {
+ final IFile file = (IFile) resource;
+ final IFileEditorInput input = new FileEditorInput(file);
+ addPage(input);
+ addPreviewPageIfHtmlResource(file);
+ }
+ }
+ }
- @Override
- public void doSave(IProgressMonitor monitor) {
- for (IEditorPart editor : getEditors()) {
- editor.doSave(monitor);
- }
- }
+ private void addPreviewPageIfHtmlResource(final IFile file)
+ throws PartInitException {
+ if (file.getFileExtension().equals("html")) {
+ final int index = addPage(new PreviewEditor(), new FileEditorInput(
+ file));
+ setPageText(index, "preview");
+ }
+ }
- @Override
- public void doSaveAs() {
- getActiveEditor().doSaveAs();
- }
+ private void addPage(final IFileEditorInput input) throws PartInitException {
+ final IEditorPart editor = selectEditor(input, input.getFile()
+ .getFileExtension());
+ final int index = addPage(editor, input);
- @Override
- public boolean isSaveAsAllowed() {
- if (getActiveEditor() != null) {
- return getActiveEditor().isSaveAsAllowed();
- }
- return false;
- }
+ String name = input.getFile().getName();
+ if (name.contains("_")) {
+ name = name.substring(name.indexOf("_") + 1);
+ name = name.substring(0, name.length()
+ - input.getFile().getFileExtension().length() - 1);
+ } else {
+ name = input.getFile().getFileExtension();
+ }
+ setPageText(index, name);
+ }
- public IEditorPart getJavaEditor() {
- return getEditors().get(0);
- }
+ private IEditorPart selectEditor(final IFileEditorInput input,
+ final String extension) {
+ final EditorSelector selector = new EditorSelector();
+ final IEditorPart editor = selector.selectEditor(input, extension);
+ editor.addPropertyListener(propertyListener);
+ return editor;
+ }
- public List<IEditorPart> getEditors() {
- final List<IEditorPart> editors = new ArrayList<IEditorPart>();
- WicketPlugin.getDisplay().syncExec(new Runnable() {
- public void run() {
- for (int i = 0; i < getPageCount(); i++) {
- editors.add(getEditor(i));
- }
- }
- });
- return editors;
- }
-
- protected int indexOf(IEditorPart editor) {
- List<IEditorPart> editors = getEditors();
- for (int i = 0; i < editors.size(); i++) {
- if (editors.get(i).equals(editor)) {
- return i;
- }
- }
- return -1;
- }
+ @Override
+ public void doSave(final IProgressMonitor monitor) {
+ for (final IEditorPart editor : getEditors()) {
+ editor.doSave(monitor);
+ }
+ }
- public void addEditor(final IFileEditorInput input) {
- WicketPlugin.getDisplay().syncExec(new Runnable() {
- public void run() {
- try {
- if (!hasEditorFor(input)) {
- addPage(input);
- }
- } catch (PartInitException e) {
- throw new RuntimeException(e);
- }
- }
- });
- }
+ @Override
+ public void doSaveAs() {
+ getActiveEditor().doSaveAs();
+ }
- private boolean hasEditorFor(IFileEditorInput input) {
- for (IEditorPart editor : getEditors()) {
- if (input.equals(editor.getEditorInput())) {
- return true;
- }
- }
- return false;
- }
+ @Override
+ public boolean isSaveAsAllowed() {
+ if (getActiveEditor() != null) {
+ return getActiveEditor().isSaveAsAllowed();
+ }
+ return false;
+ }
- public void deleteEditor(final IEditorPart editor) {
- WicketPlugin.getDisplay().syncExec(new Runnable() {
- public void run() {
- for (int i = 0; i < getPageCount(); i++) {
- if (editor.equals(getEditor(i))) {
- removePage(i);
- }
- }
- }
- });
+ public IEditorPart getJavaEditor() {
+ return getEditors().get(0);
+ }
- closeWicketEditorIfNoPages();
- }
+ public List<IEditorPart> getEditors() {
+ final List<IEditorPart> editors = new ArrayList<IEditorPart>();
+ WicketPlugin.getDisplay().syncExec(new Runnable() {
+ public void run() {
+ for (int i = 0; i < getPageCount(); i++) {
+ editors.add(getEditor(i));
+ }
+ }
+ });
+ return editors;
+ }
- private void closeWicketEditorIfNoPages() {
- final IEditorPart thisEditor = this;
- if (getPageCount() == 0) {
- WicketPlugin.getDisplay().asyncExec(new Runnable() {
- public void run() {
- getEditorSite().getPage().closeEditor(thisEditor, false);
- }
- });
- }
- }
+ protected int indexOf(final IEditorPart editor) {
+ final List<IEditorPart> editors = getEditors();
+ for (int i = 0; i < editors.size(); i++) {
+ if (editors.get(i).equals(editor)) {
+ return i;
+ }
+ }
+ return -1;
+ }
- public void deleteAllEditors() {
- for (IEditorPart editor : getEditors()) {
- deleteEditor(editor);
- }
- }
+ public void addEditor(final IFileEditorInput input) {
+ WicketPlugin.getDisplay().syncExec(new Runnable() {
+ public void run() {
+ try {
+ if (!hasEditorFor(input)) {
+ addPage(input);
+ }
+ } catch (final PartInitException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+ }
- public IDocumentProvider getDocumentProvider() {
- return ((ITextEditor) getJavaEditor()).getDocumentProvider();
- }
+ private boolean hasEditorFor(final IFileEditorInput input) {
+ for (final IEditorPart editor : getEditors()) {
+ if (input.equals(editor.getEditorInput())) {
+ return true;
+ }
+ }
+ return false;
+ }
- public void close(boolean save) {
- ((ITextEditor) getJavaEditor()).close(save);
- }
+ public void deleteEditor(final IEditorPart editor) {
+ WicketPlugin.getDisplay().syncExec(new Runnable() {
+ public void run() {
+ for (int i = 0; i < getPageCount(); i++) {
+ if (editor.equals(getEditor(i))) {
+ removePage(i);
+ }
+ }
+ }
+ });
- public boolean isEditable() {
- return ((ITextEditor) getJavaEditor()).isEditable();
- }
+ closeWicketEditorIfNoPages();
+ }
- public void doRevertToSaved() {
- ((ITextEditor) getJavaEditor()).doRevertToSaved();
- }
+ private void closeWicketEditorIfNoPages() {
+ final IEditorPart thisEditor = this;
+ if (getPageCount() == 0) {
+ WicketPlugin.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ getEditorSite().getPage().closeEditor(thisEditor, false);
+ }
+ });
+ }
+ }
- public void setAction(String actionID, IAction action) {
- ((ITextEditor) getJavaEditor()).setAction(actionID, action);
- }
+ public void deleteAllEditors() {
+ for (final IEditorPart editor : getEditors()) {
+ deleteEditor(editor);
+ }
+ }
- public IAction getAction(String actionId) {
- return ((ITextEditor) getJavaEditor()).getAction(actionId);
- }
+ public IDocumentProvider getDocumentProvider() {
+ return ((ITextEditor) getJavaEditor()).getDocumentProvider();
+ }
- public void setActionActivationCode(String actionId, char activationCharacter,
- int activationKeyCode, int activationStateMask) {
- ((ITextEditor) getJavaEditor()).setActionActivationCode(actionId, activationCharacter,
- activationKeyCode, activationStateMask);
- }
+ public void close(final boolean save) {
+ ((ITextEditor) getJavaEditor()).close(save);
+ }
- public void removeActionActivationCode(String actionId) {
- ((ITextEditor) getJavaEditor()).removeActionActivationCode(actionId);
- }
+ public boolean isEditable() {
+ return ((ITextEditor) getJavaEditor()).isEditable();
+ }
- public boolean showsHighlightRangeOnly() {
- return ((ITextEditor) getJavaEditor()).showsHighlightRangeOnly();
- }
+ public void doRevertToSaved() {
+ ((ITextEditor) getJavaEditor()).doRevertToSaved();
+ }
- public void showHighlightRangeOnly(boolean showHighlightRangeOnly) {
- ((ITextEditor) getJavaEditor()).showHighlightRangeOnly(showHighlightRangeOnly);
- }
+ public void setAction(final String actionID, final IAction action) {
+ ((ITextEditor) getJavaEditor()).setAction(actionID, action);
+ }
- public void setHighlightRange(int offset, int length, boolean moveCursor) {
- ((ITextEditor) getJavaEditor()).setHighlightRange(offset, length, moveCursor);
- }
+ public IAction getAction(final String actionId) {
+ return ((ITextEditor) getJavaEditor()).getAction(actionId);
+ }
- public IRegion getHighlightRange() {
- return ((ITextEditor) getJavaEditor()).getHighlightRange();
- }
+ public void setActionActivationCode(final String actionId,
+ final char activationCharacter, final int activationKeyCode,
+ final int activationStateMask) {
+ ((ITextEditor) getJavaEditor()).setActionActivationCode(actionId,
+ activationCharacter, activationKeyCode, activationStateMask);
+ }
- public void resetHighlightRange() {
- ((ITextEditor) getJavaEditor()).resetHighlightRange();
- }
+ public void removeActionActivationCode(final String actionId) {
+ ((ITextEditor) getJavaEditor()).removeActionActivationCode(actionId);
+ }
- public ISelectionProvider getSelectionProvider() {
- return ((ITextEditor) getJavaEditor()).getSelectionProvider();
- }
+ public boolean showsHighlightRangeOnly() {
+ return ((ITextEditor) getJavaEditor()).showsHighlightRangeOnly();
+ }
- public void selectAndReveal(int offset, int length) {
- ((ITextEditor) getJavaEditor()).selectAndReveal(offset, length);
- }
+ public void showHighlightRangeOnly(final boolean showHighlightRangeOnly) {
+ ((ITextEditor) getJavaEditor())
+ .showHighlightRangeOnly(showHighlightRangeOnly);
+ }
- public InsertMode getInsertMode() {
- if (isTextEditorExtension3()) {
- return ((ITextEditorExtension3) getActiveEditor()).getInsertMode();
- }
- return ITextEditorExtension3.SMART_INSERT;
- }
+ public void setHighlightRange(final int offset, final int length,
+ final boolean moveCursor) {
+ ((ITextEditor) getJavaEditor()).setHighlightRange(offset, length,
+ moveCursor);
+ }
- public void setInsertMode(InsertMode mode) {
- if (isTextEditorExtension3()) {
- ((ITextEditorExtension3) getActiveEditor()).setInsertMode(mode);
- }
- }
+ public IRegion getHighlightRange() {
+ return ((ITextEditor) getJavaEditor()).getHighlightRange();
+ }
- public void showChangeInformation(boolean show) {
- if (isTextEditorExtension3()) {
- ((ITextEditorExtension3) getActiveEditor()).showChangeInformation(show);
- }
- }
+ public void resetHighlightRange() {
+ ((ITextEditor) getJavaEditor()).resetHighlightRange();
+ }
- public boolean isChangeInformationShowing() {
- if (isTextEditorExtension3()) {
- return ((ITextEditorExtension3) getActiveEditor()).isChangeInformationShowing();
- }
- return false;
- }
+ public ISelectionProvider getSelectionProvider() {
+ return ((ITextEditor) getJavaEditor()).getSelectionProvider();
+ }
- private boolean isTextEditorExtension3() {
- if (getActiveEditor() != null && getActiveEditor() instanceof ITextEditorExtension3) {
- return true;
- }
- return false;
- }
+ public void selectAndReveal(final int offset, final int length) {
+ ((ITextEditor) getJavaEditor()).selectAndReveal(offset, length);
+ }
- public void setStatusField(IStatusField field, String category) {
- if (isTextEditorExtension()) {
- ((ITextEditorExtension) getActiveEditor()).setStatusField(field, category);
- }
- }
+ public InsertMode getInsertMode() {
+ if (isTextEditorExtension3()) {
+ return ((ITextEditorExtension3) getActiveEditor()).getInsertMode();
+ }
+ return ITextEditorExtension3.SMART_INSERT;
+ }
- public boolean isEditorInputReadOnly() {
- if (isTextEditorExtension()) {
- return ((ITextEditorExtension) getActiveEditor()).isEditorInputReadOnly();
- }
- return false;
- }
+ public void setInsertMode(final InsertMode mode) {
+ if (isTextEditorExtension3()) {
+ ((ITextEditorExtension3) getActiveEditor()).setInsertMode(mode);
+ }
+ }
- public void addRulerContextMenuListener(IMenuListener listener) {
- if (isTextEditorExtension()) {
- ((ITextEditorExtension) getActiveEditor()).addRulerContextMenuListener(listener);
- }
- }
+ public void showChangeInformation(final boolean show) {
+ if (isTextEditorExtension3()) {
+ ((ITextEditorExtension3) getActiveEditor())
+ .showChangeInformation(show);
+ }
+ }
- public void removeRulerContextMenuListener(IMenuListener listener) {
- if (isTextEditorExtension()) {
- ((ITextEditorExtension) getActiveEditor()).removeRulerContextMenuListener(listener);
- }
- }
+ public boolean isChangeInformationShowing() {
+ if (isTextEditorExtension3()) {
+ return ((ITextEditorExtension3) getActiveEditor())
+ .isChangeInformationShowing();
+ }
+ return false;
+ }
- private boolean isTextEditorExtension() {
- if (getActiveEditor() != null && getActiveEditor() instanceof ITextEditorExtension) {
- return true;
- }
- return false;
- }
+ private boolean isTextEditorExtension3() {
+ if (getActiveEditor() != null
+ && getActiveEditor() instanceof ITextEditorExtension3) {
+ return true;
+ }
+ return false;
+ }
- public INavigationLocation createEmptyNavigationLocation() {
- return ((INavigationLocationProvider) getJavaEditor()).createEmptyNavigationLocation();
- }
+ public void setStatusField(final IStatusField field, final String category) {
+ if (isTextEditorExtension()) {
+ ((ITextEditorExtension) getActiveEditor()).setStatusField(field,
+ category);
+ }
+ }
- public INavigationLocation createNavigationLocation() {
- return ((INavigationLocationProvider) getJavaEditor()).createNavigationLocation();
- }
+ public boolean isEditorInputReadOnly() {
+ if (isTextEditorExtension()) {
+ return ((ITextEditorExtension) getActiveEditor())
+ .isEditorInputReadOnly();
+ }
+ return false;
+ }
- public boolean isEditorInputModifiable() {
- if (isTextEditorExtension2()) {
- return ((ITextEditorExtension2) getActiveEditor()).isEditorInputModifiable();
- }
- return false;
- }
+ public void addRulerContextMenuListener(final IMenuListener listener) {
+ if (isTextEditorExtension()) {
+ ((ITextEditorExtension) getActiveEditor())
+ .addRulerContextMenuListener(listener);
+ }
+ }
- public boolean validateEditorInputState() {
- if (isTextEditorExtension2()) {
- return ((ITextEditorExtension2) getActiveEditor()).validateEditorInputState();
- }
- return false;
- }
+ public void removeRulerContextMenuListener(final IMenuListener listener) {
+ if (isTextEditorExtension()) {
+ ((ITextEditorExtension) getActiveEditor())
+ .removeRulerContextMenuListener(listener);
+ }
+ }
- private boolean isTextEditorExtension2() {
- if (getActiveEditor() != null && getActiveEditor() instanceof ITextEditorExtension2) {
- return true;
- }
- return false;
- }
+ private boolean isTextEditorExtension() {
+ if (getActiveEditor() != null
+ && getActiveEditor() instanceof ITextEditorExtension) {
+ return true;
+ }
+ return false;
+ }
- public void forwardTab() {
- int active = getActivePage();
- if (active == getPageCount() - 1) {
- setActivePage(0);
- } else {
- setActivePage(active + 1);
- }
- }
+ public INavigationLocation createEmptyNavigationLocation() {
+ return ((INavigationLocationProvider) getJavaEditor())
+ .createEmptyNavigationLocation();
+ }
- public void backwardTab() {
- int active = getActivePage();
- if (active == 0) {
- setActivePage(getPageCount() - 1);
- } else {
- setActivePage(active - 1);
- }
- }
+ public INavigationLocation createNavigationLocation() {
+ return ((INavigationLocationProvider) getJavaEditor())
+ .createNavigationLocation();
+ }
- public PreviewEditor getPreviewEditor() {
- for (IEditorPart editor : getEditors()) {
- if (editor instanceof PreviewEditor) {
- return (PreviewEditor) editor;
- }
- }
- return null;
- }
-
- private IPropertyListener propertyListener = new IPropertyListener() {
- public void propertyChanged(Object source, int property) {
- if (property == IEditorPart.PROP_DIRTY) {
- if (source instanceof IEditorPart) {
- IEditorPart editor = (IEditorPart) source;
- IFileEditorInput input = (IFileEditorInput) editor.getEditorInput();
- int index = indexOf(editor);
- if (index != -1) {
- String dirtyMarker = editor.isDirty() ? "* " : "";
- setPageText(index, dirtyMarker + input.getFile().getFileExtension());
- }
- }
- }
- }
- };
+ public boolean isEditorInputModifiable() {
+ if (isTextEditorExtension2()) {
+ return ((ITextEditorExtension2) getActiveEditor())
+ .isEditorInputModifiable();
+ }
+ return false;
+ }
+ public boolean validateEditorInputState() {
+ if (isTextEditorExtension2()) {
+ return ((ITextEditorExtension2) getActiveEditor())
+ .validateEditorInputState();
+ }
+ return false;
+ }
+
+ private boolean isTextEditorExtension2() {
+ if (getActiveEditor() != null
+ && getActiveEditor() instanceof ITextEditorExtension2) {
+ return true;
+ }
+ return false;
+ }
+
+ public void forwardTab() {
+ final int active = getActivePage();
+ if (active == getPageCount() - 1) {
+ setActivePage(0);
+ } else {
+ setActivePage(active + 1);
+ }
+ }
+
+ public void backwardTab() {
+ final int active = getActivePage();
+ if (active == 0) {
+ setActivePage(getPageCount() - 1);
+ } else {
+ setActivePage(active - 1);
+ }
+ }
+
+ public PreviewEditor getPreviewEditor() {
+ for (final IEditorPart editor : getEditors()) {
+ if (editor instanceof PreviewEditor) {
+ return (PreviewEditor) editor;
+ }
+ }
+ return null;
+ }
+
+ private IPropertyListener propertyListener = new IPropertyListener() {
+ public void propertyChanged(final Object source, final int property) {
+ if (property == IEditorPart.PROP_DIRTY) {
+ if (source instanceof IEditorPart) {
+ final IEditorPart editor = (IEditorPart) source;
+ final IFileEditorInput input = (IFileEditorInput) editor
+ .getEditorInput();
+ final int index = indexOf(editor);
+ if (index != -1) {
+ final String dirtyMarker = editor.isDirty() ? "* " : "";
+ setPageText(index, dirtyMarker
+ + input.getFile().getFileExtension());
+ }
+ }
+ }
+ }
+ };
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rba...@us...> - 2010-01-28 20:25:32
|
Revision: 1
http://stump.svn.sourceforge.net/stump/?rev=1&view=rev
Author: rbaranga
Date: 2010-01-28 20:25:22 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
* basic import of plugin, including package rename & resources move
Added Paths:
-----------
plugin/
plugin/branches/
plugin/tags/
plugin/trunk/
plugin/trunk/LICENCE.txt
plugin/trunk/META-INF/
plugin/trunk/META-INF/MANIFEST.MF
plugin/trunk/plugin.xml
plugin/trunk/pom.xml
plugin/trunk/src/
plugin/trunk/src/main/
plugin/trunk/src/main/java/
plugin/trunk/src/main/java/junitx/
plugin/trunk/src/main/java/junitx/util/
plugin/trunk/src/main/java/junitx/util/AbstractSuiteBuilder.java
plugin/trunk/src/main/java/junitx/util/DirectorySuiteBuilder.java
plugin/trunk/src/main/java/junitx/util/SimpleTestFilter.java
plugin/trunk/src/main/java/junitx/util/TestFilter.java
plugin/trunk/src/main/java/net/
plugin/trunk/src/main/java/net/sf/
plugin/trunk/src/main/java/net/sf/stump/
plugin/trunk/src/main/java/net/sf/stump/browser/
plugin/trunk/src/main/java/net/sf/stump/browser/SourceWindow.java
plugin/trunk/src/main/java/net/sf/stump/browser/SwtBrowser.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/
plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPlugin.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/WicketPluginView.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/BuilderConfiguration.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/BuilderDeconfiguration.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/ConfigurationTemplate.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/NatureSelection.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/ProjectPreferenceStore.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/ProjectPropertiesPage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/WebResourceConfiguration.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/WicketBasePreferencePage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/configuration/WicketHomeInitializer.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/AbstractCreationProposal.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/AbstractEditorActionDelegate.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/AbstractPreviewEditorActionDelegate.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/AssociatedMarkupAuditor.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/ComponentNode.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/ComponentTree.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/ComponentTreeDoubleClickListener.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/ComponentTreeListener.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/ComponentTreeOutlinePage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/ComponentTreeParser.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/CreateHtmlTemplateQuickFix.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/CreateHtmlTemplateQuickFixGenerator.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/CreateInnerFormProposal.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/CreatePanelProposal.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/CreateWebPageProposal.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/CssEnablement.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/EditorManagerListener.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/EditorProvider.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/EditorSelector.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/HtmlComponentTreeParser.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/ImageRelocation.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/JavaComponentTreeParser.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/MultiContentOutlinePage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/NewFileActionDelegate.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/NewHtmlFileActionDelegate.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/NewPropertiesFileActionDelegate.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/PreviewEditor.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/ProblemCorrectionQuickFixProcessor.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/TabBackwardActionDelegate.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/TabForwardActionDelegate.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditor.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorActionContributor.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorLauncher.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorManager.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketEditorSite.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketMarker.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/editor/WicketPreview.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/form/
plugin/trunk/src/main/java/net/sf/stump/eclipse/form/FormGenerationActionDelegate.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/form/FormSourceWindow.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/
plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/BaseLaunchShortcut.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchConfiguration.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/launcher/WicketLaunchShortcut.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/metadata/
plugin/trunk/src/main/java/net/sf/stump/eclipse/metadata/NatureAssociation.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/metadata/WicketClass.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/metadata/WicketNature.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/metadata/WicketProject.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/
plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/Base.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/HtmlFile.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/InlineCss.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/PreviewConfiguration.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/parser/PreviewParser.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/refactoring/
plugin/trunk/src/main/java/net/sf/stump/eclipse/refactoring/RenameTypeParticipant.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/swt/
plugin/trunk/src/main/java/net/sf/stump/eclipse/swt/LabelledText.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/BaseTemplateContext.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketClassContextType.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketClassTemplateContext.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketProjectContextType.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketProjectTemplateContext.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketTemplatePreferencePage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/template/WicketTemplateStore.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/BuildPathAssistant.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/BuilderHelper.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/DefaultJarListProvider.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/EditorHelper.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/FolderHelper.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/JarListProvider.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/JavaProjectHelper.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/ProjectHelper.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/TemplateHelper.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/util/TypeHelper.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/AbstractNewWicketArtefactWizard.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/AbstractNewWicketArtefactWizardPage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/NewWebPageWizard.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/NewWebPageWizardPage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/NewWicketJavaProjectPage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/NewWicketPanelWizard.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/NewWicketPanelWizardPage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/NewWicketProjectPage.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/NewWicketProjectWizard.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/ResourceCreationListener.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/WicketStatus.java
plugin/trunk/src/main/java/net/sf/stump/eclipse/wizard/WizardPageListener.java
plugin/trunk/src/main/java/net/sf/stump/form/
plugin/trunk/src/main/java/net/sf/stump/form/CheckBoxHandler.java
plugin/trunk/src/main/java/net/sf/stump/form/CompundPropertyModelStrategy.java
plugin/trunk/src/main/java/net/sf/stump/form/HtmlForm.java
plugin/trunk/src/main/java/net/sf/stump/form/IModelStrategy.java
plugin/trunk/src/main/java/net/sf/stump/form/ITagHandler.java
plugin/trunk/src/main/java/net/sf/stump/form/PasswordHandler.java
plugin/trunk/src/main/java/net/sf/stump/form/PropertyModelStrategy.java
plugin/trunk/src/main/java/net/sf/stump/form/SelectHandler.java
plugin/trunk/src/main/java/net/sf/stump/form/SimpleTagHandler.java
plugin/trunk/src/main/java/net/sf/stump/form/TextAreaHandler.java
plugin/trunk/src/main/java/net/sf/stump/form/TextHandler.java
plugin/trunk/src/main/java/net/sf/stump/junit/
plugin/trunk/src/main/java/net/sf/stump/junit/AbstractTestSuite.java
plugin/trunk/src/main/java/net/sf/stump/junit/PackageMatchingFilter.java
plugin/trunk/src/main/java/net/sf/stump/junit/StumpTestCase.java
plugin/trunk/src/main/java/net/sf/stump/junit4/
plugin/trunk/src/main/java/net/sf/stump/junit4/PreparePreview.java
plugin/trunk/src/main/java/net/sf/stump/junit4/StumpTestCase.java
plugin/trunk/src/main/java/net/sf/stump/metadata/
plugin/trunk/src/main/java/net/sf/stump/metadata/ProjectMetadata.java
plugin/trunk/src/main/java/net/sf/stump/runner/
plugin/trunk/src/main/java/net/sf/stump/runner/Launcher.java
plugin/trunk/src/main/java/net/sf/stump/runner/Main.java
plugin/trunk/src/main/java/net/sf/stump/runner/Servers.java
plugin/trunk/src/main/java/net/sf/stump/runner/ServletContainer.java
plugin/trunk/src/main/java/net/sf/stump/util/
plugin/trunk/src/main/java/net/sf/stump/util/Assert.java
plugin/trunk/src/main/java/net/sf/stump/util/FileHelper.java
plugin/trunk/src/main/java/net/sf/stump/util/InputStreamReader.java
plugin/trunk/src/main/java/net/sf/stump/util/ParserApplication.java
plugin/trunk/src/main/java/net/sf/stump/web/
plugin/trunk/src/main/java/net/sf/stump/web/HomePage.html
plugin/trunk/src/main/java/net/sf/stump/web/HomePage.java
plugin/trunk/src/main/java/net/sf/stump/web/IComponentFactory.java
plugin/trunk/src/main/java/net/sf/stump/web/StaticHeaderContributor.java
plugin/trunk/src/main/java/net/sf/stump/web/Stump.java
plugin/trunk/src/main/java/net/sf/stump/web/StumpApplication.java
plugin/trunk/src/main/java/net/sf/stump/web/StumpApplicationFactory.java
plugin/trunk/src/main/resources/
plugin/trunk/src/main/resources/icons/
plugin/trunk/src/main/resources/icons/css_attach.gif
plugin/trunk/src/main/resources/icons/htmlfile.gif
plugin/trunk/src/main/resources/icons/image_reloc.gif
plugin/trunk/src/main/resources/icons/javaclass.gif
plugin/trunk/src/main/resources/icons/wicket.gif
plugin/trunk/src/main/resources/icons/wicket_preview.gif
plugin/trunk/src/main/resources/selenium/
plugin/trunk/src/main/resources/selenium/Embedded-WEB-INF/
plugin/trunk/src/main/resources/selenium/SeleneseRunner.html
plugin/trunk/src/main/resources/selenium/SeleniumLog.html
plugin/trunk/src/main/resources/selenium/TestRunner-splash.html
plugin/trunk/src/main/resources/selenium/VERSION.txt
plugin/trunk/src/main/resources/selenium/WEB-INF/
plugin/trunk/src/main/resources/selenium/WEB-INF/web.xml
plugin/trunk/src/main/resources/selenium/devtests/
plugin/trunk/src/main/resources/selenium/devtests/TestClickInFrame.html
plugin/trunk/src/main/resources/selenium/devtests/TestOpenInFrame.html
plugin/trunk/src/main/resources/selenium/devtests/TestOpenInNewWindow.html
plugin/trunk/src/main/resources/selenium/devtests/TestOpenMeta.html
plugin/trunk/src/main/resources/selenium/devtests/TestSuite.html
plugin/trunk/src/main/resources/selenium/devtests/meta/
plugin/trunk/src/main/resources/selenium/devtests/meta/page.html
plugin/trunk/src/main/resources/selenium/dom-images/
plugin/trunk/src/main/resources/selenium/dom-images/butmin.gif
plugin/trunk/src/main/resources/selenium/dom-images/butplus.gif
plugin/trunk/src/main/resources/selenium/dom-styles/
plugin/trunk/src/main/resources/selenium/dom-styles/default.css
plugin/trunk/src/main/resources/selenium/domviewer.html
plugin/trunk/src/main/resources/selenium/html-xpath/
plugin/trunk/src/main/resources/selenium/html-xpath/carnation.jpg
plugin/trunk/src/main/resources/selenium/html-xpath/example.html
plugin/trunk/src/main/resources/selenium/html-xpath/html-xpath-patched.js
plugin/trunk/src/main/resources/selenium/html-xpath/html-xpath.js
plugin/trunk/src/main/resources/selenium/html-xpath/license.txt
plugin/trunk/src/main/resources/selenium/html-xpath/rainbow.jpg
plugin/trunk/src/main/resources/selenium/htmlutils.js
plugin/trunk/src/main/resources/selenium/index.html
plugin/trunk/src/main/resources/selenium/install-readme.txt
plugin/trunk/src/main/resources/selenium/selenium-api.js
plugin/trunk/src/main/resources/selenium/selenium-browserbot.js
plugin/trunk/src/main/resources/selenium/selenium-commandhandlers.js
plugin/trunk/src/main/resources/selenium/selenium-domviewer.js
plugin/trunk/src/main/resources/selenium/selenium-executionloop.js
plugin/trunk/src/main/resources/selenium/selenium-fitrunner.js
plugin/trunk/src/main/resources/selenium/selenium-logging.js
plugin/trunk/src/main/resources/selenium/selenium-logo.graffle
plugin/trunk/src/main/resources/selenium/selenium-logo.png
plugin/trunk/src/main/resources/selenium/selenium-tableparser.js
plugin/trunk/src/main/resources/selenium/selenium.css
plugin/trunk/src/main/resources/selenium/user-extensions.js.sample
plugin/trunk/src/main/resources/selenium/xmlextras.js
plugin/trunk/src/main/resources/selenium/xpath.js
plugin/trunk/src/main/resources/templates/
plugin/trunk/src/main/resources/templates/applicationClass.xml
plugin/trunk/src/main/resources/templates/form.xml
plugin/trunk/src/main/resources/templates/panel.xml
plugin/trunk/src/main/resources/templates/panel_html.xml
plugin/trunk/src/main/resources/templates/web.xml
plugin/trunk/src/main/resources/templates/web_page.xml
plugin/trunk/src/main/resources/templates/web_page_html.xml
plugin/trunk/src/test/
plugin/trunk/src/test/java/
plugin/trunk/src/test/java/net/
plugin/trunk/src/test/java/net/sf/
plugin/trunk/src/test/java/net/sf/stump/
plugin/trunk/src/test/java/net/sf/stump/eclipse/
plugin/trunk/src/test/java/net/sf/stump/eclipse/editor/
plugin/trunk/src/test/java/net/sf/stump/eclipse/editor/ComponentTreeOutlinePageTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/editor/ComponentTreeTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/editor/DummyFileEditorInput.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/editor/FileStub.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/editor/ResourceChangeEventStub.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/editor/ResourceDeltaStub.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/editor/WicketEditorManagerTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/metadata/
plugin/trunk/src/test/java/net/sf/stump/eclipse/metadata/NatureAssociationTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/metadata/WicketProjectTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/BaseTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/FileStub.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/HtmlComponentTreeParserTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/InlineCssTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/Page.html
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/PreviewParserTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/style.css
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/sub/
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/sub/Panel1.html
plugin/trunk/src/test/java/net/sf/stump/eclipse/parser/sub/Panel2.html
plugin/trunk/src/test/java/net/sf/stump/eclipse/template/
plugin/trunk/src/test/java/net/sf/stump/eclipse/template/WicketClassContextTypeTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/template/WicketProjectContextTypeTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/util/
plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuildPathAssistantTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/util/BuilderHelperTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/util/FolderHelperTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/util/JavaProjectHelperTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/util/TypeHelperTest.java
plugin/trunk/src/test/java/net/sf/stump/eclipse/wizard/
plugin/trunk/src/test/java/net/sf/stump/eclipse/wizard/WicketStatusTest.java
plugin/trunk/src/test/java/net/sf/stump/form/
plugin/trunk/src/test/java/net/sf/stump/form/ComboundPropertyModelStrategyTest.java
plugin/trunk/src/test/java/net/sf/stump/form/HtmlFormTest.java
plugin/trunk/src/test/java/net/sf/stump/junit/
plugin/trunk/src/test/java/net/sf/stump/junit/StumpTestCaseTest.java
plugin/trunk/src/test/java/net/sf/stump/metadata/
plugin/trunk/src/test/java/net/sf/stump/metadata/ProjectMetadataTest.java
plugin/trunk/src/test/java/net/sf/stump/runner/
plugin/trunk/src/test/java/net/sf/stump/runner/LauncherTest.java
plugin/trunk/src/test/java/net/sf/stump/util/
plugin/trunk/src/test/java/net/sf/stump/util/FileHelperTest.java
plugin/trunk/src/test/java/net/sf/stump/web/
plugin/trunk/src/test/java/net/sf/stump/web/CustomWebApplication.java
plugin/trunk/src/test/java/net/sf/stump/web/StaticHeaderContributorTest.java
plugin/trunk/src/test/java/net/sf/stump/web/StumpApplicationFactoryTest.java
Property changes on: plugin/trunk
___________________________________________________________________
Added: svn:ignore
+ .*
target
Added: plugin/trunk/LICENCE.txt
===================================================================
--- plugin/trunk/LICENCE.txt (rev 0)
+++ plugin/trunk/LICENCE.txt 2010-01-28 20:25:22 UTC (rev 1)
@@ -0,0 +1,11 @@
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
Added: plugin/trunk/META-INF/MANIFEST.MF
===================================================================
--- plugin/trunk/META-INF/MANIFEST.MF (rev 0)
+++ plugin/trunk/META-INF/MANIFEST.MF 2010-01-28 20:25:22 UTC (rev 1)
@@ -0,0 +1,42 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Wicket Stump Eclipse Plug-in
+Bundle-SymbolicName: WicketStump;singleton:=true
+Bundle-Version: 0.1
+Bundle-Activator: net.sf.stump.eclipse.WicketPlugin
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.launching,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.jdt.junit,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime.compatibility,
+ org.eclipse.debug.core,
+ org.eclipse.jdt.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.editors,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ltk.core.refactoring,
+ org.eclipse.ui.views
+Eclipse-AutoStart: true
+Export-Package: net.sf.stump.browser,
+ net.sf.stump.eclipse,
+ net.sf.stump.eclipse.configuration,
+ net.sf.stump.eclipse.editor,
+ net.sf.stump.eclipse.form,
+ net.sf.stump.eclipse.launcher,
+ net.sf.stump.eclipse.metadata,
+ net.sf.stump.eclipse.parser,
+ net.sf.stump.eclipse.refactoring,
+ net.sf.stump.eclipse.swt,
+ net.sf.stump.eclipse.template,
+ net.sf.stump.eclipse.util,
+ net.sf.stump.eclipse.wizard,
+ net.sf.stump.form,
+ net.sf.stump.runner,
+ net.sf.stump.util
Added: plugin/trunk/plugin.xml
===================================================================
--- plugin/trunk/plugin.xml (rev 0)
+++ plugin/trunk/plugin.xml 2010-01-28 20:25:22 UTC (rev 1)
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+ <extension point="org.eclipse.ui.newWizards">
+ <category
+ name="%NewWizard.category"
+ id="stump.eclipse.new">
+ </category>
+ <wizard
+ name="%NewWizard.name"
+ icon="icons/wicket.gif"
+ category="stump.eclipse.new"
+ class="stump.eclipse.wizard.NewWicketProjectWizard"
+ project="true"
+ id="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"
+ class="stump.eclipse.wizard.NewWicketPanelWizard"
+ id="stump.eclipse.new.panel">
+ <description>%NewPanelWizard.desc</description>
+ </wizard>
+ <wizard
+ name="%NewWebPageWizard.name"
+ icon="icons/wicket.gif"
+ category="stump.eclipse.new"
+ class="stump.eclipse.wizard.NewWebPageWizard"
+ id="stump.eclipse.new.webPage">
+ <description>%NewWebPageWizard.desc</description>
+ </wizard>
+ </extension>
+
+ <extension point="org.eclipse.ui.propertyPages">
+ <page
+ id="stump.eclipse.PropertyPage1"
+ name="%WicketPropertyPage.name"
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true"
+ class="stump.eclipse.configuration.ProjectPropertiesPage">
+ <filter name="nature" value="org.eclipse.jdt.core.javanature"></filter>
+ </page>
+ </extension>
+
+ <extension point="org.eclipse.core.resources.natures" id="wicketnature" name="Wicket Nature">
+ <runtime>
+ <run class="stump.eclipse.metadata.WicketNature"/>
+ </runtime>
+ <requires-nature id="org.eclipse.jdt.core.javanature"></requires-nature>
+ <builder id="stump.eclipse.editor.associatedMarkupAuditor"/>
+ </extension>
+
+ <extension id="associatedMarkupAuditor" name="Wicket associated markup auditor" point="org.eclipse.core.resources.builders">
+ <builder>
+ <run class="stump.eclipse.editor.AssociatedMarkupAuditor"/>
+ </builder>
+ </extension>
+
+ <extension id="associatedMarkupAuditorMarkerNoHtml" point="org.eclipse.core.resources.markers" name="Marker for associated markup auditor">
+ <super type="org.eclipse.core.resources.problemmarker"/>
+ <super type="org.eclipse.core.resources.textmarker"/>
+ <persistent value="true"/>
+ </extension>
+
+ <extension id="associatedMarkupAuditorMarkerParseError" point="org.eclipse.core.resources.markers" name="Marker for associated markup auditor">
+ <super type="org.eclipse.core.resources.problemmarker"/>
+ <super type="org.eclipse.core.resources.textmarker"/>
+ <persistent value="true"/>
+ </extension>
+
+ <extension point="org.eclipse.ui.ide.markerResolution">
+ <markerResolutionGenerator
+ markerType="stump.associatedMarkupAuditorMarkerNoHtml"
+ class="stump.eclipse.editor.CreateHtmlTemplateQuickFixGenerator">
+ </markerResolutionGenerator>
+ </extension>
+
+ <extension point="org.eclipse.jdt.ui.quickFixProcessors">
+ <quickFixProcessor
+ class="stump.eclipse.editor.ProblemCorrectionQuickFixProcessor"
+ id="stump.eclipse.editor.ProblemCorrectionQuickFixProcessor">
+ </quickFixProcessor>
+ </extension>
+
+ <extension point="org.eclipse.jdt.core.classpathVariableInitializer">
+ <classpathVariableInitializer
+ variable="WICKET_HOME"
+ class="stump.eclipse.configuration.WicketHomeInitializer">
+ </classpathVariableInitializer>
+ </extension>
+
+ <extension point="org.eclipse.ui.views">
+ <category name="Wicket" id="stump"/>
+ <view
+ name="Wicket Bench"
+ icon="icons/wicket.gif"
+ category="stump"
+ class="stump.eclipse.WicketPluginView"
+ id="stump.eclipse.WicketPluginView">
+ </view>
+ </extension>
+
+ <extension point="org.eclipse.debug.core.launchConfigurationTypes">
+ <launchConfigurationType
+ name="%WicketLaunch.label"
+ delegate="stump.eclipse.launcher.WicketLaunchConfiguration"
+ modes="run, debug"
+ id="stump.junit.launchconfig"
+ sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
+ sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
+ <fileExtension default="false" extension="java"/>
+ <fileExtension default="false" extension="class"/>
+ </launchConfigurationType>
+ </extension>
+
+ <extension point="org.eclipse.debug.ui.launchShortcuts">
+ <shortcut
+ label="%WicketShortcut.label"
+ icon="icons/wicket.gif"
+ helpContextId="org.eclipse.jdt.junit.launch_shortcut"
+ class="stump.eclipse.launcher.WicketLaunchShortcut"
+ modes="run, debug"
+ id="stump.eclipse.wicketShortcut">
+ <contextualLaunch>
+ <enablement>
+ <with variable="selection">
+ <count value="1"></count>
+ <iterate>
+ <or>
+ <test property="org.eclipse.debug.ui.matchesPattern" value="*.java"/>
+ <test property="org.eclipse.debug.ui.matchesPattern" value="*.class"/>
+ <adapt type="org.eclipse.jdt.core.IJavaElement"/>
+ </or>
+ <test property="org.eclipse.jdt.junit.isTest"/>
+ </iterate>
+ </with>
+ </enablement>
+ </contextualLaunch>
+ <perspective id="org.eclipse.jdt.ui.JavaPerspective"></perspective>
+ <perspective id="org.eclipse.jdt.ui.JavaHierarchyPerspective"></perspective>
+ <perspective id="org.eclipse.jdt.ui.JavaBrowsingPerspective"></perspective>
+ <perspective id="org.eclipse.debug.ui.DebugPerspective"></perspective>
+ </shortcut>
+ </extension>
+
+ <extension point="org.eclipse.ui.preferencePages">
+ <page
+ name="Wicket"
+ class="stump.eclipse.configuration.WicketBasePreferencePage"
+ id="stump.eclipse.preferences">
+ </page>
+ <page
+ name="Templates"
+ category="stump.eclipse.preferences"
+ class="stump.eclipse.template.WicketTemplatePreferencePage"
+ id="stump.eclipse.preferences.templates">
+ </page>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors.templates">
+ <contextType
+ name="wicket"
+ class="stump.eclipse.template.WicketProjectContextType"
+ id="stump.eclipse.templates.project">
+ </contextType>
+ <include file="templates/web.xml"></include>
+ <include file="templates/applicationClass.xml"></include>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors.templates">
+ <contextType
+ name="wicket"
+ class="stump.eclipse.template.WicketClassContextType"
+ id="stump.eclipse.templates.class">
+ </contextType>
+ <include file="templates/panel.xml"></include>
+ <include file="templates/panel_html.xml"></include>
+ <include file="templates/web_page.xml"></include>
+ <include file="templates/web_page_html.xml"></include>
+ <include file="templates/form.xml"></include>
+ </extension>
+
+ <extension point="org.eclipse.ui.editors">
+ <editor
+ id="stump.eclipse.editor"
+ name="Wicket Editor"
+ icon="icons/javaclass.gif"
+ class="stump.eclipse.editor.WicketEditor"
+ contributorClass="stump.eclipse.editor.WicketEditorActionContributor"
+ extensions="java">
+ </editor>
+ <editor
+ id="stump.eclipse.editorLauncher"
+ name="Wicket Editor Launcher (configure this as default editor)"
+ icon="icons/javaclass.gif"
+ launcher="stump.eclipse.editor.WicketEditorLauncher"
+ extensions="java">
+ </editor>
+ </extension>
+
+ <extension point="org.eclipse.ui.actionSetPartAssociations">
+ <actionSetPartAssociation targetID="org.eclipse.jdt.ui.CodingActionSet">
+ <part id="stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ <actionSetPartAssociation targetID="org.eclipse.jdt.ui.SearchActionSet">
+ <part id="stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ <actionSetPartAssociation targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
+ <part id="stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ <actionSetPartAssociation targetID="org.eclipse.ui.edit.text.actionSet.presentation">
+ <part id="stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ <actionSetPartAssociation targetID="org.eclipse.jdt.ui.text.java.actionSet.presentation">
+ <part id="stump.eclipse.editor" />
+ </actionSetPartAssociation>
+ </extension>
+
+ <extension point="org.eclipse.ui.editorActions">
+ <editorContribution targetID="stump.eclipse.editor" id="org.eclipse.ui.texteditor.ruler.actions">
+ <action
+ label="%Dummy.label"
+ class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
+ actionID="RulerDoubleClick"
+ id="org.eclipse.debug.ui.actions.RulerToggleBreakpointAction">
+ </action>
+ <action
+ label="%Dummy.label"
+ class="org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction"
+ actionID="RulerClick"
+ id="org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction">
+ </action>
+ </editorContribution>
+ <editorContribution
+ id="stump.eclipse.editor.preview"
+ targetID="stump.eclipse.editor">
+ <action
+ class="stump.eclipse.editor.CssEnablement"
+ icon="icons/css_attach.gif"
+ id="stump.eclipse.editor.CssEnablement"
+ label="CSS"
+ state="true"
+ style="toggle"
+ toolbarPath="Normal/additions"
+ tooltip="Inline CSS files in HTML preview"/>
+ <action
+ class="stump.eclipse.editor.ImageRelocation"
+ icon="icons/image_reloc.gif"
+ id="stump.eclipse.editor.ImageRelocation"
+ label="Image"
+ state="true"
+ style="toggle"
+ toolbarPath="Normal/additions"
+ tooltip="Relocate images in HTML preview"/>
+ <action
+ class="stump.eclipse.editor.WicketPreview"
+ icon="icons/wicket_preview.gif"
+ id="stump.eclipse.editor.WicketPreview"
+ label="WicketPreview"
+ state="true"
+ style="toggle"
+ toolbarPath="Normal/additions"
+ tooltip="Enable wicket:preview tag"/>
+ </editorContribution>
+ </extension>
+
+ <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
+ <renameParticipant
+ id="stump.eclipse.refactoring.RenameTypeParticipant"
+ name="stump.eclipse.refactoring.RenameTypeParticipant"
+ class="stump.eclipse.refactoring.RenameTypeParticipant">
+
+ <enablement>
+ <with variable="affectedNatures">
+ <iterate operator="or">
+ <equals value="org.eclipse.jdt.core.javanature"/>
+ </iterate>
+ </with>
+ <with variable="element">
+ <instanceof value="org.eclipse.jdt.core.IType"/>
+ </with>
+ </enablement>
+ </renameParticipant>
+ </extension>
+
+ <extension point="org.eclipse.ui.commands">
+ <category id="stump.keyCategory" name="Wicket Bench keys"/>
+ <command
+ id="stump.eclipse.editor.tabForward"
+ name="Forward tab"
+ categoryId="stump.keyCategory">
+ </command>
+ <command
+ id="stump.eclipse.editor.tabBackward"
+ name="Backward tab"
+ categoryId="stump.keyCategory">
+ </command>
+ <command
+ id="stump.eclipse.editor.newHtmlFile"
+ name="Create new html file"
+ categoryId="stump.keyCategory">
+ </command>
+ <command
+ id="stump.eclipse.editor.newPropertiesFile"
+ name="Create new properties file"
+ categoryId="stump.keyCategory">
+ </command>
+ </extension>
+
+ <extension point="org.eclipse.ui.bindings">
+ <key
+ sequence="M1+M3+."
+ commandId="stump.eclipse.editor.tabForward"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M1+M3+,"
+ commandId="stump.eclipse.editor.tabBackward"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M1+M2+M3+;"
+ commandId="stump.eclipse.editor.newHtmlFile"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M1+M2+M3+:"
+ commandId="stump.eclipse.editor.newPropertiesFile"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ </extension>
+
+ <extension point="org.eclipse.ui.editorActions">
+ <editorContribution
+ id="stump.eclipse.editorContribution" targetID="stump.eclipse.editor">
+ <action
+ class="stump.eclipse.editor.TabForwardActionDelegate"
+ id="stump.eclipse.editor.tabForward"
+ label="forward"
+ definitionId="stump.eclipse.editor.tabForward"/>
+ <action
+ class="stump.eclipse.editor.TabBackwardActionDelegate"
+ id="stump.eclipse.editor.tabBackward"
+ label="backward"
+ definitionId="stump.eclipse.editor.tabBackward"/>
+ <action
+ class="stump.eclipse.editor.NewHtmlFileActionDelegate"
+ id="stump.eclipse.editor.newHtmlFile"
+ label="new html file"
+ definitionId="stump.eclipse.editor.newHtmlFile"/>
+ <action
+ class="stump.eclipse.editor.NewPropertiesFileActionDelegate"
+ id="stump.eclipse.editor.newPropertiesFile"
+ label="new properties file"
+ definitionId="stump.eclipse.editor.newPropertiesFile"/>
+ </editorContribution>
+ </extension>
+
+ <extension point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ id="stump.eclipse.form.FormGeneration"
+ adaptable="true"
+ nameFilter="*.html"
+ objectClass="org.eclipse.core.resources.IFile">
+ <action
+ class="stump.eclipse.form.FormGenerationActionDelegate"
+ id="stump.eclipse.form.FormGenerationActionDelegate"
+ menubarPath="additions"
+ enablesFor="1"
+ label="Generate Wicket form code"/>
+ </objectContribution>
+ </extension>
+
+</plugin>
Added: plugin/trunk/pom.xml
===================================================================
--- plugin/trunk/pom.xml (rev 0)
+++ plugin/trunk/pom.xml 2010-01-28 20:25:22 UTC (rev 1)
@@ -0,0 +1,336 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>net.sf.stump</groupId>
+ <artifactId>plugin</artifactId>
+ <version>0.6</version>
+
+ <name>Wicket Stump</name>
+ <description>Wicket Stump Eclipse plugin</description>
+ <inceptionYear>2010</inceptionYear>
+ <url>http://stump.sourceforge.net/</url>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <eclipse.version>3.3.1</eclipse.version>
+ </properties>
+
+ <scm>
+ <connection>
+ scm:https://stump.svn.sourceforge.net/svnroot/stump/
+ </connection>
+ <developerConnection>${scm.connection}</developerConnection>
+ </scm>
+
+ <developers>
+ <developer>
+ <id>rbaranga</id>
+ <name>Radu Baranga</name>
+ <email>rba...@us...</email>
+ <url>http://rbaranga.users.sourceforge.net/</url>
+ <timezone>1</timezone>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>mocked</groupId>
+ <artifactId>mocked</artifactId>
+ <version>0.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>selenium</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>0.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>selenium</groupId>
+ <artifactId>selenium-server</artifactId>
+ <version>0.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>1.4.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.20</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>6.0.20</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ <version>6.0.20</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>org.eclipse.jface</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.text</groupId>
+ <artifactId>org.eclipse.text</artifactId>
+ <version>3.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>org.eclipse.core.resources</artifactId>
+ <version>3.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
+ <version>3.3.100</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.launching</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.ui</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ltk</groupId>
+ <artifactId>org.eclipse.ltk.core.refactoring</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>org.eclipse.ui.workbench</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>org.eclipse.ui.editors</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>org.eclipse.ui.views</artifactId>
+ <version>3.2.101</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>org.eclipse.ui.ide</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>org.eclipse.debug.core</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>org.eclipse.debug.ui</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.junit</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swt</groupId>
+ <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+ <version>${eclipse.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <type>jar</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.properties</include>
+ <include>**/*.js</include>
+ <include>**/*.xml</include>
+ <include>**/*.css</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.properties</include>
+ <include>**/*.js</include>
+ <include>**/*.xml</include>
+ <include>**/*.css</include>
+ </includes>
+ </testResource>
+ </testResources>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <classpathContainers>
+ <java.lang.String>
+ org.eclipse.jdt.launching.JRE_CONTAINER
+ </java.lang.String>
+ <java.lang.String>
+ org.eclipse.pde.core.requiredPlugins
+ </java.lang.String>
+ </classpathContainers>
+ <projectnatures>
+ <java.lang.String>
+ org.eclipse.jdt.core.javanature
+ </java.lang.String>
+ <java.lang.String>
+ org.eclipse.pde.PluginNature
+ </java.lang.String>
+ </projectnatures>
+ <buildcommands>
+ <java.lang.String>
+ org.eclipse.jdt.core.javabuilder
+ </java.lang.String>
+ <java.lang.String>
+ org.eclipse.pde.ManifestBuilder
+ </java.lang.String>
+ <java.lang.String>
+ org.eclipse.pde.SchemaBuilder
+ </java.lang.String>
+ </buildcommands>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: plugin/trunk/src/main/java/junitx/util/AbstractSuiteBuilder.java
===================================================================
--- plugin/trunk/src/main/java/junitx/util/AbstractSuiteBuilder.java (rev 0)
+++ plugin/trunk/src/main/java/junitx/util/AbstractSuiteBuilder.java 2010-01-28 20:25:22 UTC (rev 1)
@@ -0,0 +1,142 @@
+/*
+ * The JUnit-addons Software License, Version 1.0
+ * (based on the Apache Software License, Version 1.1)
+ *
+ * Copyright (c) 2002-2003 Vladimir R. Bossicard. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by Vladimir R.
+ * Bossicard as well as other contributors
+ * (http://junit-addons.sourceforge.net/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The name "JUnit-addons" must not be used to endorse or promote
+ * products derived from this software without prior written
+ * permission. For written permission, please contact
+ * vbo...@us....
+ *
+ * 5. Products derived from this software may not be called "JUnit-addons"
+ * nor may "JUnit-addons" appear in their names without prior written
+ * permission of the project managers.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ======================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals. For more information on the JUnit-addons Project, please
+ * see <http://junit-addons.sourceforge.net/>.
+ */
+
+package junitx.util;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * @version $Revision: 1.5 $ $Date: 2003/04/02 04:50:44 $
+ * @author <a href="mailto:vbo...@us...">Vladimir R. Bossicard</a>
+ */
+abstract class AbstractSuiteBuilder {
+
+ private TestFilter filter;
+
+ public AbstractSuiteBuilder(TestFilter filter) {
+ this.filter = filter;
+ }
+
+ /**
+ * Sets the <tt>filter</tt> defining the test classes to be included.
+ */
+ public void setFilter(TestFilter filter) {
+ this.filter = filter;
+ }
+
+ /**
+ * Returns <tt>true</tt> if the given <tt>path</tt> refers a test class.
+ */
+ protected boolean isTestClass(String path) {
+ boolean temp = path.endsWith(".class") && (path.indexOf("$") < 0);
+ if (filter == null) {
+ return temp;
+ }
+ return temp && filter.include(path);
+ }
+
+ /**
+ * Populates the <tt>suite</tt> with test cases extracted from the
+ * <tt>classnames</tt> list.
+ */
+ protected void merge(List classenames, TestSuite suite) throws ClassNotFoundException, IllegalAccessException, InvocationTargetException {
+ for (int i = 0; i < classenames.size(); i++) {
+ String classname = (String) classenames.get(i);
+ Class cls = Class.forName(classname);
+
+ if (junit.framework.TestCase.class.isAssignableFrom(cls) && ((this.filter == null) || (this.filter.include(cls)))) {
+ /* Because a 'suite' method doesn't always exist in a TestCase,
+ * we need to use the try/catch so that tests can also be
+ * automatically extracted */
+ try {
+ Method suiteMethod = cls.getMethod("suite", new Class[0]);
+ if (!Modifier.isPublic(suiteMethod.getModifiers())) {
+ suite.addTest(warning("Method 'suite' should be public (class " + cls.getName() + ")"));
+ } else if (!Modifier.isStatic(suiteMethod.getModifiers())) {
+ suite.addTest(warning("Method 'suite' should be static (class " + cls.getName() + ")"));
+ } else if (!Test.class.isAssignableFrom(suiteMethod.getReturnType())) {
+ suite.addTest(warning("Method 'suite' should have a Test return type (class " + cls.getName() + ")"));
+ } else if (suiteMethod.getParameterTypes().length != 0) {
+ suite.addTest(warning("Method 'suite' should have no arguments (class " + cls.getName() + ")"));
+ } else {
+ Test test = (Test) suiteMethod.invoke(null, new Class[0]);
+ suite.addTest(test);
+ }
+ } catch (NoSuchMethodException e) {
+ suite.addTest(new TestSuite(cls));
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns a test which will fail and log a warning message.
+ */
+ private static Test warning(final String message) {
+ return new TestCase("warning") {
+ @Override
+ protected void runTest() {
+ fail(message);
+ }
+ };
+ }
+
+}
\ No newline at end of file
Added: plugin/trunk/src/main/java/junitx/util/DirectorySuiteBuilder.java
===================================================================
--- plugin/trunk/src/main/java/junitx/util/DirectorySuiteBuilder.java (rev 0)
+++ plugin/trunk/src/main/java/junitx/util/DirectorySuiteBuilder.java 2010-01-28 20:25:22 UTC (rev 1)
@@ -0,0 +1,192 @@
+/*
+ * The JUnit-addons Software License, Version 1.0
+ * (based on the Apache Software License, Version 1.1)
+ *
+ * Copyright (c) 2002-2003 Vladimir R. Bossicard. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by Vladimir R.
+ * Bossicard as well as other contributors
+ * (http://junit-addons.sourceforge.net/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The name "JUnit-addons" must not be used to endorse or promote
+ * products derived from this software without prior written
+ * permission. For written permission, please contact
+ * vbo...@us....
+ *
+ * 5. Products derived from this software may not be called "JUnit-addons"
+ * nor may "JUnit-addons" appear in their names without prior written
+ * permission of the project managers.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ======================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals. For more information on the JUnit-addons Project, please
+ * see <http://junit-addons.sourceforge.net/>.
+ */
+
+package junitx.util;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Extracts the testcases from a directory. Use the <tt>TestFilter</tt> to
+ * specify the pattern of the classes to load.
+ *
+ * <h4>Example</h4>
+ *
+ * Returns a suite containing all classes matching the pattern "*Test.
+ * class" from the directory <tt>/home/project/myproject/tests</tt>:<p>
+ * <pre>
+ * DirectorySuiteBuilder builder = new DirectorySuiteBuilder();
+ * Test suite = builer.suite("/home/project/myproject/tests");
+ * </pre>
+ *
+ * Returns a suite containing all tests from files starting with "Sample" and
+ * ending with "Test".
+ *
+ * <tt>/home/project/myproject/tests</tt><p>
+ * <pre>
+ * DirectorySuiteBuilder builder = new DirectorySuiteBuilder();
+ * builder.setFilter(new TestFilter() {
+ *
+ * public boolean include(String classpath) {
+ * return super.include(classpath) &&
+ * SimpleTestFilter.getClassName(classpath).startsWith("Sample");
+ * }
+ *
+ * });
+ *
+ * Test suite = builder.suite("/home/project/myproject/tests");
+ * </pre>
+ *
+ * @version $Revision: 1.6 $ $Date: 2003/04/28 05:18:28 $
+ * @author <a href="mailto:vbo...@us...">Vladimir R. Bossicard</a>
+ * @author <a href="mailto:pb...@us...">Naidu Purushotham</a>
+ */
+public class DirectorySuiteBuilder
+ extends AbstractSuiteBuilder {
+
+ static final int SUFFIX_LENGTH = ".class".length();
+
+ /**
+ * Constructs an empty <tt>DirectorySuiteBuilder</tt> object.
+ */
+ public DirectorySuiteBuilder() {
+ this(null);
+ }
+
+ /**
+ * Constructs an <tt>DirectorySuiteBuilder</tt> object with the given filter.
+ */
+ public DirectorySuiteBuilder(TestFilter filter) {
+ super(filter);
+ }
+
+ /**
+ * Constructs a <tt>TestSuite</tt> by extracting all test classes from the
+ * given <tt>directory</tt>.
+ */
+ public Test suite(File directory)
+ throws Exception {
+ TestSuite suite = new TestSuite(directory.getName());
+
+ List classnames = browse(directory);
+ merge(classnames, suite);
+
+ return suite;
+ }
+
+ /**
+ * Constructs a <tt>TestSuite</tt> by extracting all test classes from the
+ * directory of the given <tt>directoryName</tt>.
+ */
+ public Test suite(String directoryName)
+ throws Exception {
+ File dir = new File(directoryName);
+ return suite(dir);
+ }
+
+ /**
+ * Returns the list of test classes contained in the <tt>directory</tt>.
+ * Method defined for testing only: no support guarantee.
+ *
+ * @see DirectorySuiteBuilder#isTestClass
+ */
+ protected List browse(File directory)
+ throws Exception {
+ List result = new Vector();
+
+ gatherFiles(directory, result);
+
+ return result;
+ }
+
+ private void gatherFiles(File root,
+ List result)
+ throws IOException {
+ String path = root.getCanonicalPath();
+ gather(root, path.length() + 1, result);
+ }
+
+ private void gather(File root,
+ int prefix,
+ List result)
+ throws IOException {
+ File[] files = root.listFiles();
+ if (files == null) {
+ return;
+ }
+
+ for (int i = 0; i < files.length; i++) {
+ File file = files[i];
+ if (file.isDirectory()) {
+ if (file.canRead()) {
+ gather(file, prefix, result);
+ }
+ } else {
+ if (isTestClass(file.getPath())) {
+ result.add(getClassName(file.getCanonicalPath().substring(prefix)));
+ }
+ }
+ }
+ }
+
+ private String getClassName(String filename) {
+ return filename.replace(File.separatorChar, '.').substring(0, filename.length() - SUFFIX_LENGTH);
+ }
+
+}
Added: plugin/trunk/src/main/java/junitx/util/SimpleTestFilter.java
===================================================================
--- plugin/trunk/src/main/java/junitx/util/SimpleTestFilter.java (rev 0)
+++ plugin/trunk/src/main/java/junitx/util/SimpleTestFilter.java 2010-01-28 20:25:22 UTC (rev 1)
@@ -0,0 +1,143 @@
+/*
+ * The JUnit-addons Software License, Version 1.0
+ * (based on the Apache Software License, Version 1.1)
+ *
+ * Copyright (c) 2003 Vladimir R. Bossicard. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ ...
[truncated message content] |
