Author: norman
Date: Sun Aug 9 10:13:40 2009
New Revision: 802512
URL: http://svn.apache.org/viewvc?rev=802512&view=rev
Log:
Fix maven build ( mvn clean package is working now)
Use new version of gwt incubator
Fix locales
Added:
labs/hupa/src/main/webapp/
labs/hupa/src/main/webapp/WEB-INF/
labs/hupa/src/main/webapp/WEB-INF/web.xml
Removed:
labs/hupa/lib/com.google.gwt/
Modified:
labs/hupa/.classpath
labs/hupa/.project
labs/hupa/.settings/org.maven.ide.eclipse.prefs
labs/hupa/pom.xml
labs/hupa/src/main/java/org/apache/hupa/Hupa.gwt.xml
labs/hupa/war/WEB-INF/lib/ (props changed)
labs/hupa/war/WEB-INF/web.xml
Modified: labs/hupa/.classpath
URL:
http://svn.apache.org/viewvc/labs/hupa/.classpath?rev=802512&r1=802511&r2=802512&view=diff
==============================================================================
--- labs/hupa/.classpath (original)
+++ labs/hupa/.classpath Sun Aug 9 10:13:40 2009
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes"
path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes"
path="src/main/resources"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con"
path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="war/WEB-INF/classes"
path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="war/WEB-INF/classes"
path="src/main/resources"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con"
path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="war/WEB-INF/classes"/>
+</classpath>
Modified: labs/hupa/.project
URL:
http://svn.apache.org/viewvc/labs/hupa/.project?rev=802512&r1=802511&r2=802512&view=diff
==============================================================================
--- labs/hupa/.project (original)
+++ labs/hupa/.project Sun Aug 9 10:13:40 2009
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Hupa</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
-
<name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
-
<name>com.google.gwt.eclipse.core.gwtProjectValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.google.gwt.eclipse.core.gwtNature</nature>
- <nature>com.google.gdt.eclipse.core.webAppNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Hupa</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+
<name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+
<name>com.google.gwt.eclipse.core.gwtProjectValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.google.gwt.eclipse.core.gwtNature</nature>
+ <nature>com.google.gdt.eclipse.core.webAppNature</nature>
+ </natures>
+</projectDescription>
Modified: labs/hupa/.settings/org.maven.ide.eclipse.prefs
URL:
http://svn.apache.org/viewvc/labs/hupa/.settings/org.maven.ide.eclipse.prefs?rev=802512&r1=802511&r2=802512&view=diff
==============================================================================
--- labs/hupa/.settings/org.maven.ide.eclipse.prefs (original)
+++ labs/hupa/.settings/org.maven.ide.eclipse.prefs Sun Aug 9 10:13:40 2009
@@ -1,9 +1,9 @@
-#Mon Jul 06 15:13:21 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
+#Sun Aug 09 11:42:02 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: labs/hupa/pom.xml
URL:
http://svn.apache.org/viewvc/labs/hupa/pom.xml?rev=802512&r1=802511&r2=802512&view=diff
==============================================================================
--- labs/hupa/pom.xml (original)
+++ labs/hupa/pom.xml Sun Aug 9 10:13:40 2009
@@ -10,6 +10,7 @@
</description>
<url>http://labs.apache.org</url>
<inceptionYear>2009</inceptionYear>
+ <packaging>war</packaging>
<licenses>
<license>
@@ -71,7 +72,13 @@
<id>guice</id>
<name>Guice repository at googlecode</name>
<url>http://guice-maven.googlecode.com/svn/trunk</url>
- </repository>
+ </repository>
+ <repository>
+ <id>for-gwt-incubator</id>
+ <url>
+
http://dist.codehaus.org/mule/dependencies/maven2/
+ </url>
+ </repository>
<repository>
<id>lib-repo</id>
<name>lib-m2-repository</name>
@@ -107,6 +114,7 @@
</properties>
<build>
+ <outputDirectory>war/WEB-INF/classes</outputDirectory>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
@@ -115,73 +123,24 @@
<!-- configure the GWT-Maven plugin -->
<plugin>
- <groupId>com.totsp.gwt</groupId>
-
<artifactId>maven-googlewebtoolkit2-plugin</artifactId>
- <version>2.0-RC1</version>
- <configuration>
- <logLevel>INFO</logLevel>
- <compileTargets>
-
<value>org.apache.hupa.Hupa</value>
- </compileTargets>
-
<runTarget>org.apache.hupa.Hupa/Hupa.html</runTarget>
- <style>DETAILED</style>
- <noServer>false</noServer>
- <extraJvmArgs>-Xmx512m</extraJvmArgs>
-
- <!--
- this parameter is VERY
important with automatic mode - has to
- match the version in your
declared deps
- -->
- <!--
- if this does not match (default
if left out is 1.5.3) you will
- have mysterious errors
- -->
- <gwtVersion>${gwtVersion}</gwtVersion>
- </configuration>
- <executions>
- <execution>
- <goals>
-
<goal>mergewebxml</goal> <goal>i18n</goal>
- <goal>compile</goal>
- <!--
-
<goal>test</goal>
- -->
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Use the dependency plugin to unpack
gwt-dev-PLATFORM-libs.zip -->
- <!--
- (this is a replacement for the old "automatic"
mode - useful if you
- don't have GWT installed already, or you just
want a maven way to
- handle gwt deps)
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
-
<groupId>com.google.gwt</groupId>
-
<artifactId>gwt-dev</artifactId>
-
<version>${gwtVersion}</version>
-
<classifier>${platform}-libs</classifier>
-
<type>zip</type>
-
<overWrite>false</overWrite>
-
<outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwtVersion}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <!--
+ <module>org.apache.hupa.Hupa</module>
+ -->
+
<runTarget>org.apache.hupa.Hupa/Hupa.html</runTarget>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+
<!--
If you want to use the target/web.xml file
mergewebxml produces,
tell the war plugin to use it. Also, exclude
what you want from the
@@ -190,10 +149,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <!--
+ <warSourceDirectory>war</warSourceDirectory>
+ -->
+ <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+ <webResources>
+ <resource>
+ <directory>war</directory>
+ <excludes>
+
<exclude>**/hupa/*</exclude>
+ </excludes>
+ </resource>
+ </webResources>
+ </configuration>
+ <!--
<configuration>
- <webXml>target/web.xml</webXml>
-
<warSourceExcludes>.gwt-tmp/**</warSourceExcludes>
- </configuration>
+ <webResources>
+
+ <resource>
+ <directory>war</directory>
+ <excludes>
+
<exclude>**/hupa/*</exclude>
+ </excludes>
+ </resource>
+ </webResources>
+ </configuration>
+ -->
</plugin>
<!-- tell the compiler we can use 1.5 -->
<plugin>
@@ -295,7 +277,7 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-incubator</artifactId>
- <version>march-02-2009</version>
+ <version>july-14-2009</version>
</dependency>
<dependency>
<groupId>eu.maydu.gwt</groupId>
@@ -342,21 +324,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev</artifactId>
- <version>${gwtVersion}</version>
- <classifier>${platform}-libs</classifier>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev</artifactId>
- <version>${gwtVersion}</version>
- <classifier>${platform}</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.1</version>
Modified: labs/hupa/src/main/java/org/apache/hupa/Hupa.gwt.xml
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=802512&r1=802511&r2=802512&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/Hupa.gwt.xml (original)
+++ labs/hupa/src/main/java/org/apache/hupa/Hupa.gwt.xml Sun Aug 9 10:13:40
2009
@@ -3,8 +3,7 @@
<module rename-to='hupa'>
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User'/>
- <inherits name="com.google.gwt.i18n.I18N"/>
-
+ <inherits name="com.google.gwt.i18n.I18N"/>
<!-- Inherit the default GWT style sheet. You can change -->
<!-- the theme of your GWT application by uncommenting -->
@@ -28,6 +27,8 @@
<source path="shared"/>
<source path="client"/>
+ <extend-property name="locale" values="en" />
+
<!-- Specify the app entry point class. -->
<entry-point class='org.apache.hupa.client.Hupa'/>
</module>
Added: labs/hupa/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/webapp/WEB-INF/web.xml?rev=802512&view=auto
==============================================================================
--- labs/hupa/src/main/webapp/WEB-INF/web.xml (added)
+++ labs/hupa/src/main/webapp/WEB-INF/web.xml Sun Aug 9 10:13:40 2009
@@ -0,0 +1,43 @@
+<?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";>
+<!-- live config -->
+<web-app>
+
+ <!-- Default page to serve -->
+ <welcome-file-list>
+ <welcome-file>Hupa.html</welcome-file>
+ </welcome-file-list>
+
+ <context-param>
+ <!-- max size of the upload request (100MB) -->
+ <param-name>maxSize</param-name>
+ <param-value>104857600</param-value>
+ </context-param>
+
+ <!-- servlet for incubator gwt stuff -->
+ <servlet>
+ <servlet-name>remoteLoggingService</servlet-name>
+
<servlet-class>com.google.gwt.gen2.logging.server.RemoteLoggingService</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>remoteLoggingService</servlet-name>
+ <url-pattern>/hupa/logging</url-pattern>
+ </servlet-mapping>
+
+ <filter>
+ <filter-name>guiceFilter</filter-name>
+
<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>guiceFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <listener>
+
<listener-class>org.apache.hupa.server.guice.MyGuiceServletConfig</listener-class>
+ </listener>
+</web-app>
Propchange: labs/hupa/war/WEB-INF/lib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 9 10:13:40 2009
@@ -0,0 +1,16 @@
+activation-1.1.jar
+aopalliance-1.0.jar
+cobogw-1.3.jar
+commons-fileupload-1.2.1.jar
+commons-io-1.4.jar
+commons-logging-1.1.1.jar
+gin-1.0-20090622.jar
+guice-2.0.jar
+guice-servlet-2.0.jar
+gwt-dispatch-1.0.0-SNAPSHOT.jar
+gwt-incubator-july-14-2009.jar
+gwt-presenter-1.0.0-SNAPSHOT.jar
+gwt-vl-0.8b.jar
+gwtupload-0.3.1.jar
+log4j-1.2.13.jar
+mail-1.4.1.jar
Modified: labs/hupa/war/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/labs/hupa/war/WEB-INF/web.xml?rev=802512&r1=802511&r2=802512&view=diff
==============================================================================
--- labs/hupa/war/WEB-INF/web.xml (original)
+++ labs/hupa/war/WEB-INF/web.xml Sun Aug 9 10:13:40 2009
@@ -24,6 +24,17 @@
<param-value>true</param-value>
</context-param>
+ <!-- servlet for incubator gwt stuff -->
+ <servlet>
+ <servlet-name>remoteLoggingService</servlet-name>
+
<servlet-class>com.google.gwt.gen2.logging.server.RemoteLoggingService</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>remoteLoggingService</servlet-name>
+ <url-pattern>/hupa/logging</url-pattern>
+ </servlet-mapping>
+
<filter>
<filter-name>guiceFilter</filter-name>
<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
