Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update jars, licenses, JDK1.5 compatibility (contirb classes) and gen…

…erally synch with HEAD where it makes sense. Will tag as 2.02.006 shortly
  • Loading branch information...
commit ab1feede33a0ea133c4090542ea9ccc6d9eb4697 1 parent 78c9ed4
@jkjome jkjome authored
View
8 .classpath
@@ -3,10 +3,10 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="root/lib/skaringa-r2p6.jar"/>
- <classpathentry kind="lib" path="root/lib/commons-logging-1.0.3.jar"/>
+ <classpathentry kind="lib" path="root/lib/skaringa-r3p7.jar"/>
+ <classpathentry kind="lib" path="root/lib/commons-logging-1.0.4.jar"/>
<classpathentry kind="lib" path="root/lib/junit-3.8.1.jar"/>
- <classpathentry kind="lib" path="root/lib/xstream-1.0.2.jar"/>
- <classpathentry kind="lib" path="root/lib/xpp3_min-1.1.3.4.I.jar"/>
+ <classpathentry kind="lib" path="root/lib/xstream-1.1.2.jar"/>
+ <classpathentry kind="lib" path="root/lib/xpp3_min-1.1.3.4.M.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
4 .cvsignore
@@ -9,3 +9,7 @@ log4j.xml
maven.log
build.dot
build.png
+demo*
+Test*
+ScalabilityTest*
+Query*
View
4 ReleaseFileDescription.txt
@@ -11,7 +11,7 @@ Second number - incremented when a functional or architectural goal is reached;
Third number - incremented when backward compatibility is maintained. This means all 1.02.XXX builds, for example, are backward compatible with 1.02.000.
-Builds are generated with the "alpha" suffix, renamed with the "beta" suffix and have the suffix removed as they reach production stage.
+Builds are generated with the "beta" suffix and have the suffix removed as they reach production stage.
Directory Contents
@@ -42,7 +42,7 @@ Parameters:
-windowtitle "Prevayler(TM) vX.XX.XXX API Documentation"
-header "<b>Prevayler<sup><font size=-2>TM</font></sup><br>The Free Software<br>Prevalence Layer</b>"
-footer "<EM><a href=http://www.prevayler.org><font color="#BB0033"><b>Prevayler Online</b></font></a></EM>"
- -bottom "<font size=-1>'Prevayler' is a trademark of Klaus Wuestefeld.<br>Prevayler Javadoc Copyleft 2001-2003 Klaus Wuestefeld.</font>"
+ -bottom "<font size=-1>'Prevayler' is a trademark of Klaus Wuestefeld.<br>Prevayler Javadoc Copyleft 2001-2004 Klaus Wuestefeld.</font>"
<end>
View
1  build.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="./ant2html.xsl"?>
<!DOCTYPE project [
<!ENTITY general-utility-targets SYSTEM "file:./utility-targets.incl">
<!ENTITY self-customized-targets SYSTEM "file:./custom-targets.incl">
View
6 contrib/socketServer/server/org/prevayler/socketserver/server/Notification.java
@@ -65,8 +65,8 @@ public static synchronized void submit(Long senderID, String message, Object obj
while (i.hasNext()) {
client = (NotificationThread)i.next();
if (client.isAlive()) {
- if (enabledCallbacks.containsKey(client.getId())) {
- HashMap callbacks = (HashMap) enabledCallbacks.get(client.getId());
+ if (enabledCallbacks.containsKey(client.getSocketId())) {
+ HashMap callbacks = (HashMap) enabledCallbacks.get(client.getSocketId());
if (callbacks.containsKey(message)) {
client.submit(senderID, message, obj);
}
@@ -76,7 +76,7 @@ public static synchronized void submit(Long senderID, String message, Object obj
i.remove();
// ...and remove any callbacks registered for it
- enabledCallbacks.remove(client.getId());
+ enabledCallbacks.remove(client.getSocketId());
}
}
}
View
4 contrib/socketServer/server/org/prevayler/socketserver/server/NotificationThread.java
@@ -44,10 +44,10 @@
private Long id;
/**
- * Returns the id.
+ * Returns the socket id.
* @return long
*/
- public Long getId() {
+ public Long getSocketId() {
return id;
}
View
3  root/docs/ObjectPrevalence.html
@@ -166,8 +166,7 @@
wimps.</P><BR><BR>
<B><I><P>You said Prevayler is open-source software. Do you mean it's free?</P></I></B>
-<P>That's right. It is licensed
-under the Lesser General Public License.</P><BR><BR>
+<P>That's right. It is licensed under the BSD License.</P><BR><BR>
<B><I><P>Who is already using Prevayler?</P></I></B>
<P><A HREF="http://www.prevayler.org/wiki.jsp?topic=PrevaylerPioneers">Come and see</A>. Speak your mind.</P><BR><BR>
View
2  root/lib/Skaringa.license.txt
@@ -1,4 +1,4 @@
-Copyright 2002, 2003 (C) The Skaringa team. All Rights Reserved.
+Copyright 2002, 2004 (C) The Skaringa team. All Rights Reserved.
Redistribution and use of this software and associated documentation
("Software"), with or without modification, are permitted provided
View
BIN  root/lib/commons-logging-1.0.3.jar
Binary file not shown
View
262 root/lib/commons-logging.license.txt
@@ -1,60 +1,202 @@
-/*
- * $Header: /Users/justin/Prevayler/prevayler-cvs-final/scm-cvs/prevayler/root/lib/commons-logging.license.txt,v 1.1 2004/03/09 08:38:25 KlausWuestefeld Exp $
- * $Revision: 1.1 $
- * $Date: 2004/03/09 08:38:25 $
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
View
BIN  root/lib/skaringa-r2p6.jar
Binary file not shown
View
BIN  root/lib/skaringa-r3p7.jar
Binary file not shown
View
BIN  root/lib/xpp3_min-1.1.3.4.I.jar
Binary file not shown
View
BIN  root/lib/xstream-1.0.2.jar
Binary file not shown
View
24 sample.build.properties
@@ -34,10 +34,10 @@ proxy.port=8080
# ----- Default Base Path for Dependent Packages -----
dependencies.path=dependencies
-sourceforge.url=http://umn.dl.sourceforge.net
+sourceforge.url=http://easynews.dl.sourceforge.net
# ----- Skaringa -----
-skaringa.version=r2p6
+skaringa.version=r3p7
skaringa.home=${dependencies.path}/skaringa
skaringa.license=${skaringa.home}/doc/license.txt
#skaringa.jar=${skaringa.home}/lib/skaringa-${skaringa.version}.jar
@@ -45,14 +45,14 @@ skaringa.jar=root/lib/skaringa-${skaringa.version}.jar
skaringa.loc=${sourceforge.url}/sourceforge/skaringa/skaringa-${skaringa.version}.tar.gz
# ----- XStream -----
-xstream.version=1.0.2
+xstream.version=1.1.2
xstream.home=${dependencies.path}/xstream-${xstream.version}
#xstream.jar=${xstream.home}/xstream-${xstream.version}.jar
xstream.jar=root/lib/xstream-${xstream.version}.jar
xstream.loc=http://dist.codehaus.org/xstream/jars/xstream-${xstream.version}.jar
# ----- Xml Pull Parser 3rd Edition (XPP3) -----
-xpp3.version=1.1.3.4.I
+xpp3.version=1.1.3.4.M
xpp3.version-sub=_min
xpp3.home=${dependencies.path}/xpp3-${xpp.version}
#xpp3.jar=${xpp3.home}/xpp3${xpp3.version-sub}-${xpp3.version}.jar
@@ -60,25 +60,25 @@ xpp3.jar=root/lib/xpp3${xpp3.version-sub}-${xpp3.version}.jar
xpp3.loc=http://www.extreme.indiana.edu/dist/java-repository/xpp3/jars/xpp3${xpp3.version-sub}-${xpp3.version}.jar
# ----- JGroups -----
-jgroups.version=2.2.1
+jgroups.version=2.2.8
jgroups.home=${dependencies.path}/JGroups-${jgroups.version}.bin
jgroups.jar=${jgroups.home}/jgroups-all.jar
jgroups.loc=${sourceforge.url}/sourceforge/javagroups/JGroups-${jgroups.version}.bin.zip
# ----- Log4j -----
-log4j.version=1.2.8
-log4j.home=${dependencies.path}/jakarta-log4j-${log4j.version}
+log4j.version=1.2.11
+log4j.home=${dependencies.path}/logging-log4j-${log4j.version}
log4j.jar=${log4j.home}/dist/lib/log4j-${log4j.version}.jar
-log4j.loc=http://archive.apache.org/dist/jakarta/log4j/binaries/jakarta-log4j-${log4j.version}.tar.gz
+log4j.loc=http://archive.apache.org/dist/logging/log4j/${log4j.version}/logging-log4j-${log4j.version}.tar.gz
# ----- Commons JXPath -----
-commons-jxpath.version=1.1
+commons-jxpath.version=1.2
commons-jxpath.home=${dependencies.path}/commons-jxpath-${commons-jxpath.version}
commons-jxpath.jar=${commons-jxpath.home}/commons-jxpath-${commons-jxpath.version}.jar
commons-jxpath.loc=http://archive.apache.org/dist/jakarta/commons/jxpath/binaries/commons-jxpath-${commons-jxpath.version}.tar.gz
# ----- Commons Logging -----
-commons-logging.version=1.0.3
+commons-logging.version=1.0.4
commons-logging.home=${dependencies.path}/commons-logging-${commons-logging.version}
commons-logging.license=${commons-logging.home}/LICENSE.txt
#commons-logging.jar=${commons-logging.home}/commons-logging.jar
@@ -117,7 +117,7 @@ app.trademark='${app.Name}' is a trademark of ${app.company}.
app.url=http://www.prevayler.org/
app.year.1st=2001
app.year=2004
-app.version=2.02.005
+app.version=2.02.006
# set these to your requirements to be passed to the javadoc command
# Note that javadoc.jdk.packaglistLoc is used *only* if javadoc.jdk.offline equals "true".
@@ -136,4 +136,4 @@ jar.name.core=${app.name}-${app.version}
jar.name.all=${jar.name.core}-all
dist.name=${app.name}-${app.version}
-cvs.build=$Revision: 1.10.2.6 $
+cvs.build=$Revision: 1.10.2.7 $
View
2  sample.log4j.xml
@@ -13,7 +13,7 @@
<param name="Append" value="false" />
<layout class="org.apache.log4j.PatternLayout">
<!-- Output the elapsed time [thread,context] Priority Class::Method - Text LF -->
- <param name="ConversionPattern" value="%-4r [%t] %-5p %c{1}::%M - %m%n"/>
+ <param name="ConversionPattern" value="%-4r [%t] %-5p %c{2}::%M - %m%n"/>
</layout>
</appender>
<appender name="JUnitAppender" class="org.apache.log4j.FileAppender">
View
1  utility-targets.incl
@@ -168,6 +168,7 @@
<footer><![CDATA[${javadoc.footer}]]></footer>
<bottom><![CDATA[${javadoc.bottom}]]></bottom>
<link offline="${javadoc.jdk.offline}" href="${javadoc.jdk.href}" packagelistLoc="${javadoc.jdk.packagelistLoc}" />
+ <link href="http://xstream.codehaus.org/javadoc/" />
<classpath refid="build.core.classpath" />
</javadoc>
</target>
Please sign in to comment.
Something went wrong with that request. Please try again.