6:29 p.m.
Author: remy.maucherat(a)jboss.com
Date: 2008-10-31 19:29:06 -0400 (Fri, 31 Oct 2008)
New Revision: 838
Modified:
trunk/LICENSE
trunk/NOTICE
trunk/res/INSTALLLICENSE
trunk/res/jboss-web.nsi
Log:
- Adjust various notices.
Modified: trunk/LICENSE
===================================================================
--- trunk/LICENSE 2008-10-31 21:38:47 UTC (rev 837)
+++ trunk/LICENSE 2008-10-31 23:29:06 UTC (rev 838)
@@ -1,5 +1,5 @@
- GNU LESSER GENERAL PUBLIC LICENSE
+ GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Modified: trunk/NOTICE
===================================================================
--- trunk/NOTICE 2008-10-31 21:38:47 UTC (rev 837)
+++ trunk/NOTICE 2008-10-31 23:29:06 UTC (rev 838)
@@ -15,16 +15,13 @@
Java compilation software for JSP pages is provided by Eclipse,
which is open source software. The orginal software and
-related infomation is available at
-http://www.eclipse.org.
+related infomation is available at http://www.eclipse.org.
org.apache.tomcat.util.json
-Copyright (c) 2002 JSON.org
+Copyright 2002 JSON.org
-org.apache.cometd.bayeux is derivative work originating at the Dojo Foundation
-
org.apache.tomcat.bayeux
+Copyright 2007 Dojo Foundation
Copyright 2007-2008 Guy Molinari
Copyright 2007-2008 Filip Hanik
-Copyright 2007 Dojo Foundation
Copyright 2007 Mort Bay Consulting Pty. Ltd.
Modified: trunk/res/INSTALLLICENSE
===================================================================
--- trunk/res/INSTALLLICENSE 2008-10-31 21:38:47 UTC (rev 837)
+++ trunk/res/INSTALLLICENSE 2008-10-31 23:29:06 UTC (rev 838)
@@ -1,26 +1,5 @@
-JBoss Web
-Copyright 2006-2008 Red Hat Middleware, LLC. All rights reserved.
-Apache Tomcat
-Copyright 1999-2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-The Windows Installer is built with the Nullsoft
-Scriptable Install Sysem (NSIS), which is
-open source software. The original software and
-related information is available at
-http://nsis.sourceforge.net.
-
-Java compilation software for JSP pages is provided by Eclipse,
-which is open source software. The orginal software and
-related infomation is available at
-http://www.eclipse.org.
-
-
-
- GNU LESSER GENERAL PUBLIC LICENSE
+ GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
@@ -185,3 +164,34 @@
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
+
+
+
+
+JBoss Web
+Copyright 2006-2008 Red Hat Middleware, LLC. All rights reserved.
+
+Apache Tomcat
+Copyright 1999-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+The Windows Installer is built with the
+Nullsoft Scriptable Install Sysem (NSIS), which is
+open source software. The original software and
+related information is available at
+http://nsis.sourceforge.net.
+
+Java compilation software for JSP pages is provided by Eclipse,
+which is open source software. The orginal software and
+related infomation is available at http://www.eclipse.org.
+
+org.apache.tomcat.util.json
+Copyright 2002 JSON.org
+
+org.apache.tomcat.bayeux
+Copyright 2007 Dojo Foundation
+Copyright 2007-2008 Guy Molinari
+Copyright 2007-2008 Filip Hanik
+Copyright 2007 Mort Bay Consulting Pty. Ltd.
Modified: trunk/res/jboss-web.nsi
===================================================================
--- trunk/res/jboss-web.nsi 2008-10-31 21:38:47 UTC (rev 837)
+++ trunk/res/jboss-web.nsi 2008-10-31 23:29:06 UTC (rev 838)
@@ -520,7 +520,11 @@
; File will be written using current windows codepage
System::Call 'Kernel32::GetACP() i .r18'
- FileWrite $R9 "<?xml version='1.0'
encoding='cp$R8'?>$\r$\n"
+ StrCmp $R8 "932" 0 +3
+ ; Special case where Java uses non-standard name for character set
+ FileWrite $R9 "<?xml version='1.0'
encoding='ms$R8'?>$\r$\n"
+ Goto +2
+ FileWrite $R9 "<?xml version='1.0'
encoding='cp$R8'?>$\r$\n"
Push "$TEMP\confinstall\tomcat-users_1.xml"
Call copyFile