CVS: jfor/src/org/jfor/jfor/main CmdLineConverter.java,1.5,1.6 JForVersionInfo.java,1.24,1.25
Bertrand Delacretaz <[email protected]> Fri, 12 Jul 2002 01:08:33 -0700
| Newsgroups | gmane.text.xml.jfor.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jfor/jfor/src/org/jfor/jfor/main In directory usw-pr-cvs1:/tmp/cvs-serv11506/src/org/jfor/jfor/main Modified Files: CmdLineConverter.java JForVersionInfo.java Log Message: License changed to jfor Apache-style license Index: CmdLineConverter.java =================================================================== RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/main/CmdLineConverter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CmdLineConverter.java 9 Oct 2001 09:56:11 -0000 1.5 --- CmdLineConverter.java 12 Jul 2002 08:08:31 -0000 1.6 *************** *** 11,32 **** * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org * ! * The contents of this file are subject to the Mozilla Public ! * License Version 1.1 (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.mozilla.org/MPL/ * ! * Software distributed under the License is distributed on an "AS ! * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ! * implied. See the License for the specific language governing ! * rights and limitations under the License. * ! * The Original Code is the contents of this java source file, as distributed ! * on www.sourceforge.net/projects/jfor and/or www.jfor.org. * ! * The Initial Developer of the Original Code is Bertrand Delacrétaz, ! * codeconsult, Cugy/Lausanne, Switzerland [email protected]. ! * Portions created by Bertrand Delacrétaz are Copyright (C) 2001 codeconsult, ! * Bertrand Delacrétaz. All Rights Reserved. * * Contributor(s): * @author Andreas Putz [email protected] --- 11,57 ---- * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org * ! * ==================================================================== ! * jfor Apache-Style Software License. ! * Copyright (c) 2002 by the jfor project. 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 acknowledgment: ! * "This product includes software developed ! * by the jfor project (http://www.jfor.org)." ! * Alternately, this acknowledgment may appear in the software itself, ! * if and wherever such third-party acknowledgments normally appear. ! * ! * 4. The name "jfor" must not be used to endorse ! * or promote products derived from this software without prior written ! * permission. For written permission, please contact [email protected]. * + * 5. Products derived from this software may not be called "jfor", + * nor may "jfor" appear in their name, without prior written + * permission of [email protected]. + * + * 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 JFOR PROJECT 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. + * ==================================================================== * Contributor(s): * @author Andreas Putz [email protected] *************** *** 40,43 **** --- 65,71 ---- // $Id$ // $Log$ + // Revision 1.6 2002/07/12 08:08:31 bdelacretaz + // License changed to jfor Apache-style license + // // Revision 1.5 2001/10/09 09:56:11 bdelacretaz // V0.5.1 - bug 469494 fixed, pathnames were not supported at the windows command-line Index: JForVersionInfo.java =================================================================== RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/main/JForVersionInfo.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** JForVersionInfo.java 1 Jul 2002 13:27:16 -0000 1.24 --- JForVersionInfo.java 12 Jul 2002 08:08:31 -0000 1.25 *************** *** 4,25 **** * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org * ! * The contents of this file are subject to the Mozilla Public ! * License Version 1.1 (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.mozilla.org/MPL/ * ! * Software distributed under the License is distributed on an "AS ! * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ! * implied. See the License for the specific language governing ! * rights and limitations under the License. * ! * The Original Code is the contents of this java source file, as distributed ! * on www.sourceforge.net/projects/jfor and/or www.jfor.org. * ! * The Initial Developer of the Original Code is Bertrand Delacrétaz, ! * codeconsult, Cugy/Lausanne, Switzerland [email protected]. ! * Portions created by Bertrand Delacrétaz are Copyright (C) 2001 codeconsult, ! * Bertrand Delacrétaz. All Rights Reserved. * * Contributor(s): * @author Andreas Putz [email protected] --- 4,50 ---- * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org * ! * ==================================================================== ! * jfor Apache-Style Software License. ! * Copyright (c) 2002 by the jfor project. 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 acknowledgment: ! * "This product includes software developed ! * by the jfor project (http://www.jfor.org)." ! * Alternately, this acknowledgment may appear in the software itself, ! * if and wherever such third-party acknowledgments normally appear. ! * ! * 4. The name "jfor" must not be used to endorse ! * or promote products derived from this software without prior written ! * permission. For written permission, please contact [email protected]. * + * 5. Products derived from this software may not be called "jfor", + * nor may "jfor" appear in their name, without prior written + * permission of [email protected]. + * + * 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 JFOR PROJECT 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. + * ==================================================================== * Contributor(s): * @author Andreas Putz [email protected] *************** *** 33,36 **** --- 58,64 ---- // $Id$ // $Log$ + // Revision 1.25 2002/07/12 08:08:31 bdelacretaz + // License changed to jfor Apache-style license + // // Revision 1.24 2002/07/01 13:27:16 rmarra // V0.6.5 jfor-cmd removed, ParagraphKeepTogether implemented using standard FO "keep-together" element attribute. *************** *** 183,188 **** public class JForVersionInfo { private static final int VERSION_MAJOR = 0; ! private static final int VERSION_MINOR = 6; ! private static final String VERSION_MINOR_MINOR = "5"; private static final String PROJECT_URL = "http://www.jfor.org"; --- 211,216 ---- public class JForVersionInfo { private static final int VERSION_MAJOR = 0; ! private static final int VERSION_MINOR = 7; ! private static final String VERSION_MINOR_MINOR = "0rc1"; private static final String PROJECT_URL = "http://www.jfor.org"; ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Gadgets, caffeine, t-shirts, fun stuff. http://thinkgeek.com/sf