You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2006/07/20 10:22:13 UTC
svn commit: r423821 - in
/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes:
appbar.ftl appheader.ftl countries.ftl countries.jsp envsetup.jsp
footer.ftl header.ftl messages.ftl states.ftl states.jsp
Author: jacopoc
Date: Thu Jul 20 01:22:12 2006
New Revision: 423821
URL: http://svn.apache.org/viewvc?rev=423821&view=rev
Log:
License change from MIT to ASL2.0 for the files of the webtools component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appbar.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.jsp
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/envsetup.jsp
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.jsp
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appbar.ftl?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appbar.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appbar.ftl Thu Jul 20 01:22:12 2006
@@ -1,27 +1,17 @@
<#--
- * 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 Andy Zeneski (jaz@ofbiz.org)
- *@version $Rev$
- *@since 3.0
+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.
-->
<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security></#if>
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl Thu Jul 20 01:22:12 2006
@@ -1,28 +1,17 @@
<#--
- * 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.
- *
- *@author Andy Zeneski (jaz@ofbiz.org)
- *@author Catherine.Heintz@nereide.biz (migration to UiLabel)
- *@version $Rev$
- *@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.
-->
<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security></#if>
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.ftl?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.ftl Thu Jul 20 01:22:12 2006
@@ -1,8 +1,21 @@
+<#--
+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.
+-->
<#assign geoFindMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("geoTypeId", "COUNTRY")>
<#assign geoOrderList = Static["org.ofbiz.base.util.UtilMisc"].toList("geoName")>
<#assign countries = delegator.findByAndCache("Geo", geoFindMap, geoOrderList)>
<#list countries as country>
<option value='${country.geoId}'>${country.geoName?default(country.geoId)}</option>
</#list>
-
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.jsp
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.jsp?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.jsp (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/countries.jsp Thu Jul 20 01:22:12 2006
@@ -1,7 +1,17 @@
-<option value="United States">United States
-<option value="Canada">Canada
-
-
+<%--
+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.
+--%>
+<option value="United States">United States
+<option value="Canada">Canada
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/envsetup.jsp
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/envsetup.jsp?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/envsetup.jsp (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/envsetup.jsp Thu Jul 20 01:22:12 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.
+--%>
<%@ page import="java.util.*, java.net.*" %>
<%@ page import="org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*, org.ofbiz.webapp.control.*, org.ofbiz.base.util.collections.*" %>
<%@ page import="org.ofbiz.securityext.login.*, org.ofbiz.common.*" %>
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl Thu Jul 20 01:22:12 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.
+-->
<br/><br/>
<div class="tabletext" align="center">
<div class="tabletext">(c) 2004 The Open For Business Project - <a href="http://www.ofbiz.org" class="tabletext" target="_blank">www.ofbiz.org</a></div>
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl Thu Jul 20 01:22:12 2006
@@ -1,30 +1,18 @@
<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org -->
<#--
- * 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 Andy Zeneski (jaz@ofbiz.org)
- *@author Olivier Heintz (olivier.heintz@nereide.biz)
- *@version $Rev$
- *@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.
-->
<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl Thu Jul 20 01:22:12 2006
@@ -1,4 +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.
+-->
<#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
<#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.ftl?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.ftl Thu Jul 20 01:22:12 2006
@@ -1,8 +1,21 @@
+<#--
+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.
+-->
<#assign geoFindMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("geoTypeId", "STATE")>
<#assign geoOrderList = Static["org.ofbiz.base.util.UtilMisc"].toList("geoName")>
<#assign states = delegator.findByAndCache("Geo", geoFindMap, geoOrderList)>
<#list states as state>
<option value='${state.geoId}'>${state.geoName?default(state.geoId)}</option>
</#list>
-
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.jsp
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.jsp?rev=423821&r1=423820&r2=423821&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.jsp (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/states.jsp Thu Jul 20 01:22:12 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.
+--%>
<option>AK
<option>AL
<option>AR
@@ -64,4 +79,3 @@
<option>Quebec
<option>Sasakatchewan
<option>Yukon
-