Revision: 6902
Author: [email protected]
Date: Fri Nov 13 16:43:36 2009
Log: Merge trunk r6900 into this branch
Add missing files from MissingPlugin, improve build.xml integration
svn merge --ignore-ancestry -c6900 \
http://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=6902
Added:
/releases/2.0/plugins/MissingPlugin/war/WEB-INF
/releases/2.0/plugins/MissingPlugin/war/WEB-INF/appengine-web.xml
/releases/2.0/plugins/MissingPlugin/war/WEB-INF/logging.properties
/releases/2.0/plugins/MissingPlugin/war/WEB-INF/web.xml
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/plugins/MissingPlugin/build.xml
=======================================
--- /dev/null
+++ /releases/2.0/plugins/MissingPlugin/war/WEB-INF/appengine-web.xml Fri
Nov 13 16:43:36 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0";>
+ <application>gwt-dev-plugin-missing</application>
+ <version>1</version>
+
+ <!-- Configure java.util.logging -->
+ <system-properties>
+ <property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
+ </system-properties>
+
+</appengine-web-app>
+
=======================================
--- /dev/null
+++ /releases/2.0/plugins/MissingPlugin/war/WEB-INF/logging.properties Fri
Nov 13 16:43:36 2009
@@ -0,0 +1,24 @@
+# Logging configuration file for Google App Engine tools.
+
+# Specify the handlers to create in the root logger
+# (all loggers are children of the root logger)
+# The following creates the console handler
+handlers = java.util.logging.ConsoleHandler
+
+# Set the default logging level for the root logger
+.level = WARNING
+
+# Set the default logging level for the datanucleus loggers
+DataNucleus.JDO.level=WARNING
+DataNucleus.Persistence.level=WARNING
+DataNucleus.Cache.level=WARNING
+DataNucleus.MetaData.level=WARNING
+DataNucleus.General.level=WARNING
+DataNucleus.Utility.level=WARNING
+DataNucleus.Transaction.level=WARNING
+DataNucleus.Datastore.level=WARNING
+DataNucleus.ClassLoading.level=WARNING
+DataNucleus.Plugin.level=WARNING
+DataNucleus.ValueGeneration.level=WARNING
+DataNucleus.Enhancer.level=WARNING
+DataNucleus.SchemaTool.level=WARNING
=======================================
--- /dev/null
+++ /releases/2.0/plugins/MissingPlugin/war/WEB-INF/web.xml Fri Nov 13
16:43:36 2009
@@ -0,0 +1,13 @@
+<?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";>
+
+<web-app>
+
+ <!-- Default page to serve -->
+ <welcome-file-list>
+ <welcome-file>MissingPlugin.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
=======================================
--- /releases/2.0/branch-info.txt Fri Nov 13 15:41:02 2009
+++ /releases/2.0/branch-info.txt Fri Nov 13 16:43:36 2009
@@ -647,3 +647,8 @@
Serialize generator runs.
svn merge --ignore-ancestry -c6898 \
http://google-web-toolkit.googlecode.com/svn/trunk/ .
+
+tr...@6900 was merged into this branch
+ Add missing files from MissingPlugin, improve build.xml integration
+ svn merge --ignore-ancestry -c6900 \
+ http://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
--- /releases/2.0/plugins/MissingPlugin/build.xml Mon Nov 9 21:01:39 2009
+++ /releases/2.0/plugins/MissingPlugin/build.xml Fri Nov 13 16:43:36 2009
@@ -12,25 +12,22 @@
<!-- implied. License for the specific language governing permissions
and -->
<!-- limitations under the
License. -->
<project name="MissingPlugin" default="build" basedir=".">
- <!-- Configure path to GWT SDK -->
- <property environment="env"/>
- <property name="gwt.sdk"
location="../../build/staging/gwt-${env.GWT_VERSION}" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="plugins/MissingPlugin" />
+ <import file="${gwt.root}/common.ant.xml" />
+
+ <property.ensure name="gwt.user.jar"
location="${gwt.build.lib}/gwt-user.jar" />
+ <property.ensure name="gwt.dev.jar"
location="${gwt.build.lib}/gwt-dev.jar" />
<path id="project.class.path">
<pathelement location="war/WEB-INF/classes"/>
- <pathelement location="${gwt.sdk}/gwt-user.jar"/>
- <fileset dir="${gwt.sdk}" includes="gwt-dev*.jar"/>
+ <pathelement location="${gwt.user.jar}" />
+ <pathelement location="${gwt.dev.jar}" />
<!-- Add any additional non-server libs (such as JUnit) -->
<fileset dir="war/WEB-INF/lib" includes="**/*.jar"/>
</path>
- <target name="libs" description="Copy libs to WEB-INF/lib">
- <mkdir dir="war/WEB-INF/lib" />
- <copy todir="war/WEB-INF/lib" file="${gwt.sdk}/gwt-servlet.jar" />
- <!-- Add any additional server libs that need to be copied -->
- </target>
-
- <target name="javac" depends="libs" description="Compile java source">
+ <target name="javac" description="Compile java source">
<mkdir dir="war/WEB-INF/classes"/>
<javac srcdir="src" includes="**" encoding="utf-8"
destdir="war/WEB-INF/classes"
@@ -44,6 +41,11 @@
</target>
<target name="gwtc" depends="javac" description="GWT compile to
JavaScript">
+ <gwt.javac destdir="war/WEB-INF/classes">
+ <classpath>
+ <path refid="project.class.path"/>
+ </classpath>
+ </gwt.javac>
<java failonerror="true" fork="true"
classname="com.google.gwt.dev.Compiler">
<classpath>
<pathelement location="src"/>
@@ -56,7 +58,7 @@
</java>
</target>
- <target name="devMode" depends="javac" description="Run development
mode">
+ <target name="devmode" depends="javac" description="Run development
mode">
<java failonerror="true" fork="true"
classname="com.google.gwt.dev.DevMode">
<classpath>
<pathelement location="src"/>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
