svn commit: r423871 - in /incubator/ofbiz/trunk/framewo
Locked
 
|
Author: jacopoc
Date: Thu Jul 20 03:27:31 2006 New Revision: 423871 URL: http://svn.apache.org/viewvc?rev=423871&view=rev Log: License change from MIT to ASL2.0 for the files of the catalina component. Thanks to Scott Gray for the patch (Apache OFBIZ-87). Modified: incubator/ofbiz/trunk/framework/catalina/build.xml incubator/ofbiz/trunk/framework/catalina/config/catalina-users.xml incubator/ofbiz/trunk/framework/catalina/config/mime-type.xml incubator/ofbiz/trunk/framework/catalina/entitydef/entitygroup.xml incubator/ofbiz/trunk/framework/catalina/entitydef/entitymodel.xml incubator/ofbiz/trunk/framework/catalina/ofbiz-component.xml incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java Modified: incubator/ofbiz/trunk/framework/catalina/build.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/catalina/build.xml?rev=423871&r1=423870&r2=423871&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/catalina/build.xml (original) +++ incubator/ofbiz/trunk/framework/catalina/build.xml Thu Jul 20 03:27:31 2006 @@ -1,27 +1,18 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2001 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * This is the Open for Business Service Build Script. - * $Id: build.xml 7900 2006-06-29 05:03:20Z jonesde $ +Copyright 2001-2006 The Apache Software Foundation + +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. --> <project name="Catalina" default="jar" basedir="."> Modified: incubator/ofbiz/trunk/framework/catalina/config/catalina-users.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/catalina/config/catalina-users.xml?rev=423871&r1=423870&r2=423871&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/catalina/config/catalina-users.xml (original) +++ incubator/ofbiz/trunk/framework/catalina/config/catalina-users.xml Thu Jul 20 03:27:31 2006 @@ -1,3 +1,18 @@ -<?xml version='1.0' encoding='utf-8'?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright 2001-2006 The Apache Software Foundation + +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. +--> <tomcat-users> </tomcat-users> Modified: incubator/ofbiz/trunk/framework/catalina/config/mime-type.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/catalina/config/mime-type.xml?rev=423871&r1=423870&r2=423871&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/catalina/config/mime-type.xml (original) +++ incubator/ofbiz/trunk/framework/catalina/config/mime-type.xml Thu Jul 20 03:27:31 2006 @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright 2001-2006 The Apache Software Foundation + +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. +--> <mine-type-mapping> Modified: incubator/ofbiz/trunk/framework/catalina/entitydef/entitygroup.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/catalina/entitydef/entitygroup.xml?rev=423871&r1=423870&r2=423871&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/catalina/entitydef/entitygroup.xml (original) +++ incubator/ofbiz/trunk/framework/catalina/entitydef/entitygroup.xml Thu Jul 20 03:27:31 2006 @@ -1,24 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Copyright 2001-2006 The Apache Software Foundation + +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. --> <entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -30,4 +24,4 @@ <entity-group group="org.ofbiz" entity="CatalinaSession" /> -</entitygroup> \ No newline at end of file +</entitygroup> Modified: incubator/ofbiz/trunk/framework/catalina/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/catalina/entitydef/entitymodel.xml?rev=423871&r1=423870&r2=423871&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/catalina/entitydef/entitymodel.xml (original) +++ incubator/ofbiz/trunk/framework/catalina/entitydef/entitymodel.xml Thu Jul 20 03:27:31 2006 @@ -1,32 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/** - * Title: Entity Generator Definitions for the General Data Model - * Description: None - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * @author David E. Jones ([hidden email]) - * @author Andy Zeneski ([hidden email]) - * @version $Rev$ - */ +Copyright 2001-2006 The Apache Software Foundation + +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. --> <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Modified: incubator/ofbiz/trunk/framework/catalina/ofbiz-component.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/catalina/ofbiz-component.xml?rev=423871&r1=423870&r2=423871&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/catalina/ofbiz-component.xml (original) +++ incubator/ofbiz/trunk/framework/catalina/ofbiz-component.xml Thu Jul 20 03:27:31 2006 @@ -1,25 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * $Id: ofbiz-component.xml 5462 2005-08-05 18:35:48Z jonesde $ +Copyright 2001-2006 The Apache Software Foundation + +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. --> <ofbiz-component name="catalina" Modified: incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=423871&r1=423870&r2=423871&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original) +++ incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Thu Jul 20 03:27:31 2006 @@ -1,26 +1,17 @@ /* - * $Id: CatalinaContainer.java 7817 2006-06-19 05:51:51Z jonesde $ - * - * Copyright (c) 2004 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * + * Copyright 2001-2006 The Apache Software Foundation + * + * 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. */ package org.ofbiz.catalina.container; Modified: incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java?rev=423871&r1=423870&r2=423871&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java (original) +++ incubator/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java Thu Jul 20 03:27:31 2006 @@ -1,6 +1,17 @@ /* - * $Id: OfbizStore.java 5462 2005-08-05 18:35:48Z jonesde $ - * + * Copyright 2001-2006 The Apache Software Foundation + * + * 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. */ package org.ofbiz.catalina.container; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |