Skip to content

Commit 115de6a

Browse files
committed
upgrade to latest yui compressor, add java.sql.Time to DateSerializer, update outdated link and copyright year in footer
1 parent 2f5580a commit 115de6a

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
app=jabsorb
33

44
# The tag / version given to this build
5-
version=1.3
5+
version=trunk
66

77
# Where the source is found
88
src=./src

build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
jabsorb - a Java to JavaScript Advanced Object Request Broker
44
http://jabsorb.org
55
6-
Copyright 2007-2008 The jabsorb team
6+
Copyright 2007-2009 The jabsorb team
77
88
based on original code from
99
JSON-RPC-Java - a JSON-RPC to Java Bridge with dynamic invocation
@@ -308,7 +308,7 @@
308308
see http://www.julienlecomte.net/yuicompressor/ -->
309309

310310
<echo>Creating jsonrpc-min.js from jsonrpc.js using the YUI compressor.</echo>
311-
<java jar="lib-ant/yuicompressor-2.2.5.jar" fork="true" failonerror="true">
311+
<java jar="lib-ant/yuicompressor-2.4.2.jar" fork="true" failonerror="true">
312312
<arg value="-o"/>
313313
<arg value="${webapp}/jsonrpc-min.js"/>
314314
<arg value="${webapp}/jsonrpc.js"/>
Binary file not shown.

src/org/jabsorb/serializer/impl/DateSerializer.java

+10-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jabsorb - a Java to JavaScript Advanced Object Request Broker
33
* http://www.jabsorb.org
44
*
5-
* Copyright 2007-2008 The jabsorb team
5+
* Copyright 2007-2009 The jabsorb team
66
*
77
* based on original code from
88
* JSON-RPC-Java - a JSON-RPC to Java Bridge with dynamic invocation
@@ -27,6 +27,7 @@
2727
package org.jabsorb.serializer.impl;
2828

2929
import java.sql.Timestamp;
30+
import java.sql.Time;
3031
import java.util.Date;
3132

3233
import org.jabsorb.JSONSerializer;
@@ -52,7 +53,7 @@ public class DateSerializer extends AbstractSerializer
5253
* Classes that this can serialise.
5354
*/
5455
private static Class<?>[] _serializableClasses = new Class[] { Date.class,
55-
Timestamp.class, java.sql.Date.class };
56+
Timestamp.class, java.sql.Date.class, Time.class };
5657

5758
/**
5859
* Classes that this can serialise to.
@@ -113,7 +114,8 @@ public ObjectMatch tryUnmarshall(SerializerState state, Class<?> clazz, Object o
113114
throw new UnmarshallException("no type hint");
114115
}
115116
if (!(java_class.equals("java.util.Date")) &&
116-
!(java_class.equals("java.sql.Timestamp")) &&
117+
!(java_class.equals("java.sql.Timestamp")) &&
118+
!(java_class.equals("java.sql.Time")) &&
117119
!(java_class.equals("java.sql.Date")) )
118120
{
119121
throw new UnmarshallException("not a Date");
@@ -164,6 +166,11 @@ else if (java.sql.Date.class.equals(realClazz))
164166
{
165167
returnValue = new java.sql.Date(time);
166168
}
169+
else if (Time.class.equals(realClazz))
170+
{
171+
returnValue = new Time(time);
172+
}
173+
167174
if (returnValue == null)
168175
{
169176
throw new UnmarshallException("invalid class " + realClazz);

webapps/jsonrpc/footer.jspinc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<td valign="top" style="background-color:white" width="100%">
77
<div style="margin-left: 15px; margin-right: 15px; margin-bottom: 10px; margin-top: 10px;">
88

9-
<div class="copyright">Copyright &copy;2007-2008 <a href="http://code.google.com/p/jabsorb/">The <%=appName%> team</a> </div>
9+
<div class="copyright">Copyright &copy;2007-2009 <a href="http://jabsorb.org/JabsorbContributors">The <%=appName%> team</a> </div>
1010
<div class="copyright">based on the <a href="http://oss.metaparadigm.com/jsonrpc/" target="jsonrpcjava">JSON-RPC-Java library</a>, Copyright &copy;2006 <a target="metap" href="http://www.metaparadigm.com/">Metaparadigm Pte Ltd</a> </div>
1111

1212
</td>

0 commit comments

Comments
 (0)