aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorKevin Rushforth <[email protected]>2004-06-25 21:47:53 +0000
committerKevin Rushforth <[email protected]>2004-06-25 21:47:53 +0000
commitac5fd5c390be54f9979a363f97af034f719809ee (patch)
tree189798e8caebcda02f8770ad219c69e2a69cbf86 /LICENSE.txt
parent20c0582d7b99c8dd70d7ef48ae17cc03ab4da0bc (diff)
Started work needed for binary releases.
Added license files for JRL & JDL. Updated web pages. Renamed third party license files so they are clearly identified with the prefix THIRDPARTY-LICENSE- git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@20 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt21
1 files changed, 7 insertions, 14 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 4617b0b..930cc77 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,16 +1,9 @@
-=====================================================================
-BEGIN LICENSE PLACEHOLDER
-=====================================================================
+This software is licensed by Sun:
-Copyright (c) 2004 Sun Microsystems, Inc. All rights reserved.
+i) for research use under terms of the Java Research License (JRL) as
+specified in the LICENSE-JRL.txt file and on the web at
+"http://java3d.dev.java.net/jrl.html"; or
-This software is licensed under terms that are yet to be disclosed.
-Until such time as these terms are disclosed, you may not do anything
-at all with the source code in this CVS repository.
-
-=====================================================================
-END LICENSE PLACEHOLDER
-=====================================================================
-
-TODO: remove the above placeholder and put the actual license, and/or
-pointer (URL) to license, here.
+ii) for commercial use under the terms of the Java Distribution License
+(JDL) as specified in the LICENSE-JDL.txt file and on the web at
+"http://java3d.dev.java.net/jdl-java3d.pdf".