Changelog, re-instated version, version bump

3 files changed, 59 insertions, 3 deletions

diff --git a/changelog b/changelog
index 0411950..01f1a4f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,28 @@
+

+- MOD: Create Module item in /desc/modules for each module registered in the server.

+- SYS: CastorXMLUtility is now a singleton (mMarshaller) in the gateway for kernel mapfiles. Modules may create their own instance for domain applications, but should not interfere with the kernel maps.

+- MOD: Module serialize with Castor. Removed XML parsing.

+- SYS: Fixed persistency of GTimeStamp

+- GRAPH: Removed persistency of VertexOutlineCreator. Containing class should set this during instantiation and unmarshalling.

+- GUI: Refactored kernel GUI into separate module: cristal-gui.

+- MOD: Modules and server entity creation now support aggregations, collection properties and class identifiers 

+- COLL: Merged module imports and server predefined step entity creation together

+- GUI: Alternate placement of aggregation labels to be more readable.

+- MOD: Support workflows on module resources to allow development. Possibly add 'debug' flag to enable this in the future.

+- MOD: Move module imports into bootstrap thread. They were previously being done concurrently.

+- SCR: Mozilla JS library switched to internal JRE one. Removed ref to internal mozilla undef. javax.script should now return null for undef.

+- LDAP: Compatible with latest JLDAP library (v4.3)

+- SYS: Build moved from ant to Maven. Artifact 'cristal-kernel' in group 'cristal'.

+- SCR: Allow multiple declared outputs from scripts. Improve chaining of parameters between scripts.

+- DB: Cache RemoteMaps if they are not related to a transaction

+- GUI: Outcome field help panel hiding works. Additional robustness of outcome form.

+- COLL: Added DependencyDescription

+- SYS: SoftCache - Fix NPE when key doesn't exist

+- WF: Removed redundant fields from Event: AgentCentre and Type

+- PROP: Imply 'Name' property on instantiation if not explicitly declared

+- SCR: More efficient DOM handling, getField() utility method for script

+- COLL: addMember methods return new Collection Member

+

 Release 2.3.1

 -------------

 - SYS: History objects fetched from an EntityProxy now have no locker, instead of the entity proxy object as previously. This is so it can be cached by the storage manager. If a transaction enabled History object is required, it should be instantiated directly.

@@ -12,7 +37,7 @@ Build 1
 Release 2.3

 -----------

 Build 3 - Module support

-- SYS: Cristal now supports multiple domain libraries concurrently - CRISTAL modules. Each declares its components in a module.xml in the root of its jar which can add config, resources, items and agents. Also scripts on startup/shutdown.

+- MOD: Cristal now supports multiple domain libraries concurrently - CRISTAL modules. Each declares its components in a module.xml in the root of its jar which can add config, resources, items and agents. Also scripts on startup/shutdown.

 Build 2 - Java 1.6 Compliance

 Build 1 - First GIT commit

 - SYS: Cleaned up some proxy methods. getContents() now calls storage directly.

@@ -68,7 +93,7 @@ Build 1
 - SYS: Moved all API objects out of AbstractMain into the Gateway. AbstractMain is no longer required to initialise a kernel process.

 - SYS: Moved Gateway to process package. Moved LDAP init to process.Bootstrap - will be entry point for basic item creation

 

-Release 1.2

+Release 2.1.1

 -----------------------

 Build 22

 - GUI: Multiple table row select when read only

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