/hg/icedtea-web: Another renamed conflict file for case insensit...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Tue Feb 5 00:51:15 PST 2013
changeset fd01cd1c2bbc in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fd01cd1c2bbc
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Feb 05 09:51:44 2013 +0100
Another renamed conflict file for case insensitive systems
* tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1E_x_2s.html
Renamed to ParallelAppletsTest_1_x_2EE.html
* tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1EE_x_2s.html
new file.
* tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java:
(testParallelAppletsTest1Ex2s) adapted to renaming
diffstat:
ChangeLog | 10 ++
tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1EE_x_2s.html | 44 ++++++++++
tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1E_x_2s.html | 44 ----------
tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java | 2 +-
4 files changed, 55 insertions(+), 45 deletions(-)
diffs (125 lines):
diff -r e631770d76ba -r fd01cd1c2bbc ChangeLog
--- a/ChangeLog Thu Jan 31 11:12:35 2013 +0100
+++ b/ChangeLog Tue Feb 05 09:51:44 2013 +0100
@@ -1,3 +1,13 @@
+2013-02-03 Jiri Vanek <jvanek at redhat.com>
+
+ Another renamed conflict file for case insensitive systems
+ * tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1E_x_2s.html
+ Renamed to ParallelAppletsTest_1_x_2EE.html
+ * tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1EE_x_2s.html
+ new file.
+ * tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java:
+ (testParallelAppletsTest1Ex2s) adapted to renaming
+
2013-01-31 Jiri Vanek <jvanek at redhat.com>
Renamed conflict file for case insensitive systems
diff -r e631770d76ba -r fd01cd1c2bbc tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1EE_x_2s.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1EE_x_2s.html Tue Feb 05 09:51:44 2013 +0100
@@ -0,0 +1,44 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+ -->
+<html><head></head><body bgcolor="orange">
+<p><applet code="SimpleTest2.class" archive="NOT_EXISTING_JAR.jar" codebase="." width="50" height="100">
+</applet></p>
+<p><applet code="AppletTestSigned.class" archive="AppletTestSigned.jar" codebase="." width="100" height="50">
+</applet></p>
+</body>
+</html>
diff -r e631770d76ba -r fd01cd1c2bbc tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1E_x_2s.html
--- a/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1E_x_2s.html Thu Jan 31 11:12:35 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-IcedTea is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
- -->
-<html><head></head><body bgcolor="orange">
-<p><applet code="SimpleTest2.class" archive="NOT_EXISTING_JAR.jar" codebase="." width="50" height="100">
-</applet></p>
-<p><applet code="AppletTestSigned.class" archive="AppletTestSigned.jar" codebase="." width="100" height="50">
-</applet></p>
-</body>
-</html>
diff -r e631770d76ba -r fd01cd1c2bbc tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java
--- a/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java Thu Jan 31 11:12:35 2013 +0100
+++ b/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java Tue Feb 05 09:51:44 2013 +0100
@@ -50,7 +50,7 @@
@TestInBrowsers(testIn = {Browsers.one})
@NeedsDisplay
public void testParallelAppletsTest1Ex2s() throws Exception {
- ProcessResult pr = server.executeBrowser("ParallelAppletsTest_1E_x_2s.html");
+ ProcessResult pr = server.executeBrowser("ParallelAppletsTest_1EE_x_2s.html");
checkSimpleSignedStarted(pr);
checkNotInitialised(pr);
}
More information about the distro-pkg-dev
mailing list