svn commit: r422872 - /incubator/ofbiz/trunk/applications/content/widget/cms/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r422872 - /incubator/ofbiz/trunk/applications/content/widget/cms/

jacopoc
Author: jacopoc
Date: Mon Jul 17 14:12:16 2006
New Revision: 422872

URL: http://svn.apache.org/viewvc?rev=422872&view=rev
Log:
License change from MIT to ASL2.0 for the files of the content component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).

Modified:
    incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
    incubator/ofbiz/trunk/applications/content/widget/cms/CMSTemplates.xml
    incubator/ofbiz/trunk/applications/content/widget/cms/advancedsearchprep.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/contentaddprep.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/contentprep.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/editaddprep.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/featureprep.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/index.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/ownercontentprep.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/search.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/userpermprep.bsh
    incubator/ofbiz/trunk/applications/content/widget/cms/userpermprepold.bsh

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Mon Jul 17 14:12:16 2006
@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- *  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.
- *
- *  $Id: CMSScreens.xml 7870 2006-06-27 05:41:26Z 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.
 -->
 
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/CMSTemplates.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/CMSTemplates.xml?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/CMSTemplates.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/CMSTemplates.xml Mon Jul 17 14:12:16 2006
@@ -1,5 +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.
+-->
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
 

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/advancedsearchprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/advancedsearchprep.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/advancedsearchprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/advancedsearchprep.bsh Mon Jul 17 14:12:16 2006
@@ -1,28 +1,18 @@
 /*
- *  Copyright (c) 2003 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])
- *@version    $Revision$
- *@since      2.1
-*/
+ * 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.
+ */
 
 import org.ofbiz.base.util.*;
 import org.ofbiz.product.catalog.*;

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh Mon Jul 17 14:12:16 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: cmseditaddprep.bsh 5462 2005-08-05 18:35:48Z jonesde $
- *
- * 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.
  */
 
 import java.util.ArrayList;

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/contentaddprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/contentaddprep.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/contentaddprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/contentaddprep.bsh Mon Jul 17 14:12:16 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: contentaddprep.bsh 5462 2005-08-05 18:35:48Z jonesde $
- *
- * 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.
  */
 
 import java.util.ArrayList;

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/contentprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/contentprep.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/contentprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/contentprep.bsh Mon Jul 17 14:12:16 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: contentprep.bsh 5462 2005-08-05 18:35:48Z jonesde $
- *
- * Copyright (c) 2003 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.
  */
 
 /**

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/editaddprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/editaddprep.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/editaddprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/editaddprep.bsh Mon Jul 17 14:12:16 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: editaddprep.bsh 5462 2005-08-05 18:35:48Z jonesde $
- *
- * 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.
  */
 
 import java.util.ArrayList;

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/featureprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/featureprep.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/featureprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/featureprep.bsh Mon Jul 17 14:12:16 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: featureprep.bsh 5462 2005-08-05 18:35:48Z jonesde $
- *
- * Copyright (c) 2003 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.
  */
 
 /**

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/index.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/index.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/index.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/index.bsh Mon Jul 17 14:12:16 2006
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilValidate;

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh Mon Jul 17 14:12:16 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: mostrecentprep.bsh 5462 2005-08-05 18:35:48Z jonesde $
- *
- * 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.
  */
 
 import java.util.ArrayList;

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/ownercontentprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/ownercontentprep.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/ownercontentprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/ownercontentprep.bsh Mon Jul 17 14:12:16 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: ownercontentprep.bsh 5462 2005-08-05 18:35:48Z jonesde $
- *
- * Copyright (c) 2003 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, department, 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.
  */
 
 /**

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/search.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/search.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/search.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/search.bsh Mon Jul 17 14:12:16 2006
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.Debug;
@@ -141,5 +156,3 @@
                 }
                 context.put("queryResults", contentList);
             }
-
-

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/userpermprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/userpermprep.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/userpermprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/userpermprep.bsh Mon Jul 17 14:12:16 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: userpermprep.bsh 5462 2005-08-05 18:35:48Z jonesde $
- *
- * 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.
  */
 
 import java.util.ArrayList;

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/userpermprepold.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/userpermprepold.bsh?rev=422872&r1=422871&r2=422872&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/userpermprepold.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/userpermprepold.bsh Mon Jul 17 14:12:16 2006
@@ -1,26 +1,17 @@
 /*
- * $Id: userpermprepold.bsh 5462 2005-08-05 18:35:48Z jonesde $
- *
- * 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.
  */
 
 import java.util.ArrayList;