Revision: 6428 Author: [email protected] Date: Tue Oct 20 15:55:32 2009 Log: Removing this directory from the branch in preparation for a merge to trunk.
Issue #83803 places these jars in the tools directory proper. Review by: mmendez (TBR) http://code.google.com/p/google-web-toolkit/source/detail?r=6428 Deleted: /branches/remote-ui-communication/dev/core/gwt-tools-do-not-commit-into-trunk/lib/protobuf-2.2.0/COPYING.txt /branches/remote-ui-communication/dev/core/gwt-tools-do-not-commit-into-trunk/lib/protobuf-2.2.0/README /branches/remote-ui-communication/dev/core/gwt-tools-do-not-commit-into-trunk/lib/protobuf-2.2.0/protobuf-java-2.2.0.jar Modified: /branches/remote-ui-communication/dev/build.xml /branches/remote-ui-communication/eclipse/dev/.classpath ======================================= --- /branches/remote-ui-communication/dev/core/gwt-tools-do-not-commit-into-trunk/lib/protobuf-2.2.0/COPYING.txt Fri Oct 16 09:44:49 2009 +++ /dev/null @@ -1,33 +0,0 @@ -Copyright 2008, Google Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * 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. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS 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 COPYRIGHT -OWNER OR 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. - -Code generated by the Protocol Buffer compiler is owned by the owner -of the input file used when generating it. This code is not -standalone and requires a support library to be linked with it. This -support library is itself covered by the above license. ======================================= --- /branches/remote-ui-communication/dev/core/gwt-tools-do-not-commit-into-trunk/lib/protobuf-2.2.0/README Fri Oct 16 09:44:49 2009 +++ /dev/null @@ -1,22 +0,0 @@ -This is version 2.2.0 of the Java Protocol Buffer Library. We use protocol buffers -communication protocol between the Development Mode Server and Remote Viewers. - -To build this library: - -1) Download http://protobuf.googlecode.com/files/protobuf-2.2.0.tar.gz -2) Unzip the archive - -3) Follow the "Installation - With Maven" instructions located in java/README.txt. -Note that Maven is not required; one can altenatively follow the -"Installation - Without Maven" instructions. - -NOTE: If you decide to use Maven, be sure to add: - -<properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -</properties> - -as a child of the <project> tag in the java/pom.xml file. This will prevent -platform-dependent encoding warnings during the packaging step. See -http://maven.apache.org/general.html#encoding-warning for more information. - ======================================= --- /branches/remote-ui-communication/dev/core/gwt-tools-do-not-commit-into-trunk/lib/protobuf-2.2.0/protobuf-java-2.2.0.jar Fri Oct 16 09:44:49 2009 +++ /dev/null Binary file, no diff available. ======================================= --- /branches/remote-ui-communication/dev/build.xml Fri Oct 16 09:44:49 2009 +++ /branches/remote-ui-communication/dev/build.xml Tue Oct 20 15:55:32 2009 @@ -41,6 +41,7 @@ <include name="apache/ant-1.6.5.jar" /> <include name="eclipse/jdt-3.4.2.jar" /> <include name="jetty/jetty-6.1.11.jar" /> + <include name="protobuf/protobuf-2.2.0/protobuf-java-2.2.0.jar" /> <include name="tomcat/ant-launcher-1.6.5.jar" /> <include name="tomcat/catalina-1.0.jar" /> <include name="tomcat/catalina-optional-1.0.jar" /> @@ -85,9 +86,6 @@ <!-- htmlunit dependencies not already included: END --> <include name="sun/swingworker/swing-worker-1.1.jar" /> </fileset> - <!-- DO NOT COMMIT TO TRUNK --> - <fileset file="${gwt.root}/dev/core/gwt-tools-do-not-commit-into-trunk/lib/protobuf-2.2.0/protobuf-java-2.2.0.jar" /> - <!-- DO NOT COMMIT TO TRUNK --> <fileset file="build.xml"/> </sourcefiles> <targetfiles> @@ -99,6 +97,7 @@ <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" /> <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" /> <zipfileset src="${gwt.tools.lib}/jetty/jetty-6.1.11.jar" /> + <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.2.0/protobuf-java-2.2.0.jar" /> <zipfileset src="${gwt.tools.lib}/tomcat/ant-launcher-1.6.5.jar" /> <zipfileset src="${gwt.tools.lib}/tomcat/catalina-1.0.jar" /> <zipfileset src="${gwt.tools.lib}/tomcat/catalina-optional-1.0.jar" /> @@ -142,9 +141,6 @@ <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> <!-- htmlunit dependencies not already included: END --> <zipfileset src="${gwt.tools.lib}/sun/swingworker/swing-worker-1.1.jar" /> - <!-- DO NOT COMMIT TO TRUNK --> - <zipfileset src="${gwt.root}/dev/core/gwt-tools-do-not-commit-into-trunk/lib/protobuf-2.2.0/protobuf-java-2.2.0.jar" /> - <!-- DO NOT COMMIT TO TRUNK --> </gwt.jar> </sequential> </outofdate> ======================================= --- /branches/remote-ui-communication/eclipse/dev/.classpath Fri Oct 16 09:44:49 2009 +++ /branches/remote-ui-communication/eclipse/dev/.classpath Tue Oct 20 15:55:32 2009 @@ -42,6 +42,6 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/sun/swingworker/swing-worker-1.1.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5070-sources.jar"/> - <classpathentry kind="lib" path="core/gwt-tools-do-not-commit-into-trunk/lib/protobuf-2.2.0/protobuf-java-2.2.0.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.2.0/protobuf-java-2.2.0.jar"/> <classpathentry kind="output" path="bin"/> </classpath> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
