diff options
| author | Manolo Carrasco <manolo@apache.org> | 2011-10-15 21:01:20 +0000 |
|---|---|---|
| committer | Manolo Carrasco <manolo@apache.org> | 2011-10-15 21:01:20 +0000 |
| commit | 55958b7340569a24e9601970f9885b3c85e886b0 (patch) | |
| tree | 06a25955430d3f989b3193a52b92f53e7be84512 /archetype/src/main | |
| parent | 3006b51d1fdb2cd05052ff2e42897f96471db604 (diff) | |
| download | gwtquery-55958b7340569a24e9601970f9885b3c85e886b0.tar.gz gwtquery-55958b7340569a24e9601970f9885b3c85e886b0.zip | |
prepare archetype for next gwtquery version to deploy
Diffstat (limited to 'archetype/src/main')
3 files changed, 36 insertions, 48 deletions
diff --git a/archetype/src/main/resources/archetype-resources/assembly.xml b/archetype/src/main/resources/archetype-resources/assembly.xml deleted file mode 100644 index 94b4832a..00000000 --- a/archetype/src/main/resources/archetype-resources/assembly.xml +++ /dev/null @@ -1,32 +0,0 @@ -<assembly> - <formats> - <format>zip</format> - </formats> - <baseDirectory>/${artifactId}-${version}</baseDirectory> - <files> - <file> - <outputDirectory>/</outputDirectory> - <source>plugin/target/${artifactId}-plugin-${version}.jar</source> - </file> - <file> - <outputDirectory>/</outputDirectory> - <source>sample/target/${artifactId}-sample-${version}.war</source> - </file> - </files> - <fileSets> - <fileSet> - <directory>.</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>README.txt</include> - <include>LICENSE</include> - <include>pom.xml</include> - <include>assembly.xml</include> - <include>plugin/src/**</include> - <include>plugin/pom.xml</include> - <include>sample/src/**</include> - <include>sample/pom.xml</include> - </includes> - </fileSet> - </fileSets> -</assembly> diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml index d7c8e6a9..60ed057d 100644 --- a/archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetype/src/main/resources/archetype-resources/pom.xml @@ -9,15 +9,11 @@ <version>${version}</version>
<properties>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
- <gQueryVersion>1.0.0</gQueryVersion>
- <!-- Options: 2.0.1, 2.1.0, 2.2.0, 2.3.0 -->
- <gQueryClassifier>2.3.0</gQueryClassifier>
- <!-- options: 2.0.1, 2.1.0, 2.1.1, 2.2.0, 2.3.0 -->
- <gwtversion>2.3.0</gwtversion>
- <!-- options: 1.1, 2.1.0, 2.1.0-1, 2.2.0 -->
- <gwtmaven>2.2.0</gwtmaven>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <gQueryVersion>1.1.0</gQueryVersion>
+ <gwtversion>2.4.0</gwtversion>
+ <gwtmaven>2.4.0</gwtmaven>
</properties>
<repositories>
@@ -76,7 +72,6 @@ <groupId>com.googlecode.gwtquery</groupId>
<artifactId>gwtquery</artifactId>
<version>${gQueryVersion}</version>
- <classifier>${gQueryClassifier}</classifier>
<scope>provided</scope>
</dependency>
<!-- GWT 2.3.0 depends on these -->
@@ -151,15 +146,41 @@ <downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
<additionalBuildcommands>
- <buildCommand>
- <name>com.google.gwt.eclipse.core.gwtProjectValidator</name>
- </buildCommand>
+ <buildCommand>com.google.gwt.eclipse.core.gwtProjectValidator</buildCommand>
+ <buildcommand>org.eclipse.wst.common.modulecore.ComponentStructuralBuilder</buildcommand>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ <buildcommand>org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver</buildcommand>
</additionalBuildcommands>
<additionalProjectnatures>
<projectnature>com.google.gwt.eclipse.core.gwtNature</projectnature>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ <projectnature>org.eclipse.wst.common.modulecore.ModuleCoreNature</projectnature>
</additionalProjectnatures>
</configuration>
</plugin>
+ <!-- GWT plugin does not copy the webapp folder in hosted mode -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
</build>
diff --git a/archetype/src/main/resources/archetype-resources/src/main/java/__artifactId__/client/__projectName__.java b/archetype/src/main/resources/archetype-resources/src/main/java/__artifactId__/client/__projectName__.java index 5855c1b6..891f5d3e 100644 --- a/archetype/src/main/resources/archetype-resources/src/main/java/__artifactId__/client/__projectName__.java +++ b/archetype/src/main/resources/archetype-resources/src/main/java/__artifactId__/client/__projectName__.java @@ -5,7 +5,6 @@ package ${package}.${artifactId}.client; import com.google.gwt.dom.client.Element;
import com.google.gwt.query.client.Function;
import static com.google.gwt.query.client.GQuery.*;
-import static com.google.gwt.query.client.plugins.Effects.Effects;
import com.google.gwt.core.client.EntryPoint;
@@ -20,11 +19,11 @@ public class ${projectName} implements EntryPoint { ${symbol_dollar}("div")
.hover(new Function() {
public void f(Element e) {
- ${symbol_dollar}(e).css("color", "blue").as(Effects).stop().animate("fontSize: '+=10px'");
+ ${symbol_dollar}(e).css("color", "blue").stop(true, true).animate("fontSize: '+=10px'");
}
}, new Function() {
public void f(Element e) {
- ${symbol_dollar}(e).css("color", "").as(Effects).stop().animate("fontSize: '-=10px'");
+ ${symbol_dollar}(e).css("color", "").stop(true, true).animate("fontSize: '-=10px'");
}
});
}
|