summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2012-04-26 00:39:30 +0200
committerAndrew Branson <andrew.branson@cern.ch>2012-04-26 00:39:30 +0200
commit246994285ab3e4bf754d2d684a21c4b66e619c9b (patch)
tree0a3e434212ea0df5092a009adfbe61cc4e3b71c4
parent913d36d8f207083dfb6b627702a110d8d114be80 (diff)
Cleanup and annotation2.3.1
-rw-r--r--.classpath45
-rw-r--r--build.xml6
-rw-r--r--changelog2
3 files changed, 41 insertions, 12 deletions
diff --git a/.classpath b/.classpath
index 1fc556f..371bcd2 100644
--- a/.classpath
+++ b/.classpath
@@ -2,18 +2,45 @@
<classpath>
<classpathentry kind="src" path="source"/>
<classpathentry kind="src" path="build/generated"/>
- <classpathentry kind="lib" path="lib/js.jar"/>
- <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
- <classpathentry kind="lib" path="lib/xml-apis.jar"/>
- <classpathentry kind="lib" path="lib/wrapper.jar"/>
- <classpathentry kind="lib" path="lib/ldap.jar"/>
- <classpathentry kind="lib" path="lib/castor-1.3.2-core.jar"/>
- <classpathentry kind="lib" path="lib/castor-1.3.2-xml-schema.jar"/>
- <classpathentry kind="lib" path="lib/castor-1.3.2-xml.jar"/>
- <classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
+ <classpathentry kind="lib" path="lib/xercesImpl.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://xerces.apache.org/xerces2-j/javadocs/xerces2/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/xml-apis.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://xerces.apache.org/xerces2-j/javadocs/api/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/wrapper.jar">
+ <attributes>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="cristal-kernel/bin/win32"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/ldap.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://developer.novell.com/documentation/jldap/jldapenu/api/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/castor-1.3.2-core.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://www.castor.org/javadoc/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/castor-1.3.2-xml-schema.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://www.castor.org/javadoc/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/castor-1.3.2-xml.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://www.castor.org/javadoc/"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/dom4j.jar"/>
<classpathentry kind="lib" path="/cristal-dev/cristaldev.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
diff --git a/build.xml b/build.xml
index 4d86455..08d48a0 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="release-build" name="cristal">
+<project basedir="." default="release-build" name="cristal-kernel">
<!--===================================================================-->
<!-- Global properties -->
<!-- NOTE: Ant will automatically will add all jar files to the -->
@@ -8,8 +8,8 @@
<!-- directory which eliminates thecalculation of classpath for -->
<!-- the most of the 'javac' tasks -->
<!--===================================================================-->
- <property name="name" value="cristal2"/>
- <property name="version" value="1.0"/>
+ <property name="name" value="cristal-kernel"/>
+ <property name="version" value="2.3.1"/>
<!--===================================================================-->
<!-- Directories -->
<!--===================================================================-->
diff --git a/changelog b/changelog
index ccdc99d..0411950 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,7 @@
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.
+- SCR: Migrate from BSF to javax.script. Switch to JVM Rhino JS engine. This has changed the script system significantly. No more bsf.lookupBean (may add dummy for compatibility). Output parameters are also handled differently now.
Build 1
- SYS: Fix NPE in SoftCache when key doesn't exist
- WF: Imply 'Name' property on instantiation if not explicity declared