Author: mgentry
Date: Tue Jul 18 14:11:07 2006
New Revision: 423252

URL: http://svn.apache.org/viewvc?rev=423252&view=rev
Log:
Replaced ObjectStyle headers with ASF headers.

Modified:
    
incubator/cayenne/main/trunk/cayenne/cayenne-other/platform-macosx/src/java/org/apache/cayenne/modeler/MacOSXMain.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFBuilder.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFDocumentCreator.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFFonts.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/JarChecker.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenTask.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenerator.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPage.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPageRenderer.java

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/platform-macosx/src/java/org/apache/cayenne/modeler/MacOSXMain.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/platform-macosx/src/java/org/apache/cayenne/modeler/MacOSXMain.java?rev=423252&r1=423251&r2=423252&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/platform-macosx/src/java/org/apache/cayenne/modeler/MacOSXMain.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/platform-macosx/src/java/org/apache/cayenne/modeler/MacOSXMain.java
 Tue Jul 18 14:11:07 2006
@@ -1,58 +1,22 @@
-/* ====================================================================
- * 
- * The ObjectStyle Group Software License, version 1.1
- * ObjectStyle Group - http://objectstyle.org/
- * 
- * Copyright (c) 2002-2005, Andrei (Andrus) Adamchik and individual authors
- * of the software. 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 independent contributors
- *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- * 
- * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, email
- *    "andrus at objectstyle dot org".
- * 
- * 5. Products derived from this software may not be called "ObjectStyle"
- *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
- *    names without prior written permission.
- * 
- * 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 OBJECTSTYLE GROUP 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 and hosted on ObjectStyle Group web site.  For more
- * information on the ObjectStyle Group, please see
- * <http://objectstyle.org/>.
- */
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+
 package org.apache.cayenne.modeler;
 
 import java.io.File;

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFBuilder.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFBuilder.java?rev=423252&r1=423251&r2=423252&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFBuilder.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFBuilder.java
 Tue Jul 18 14:11:07 2006
@@ -1,58 +1,22 @@
-/* ====================================================================
- * 
- * The ObjectStyle Group Software License, version 1.1
- * ObjectStyle Group - http://objectstyle.org/
- * 
- * Copyright (c) 2002-2005, Andrei (Andrus) Adamchik and individual authors
- * of the software. 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 independent contributors
- *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- * 
- * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, email
- *    "andrus at objectstyle dot org".
- * 
- * 5. Products derived from this software may not be called "ObjectStyle"
- *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
- *    names without prior written permission.
- * 
- * 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 OBJECTSTYLE GROUP 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 and hosted on ObjectStyle Group web site.  For more
- * information on the ObjectStyle Group, please see
- * <http://objectstyle.org/>.
- */
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+
 package org.apache.cayenne.tools.pdf;
 
 import java.io.ByteArrayInputStream;

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFDocumentCreator.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFDocumentCreator.java?rev=423252&r1=423251&r2=423252&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFDocumentCreator.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFDocumentCreator.java
 Tue Jul 18 14:11:07 2006
@@ -1,58 +1,22 @@
-/* ====================================================================
- *
- * The ObjectStyle Group Software License, version 1.1
- * ObjectStyle Group - http://objectstyle.org/
- *
- * Copyright (c) 2002-2005, Andrei (Andrus) Adamchik and individual authors
- * of the software. 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 independent contributors
- *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, email
- *    "andrus at objectstyle dot org".
- *
- * 5. Products derived from this software may not be called "ObjectStyle"
- *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
- *    names without prior written permission.
- *
- * 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 OBJECTSTYLE GROUP 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 and hosted on ObjectStyle Group web site.  For more
- * information on the ObjectStyle Group, please see
- * <http://objectstyle.org/>.
- */
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+
 package org.apache.cayenne.tools.pdf;
 
 import java.awt.Color;

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFFonts.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFFonts.java?rev=423252&r1=423251&r2=423252&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFFonts.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/pdf/java/org/apache/cayenne/tools/pdf/PDFFonts.java
 Tue Jul 18 14:11:07 2006
@@ -1,58 +1,22 @@
-/* ====================================================================
- *
- * The ObjectStyle Group Software License, version 1.1
- * ObjectStyle Group - http://objectstyle.org/
- *
- * Copyright (c) 2002-2004, Andrei (Andrus) Adamchik and individual authors
- * of the software. 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 independent contributors
- *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, email
- *    "andrus at objectstyle dot org".
- *
- * 5. Products derived from this software may not be called "ObjectStyle"
- *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
- *    names without prior written permission.
- *
- * 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 OBJECTSTYLE GROUP 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 and hosted on ObjectStyle Group web site.  For more
- * information on the ObjectStyle Group, please see
- * <http://objectstyle.org/>.
- */
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+
 
 package org.apache.cayenne.tools.pdf;
 

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/JarChecker.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/JarChecker.java?rev=423252&r1=423251&r2=423252&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/JarChecker.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/JarChecker.java
 Tue Jul 18 14:11:07 2006
@@ -1,58 +1,22 @@
-/* ====================================================================
- * 
- * The ObjectStyle Group Software License, version 1.1
- * ObjectStyle Group - http://objectstyle.org/
- * 
- * Copyright (c) 2002-2005, Andrei (Andrus) Adamchik and individual authors
- * of the software. 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 independent contributors
- *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- * 
- * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, email
- *    "andrus at objectstyle dot org".
- * 
- * 5. Products derived from this software may not be called "ObjectStyle"
- *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
- *    names without prior written permission.
- * 
- * 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 OBJECTSTYLE GROUP 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 and hosted on ObjectStyle Group web site.  For more
- * information on the ObjectStyle Group, please see
- * <http://objectstyle.org/>.
- */
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+
 package org.apache.cayenne.tools.ant;
 
 import java.io.File;

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenTask.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenTask.java?rev=423252&r1=423251&r2=423252&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenTask.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenTask.java
 Tue Jul 18 14:11:07 2006
@@ -1,58 +1,22 @@
-/* ====================================================================
- * 
- * The ObjectStyle Group Software License, version 1.1
- * ObjectStyle Group - http://objectstyle.org/
- * 
- * Copyright (c) 2002-2005, Andrei (Andrus) Adamchik and individual authors
- * of the software. 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 independent contributors
- *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- * 
- * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, email
- *    "andrus at objectstyle dot org".
- * 
- * 5. Products derived from this software may not be called "ObjectStyle"
- *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
- *    names without prior written permission.
- * 
- * 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 OBJECTSTYLE GROUP 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 and hosted on ObjectStyle Group web site.  For more
- * information on the ObjectStyle Group, please see
- * <http://objectstyle.org/>.
- */
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+
 package org.apache.cayenne.tools.ant.docgen;
 
 import org.apache.tools.ant.BuildException;

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenerator.java?rev=423252&r1=423251&r2=423252&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenerator.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocGenerator.java
 Tue Jul 18 14:11:07 2006
@@ -1,58 +1,22 @@
-/* ====================================================================
- * 
- * The ObjectStyle Group Software License, version 1.1
- * ObjectStyle Group - http://objectstyle.org/
- * 
- * Copyright (c) 2002-2005, Andrei (Andrus) Adamchik and individual authors
- * of the software. 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 independent contributors
- *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- * 
- * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, email
- *    "andrus at objectstyle dot org".
- * 
- * 5. Products derived from this software may not be called "ObjectStyle"
- *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
- *    names without prior written permission.
- * 
- * 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 OBJECTSTYLE GROUP 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 and hosted on ObjectStyle Group web site.  For more
- * information on the ObjectStyle Group, please see
- * <http://objectstyle.org/>.
- */
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+
 package org.apache.cayenne.tools.ant.docgen;
 
 import java.io.File;

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPage.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPage.java?rev=423252&r1=423251&r2=423252&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPage.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPage.java
 Tue Jul 18 14:11:07 2006
@@ -1,58 +1,22 @@
-/* ====================================================================
- * 
- * The ObjectStyle Group Software License, version 1.1
- * ObjectStyle Group - http://objectstyle.org/
- * 
- * Copyright (c) 2002-2005, Andrei (Andrus) Adamchik and individual authors
- * of the software. 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 independent contributors
- *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- * 
- * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, email
- *    "andrus at objectstyle dot org".
- * 
- * 5. Products derived from this software may not be called "ObjectStyle"
- *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
- *    names without prior written permission.
- * 
- * 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 OBJECTSTYLE GROUP 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 and hosted on ObjectStyle Group web site.  For more
- * information on the ObjectStyle Group, please see
- * <http://objectstyle.org/>.
- */
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+
 package org.apache.cayenne.tools.ant.docgen;
 
 import java.util.ArrayList;

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPageRenderer.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPageRenderer.java?rev=423252&r1=423251&r2=423252&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPageRenderer.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/src/tools/java/org/apache/cayenne/tools/ant/docgen/DocPageRenderer.java
 Tue Jul 18 14:11:07 2006
@@ -1,58 +1,22 @@
-/* ====================================================================
- * 
- * The ObjectStyle Group Software License, version 1.1
- * ObjectStyle Group - http://objectstyle.org/
- * 
- * Copyright (c) 2002-2005, Andrei (Andrus) Adamchik and individual authors
- * of the software. 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 independent contributors
- *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- * 
- * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, email
- *    "andrus at objectstyle dot org".
- * 
- * 5. Products derived from this software may not be called "ObjectStyle"
- *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
- *    names without prior written permission.
- * 
- * 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 OBJECTSTYLE GROUP 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 and hosted on ObjectStyle Group web site.  For more
- * information on the ObjectStyle Group, please see
- * <http://objectstyle.org/>.
- */
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+
 package org.apache.cayenne.tools.ant.docgen;
 
 import java.io.Writer;


Reply via email to