summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2012-07-11 15:12:02 +0200
committerAndrew Branson <andrew.branson@cern.ch>2012-07-11 15:12:02 +0200
commitf8db95e7e156065a3a100269a06b40c91da3e22b (patch)
tree7eb8b0630c1059d4a8ef8cde368df5eb399f7c03 /src/main
parent7c3f4c2cfce2a017f23e2943622abe7f19a96157 (diff)
Changelog, re-instated version, version bump
Diffstat (limited to 'src/main')
-rw-r--r--src/main/resources/textFiles/license.html31
-rw-r--r--src/main/resources/textFiles/version.txt2
2 files changed, 32 insertions, 1 deletions
diff --git a/src/main/resources/textFiles/license.html b/src/main/resources/textFiles/license.html
new file mode 100644
index 0000000..afbaca4
--- /dev/null
+++ b/src/main/resources/textFiles/license.html
@@ -0,0 +1,31 @@
+<h3>Cristal Kernel</h3>
+<i>Copyright (c) 2001-2012 The CRISTAL Consortium. All Rights Reserved.</i>
+<p>Cristal Kernel utilizes the following software products:
+<ul>
+ <li><b><a href="http://www.oracle.com/technetwork/java/javase/overview/index.html">Java SE Programming Language and Runtime Environment</a></b>
+ <br><i>Copyright &copy; 2012, Oracle Corporation.</i>
+
+ <li><b><a href="http://www.openldap.org/">OpenLDAP</a></b>
+ <br><i>Copyright &copy; 2012, OpenLDAP Foundation</i>
+
+ <li><b><a href="http://xml.apache.org/xerces2-j/index.html">Xerces2 Java Parser</a></b>
+ <br><i>Copyright &copy; 2000-2010, The Apache Software Foundation. All rights reserved.</i>
+
+ <li><b><a href="http://www.castor.org/">Castor XML</a></b>
+ <br><i>Copyright &copy;1999-2005 ExoLab Group, Intalio Inc., and contributors. All Rights Reserved.</i>
+
+ <li><b><a href="http://developer.novell.com/ndk/jldap.htm">Novell LDAP Classes for Java</a></b>
+ <br><i>Copyright &copy; 2004 Novell, Inc. </i>
+
+ <li><b><a href="http://wrapper.tanukisoftware.org/">Java Service Wrapper</a></b>
+ <br><i>Copyright &copy; 1999, 2003 TanukiSoftware.org</i>
+</ul>
+<h3>Third Party Licenses</h3>
+<ul>
+ <li>Java 2 License: <a href="http://java.com/en/download/license.jsp">http://java.com/en/download/license.jsp</a>
+ <li>Apache Software License: <a href="http://www.apache.org/LICENSE.txt">http://www.apache.org/LICENSE.txt</a>
+ <li>DOM License: <a href="http://www.w3.org/Consortium/Legal/copyright-software-19980720">http://www.w3.org/Consortium/Legal/copyright-software-19980720</a>
+ <li>SAX License: <a href="http://www.saxproject.org/?selected=pd">http://www.saxproject.org/?selected=pd</a>
+ <li>Castor License: <a href="http://www.castor.org/license.html">http://www.castor.org/license.html</a>
+ <li>JSW License: <a href="http://wrapper.tanukisoftware.org/doc/english/license.html">http://wrapper.tanukisoftware.org/doc/english/license.html</a>
+</ul> \ No newline at end of file
diff --git a/src/main/resources/textFiles/version.txt b/src/main/resources/textFiles/version.txt
index 15ac121..f93ff28 100644
--- a/src/main/resources/textFiles/version.txt
+++ b/src/main/resources/textFiles/version.txt
@@ -1 +1 @@
-C2Kernel V2.3.1 Build 1 \ No newline at end of file
+C2Kernel V2.3.2 Build 1 \ No newline at end of file