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 2010/04/18 11:58:03 UTC
svn commit: r935322 - in /ofbiz/branches/release4.0: ./
applications/content/template/email/
applications/ecommerce/webapp/ecommerce/blog/
applications/ecommerce/webapp/ecommerce/images/
framework/example/testdef/assertdata/
Author: jacopoc
Date: Sun Apr 18 09:58:02 2010
New Revision: 935322
URL: http://svn.apache.org/viewvc?rev=935322&view=rev
Log:
Added missing license headers (found using RAT).
Modified:
ofbiz/branches/release4.0/applications/content/template/email/servicenotification.ftl
ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/blog/menubar.ftl
ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/images/blog.css
ofbiz/branches/release4.0/framework/example/testdef/assertdata/TestUserLoginData.xml
ofbiz/branches/release4.0/mergefromtrunk.bat
ofbiz/branches/release4.0/mergefromtrunk.sh
Modified: ofbiz/branches/release4.0/applications/content/template/email/servicenotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/template/email/servicenotification.ftl?rev=935322&r1=935321&r2=935322&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/content/template/email/servicenotification.ftl (original)
+++ ofbiz/branches/release4.0/applications/content/template/email/servicenotification.ftl Sun Apr 18 09:58:02 2010
@@ -1,3 +1,21 @@
+<#--
+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.
+-->
<pre>
The service : ${service.name}
Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/blog/menubar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/blog/menubar.ftl?rev=935322&r1=935321&r2=935322&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/blog/menubar.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/blog/menubar.ftl Sun Apr 18 09:58:02 2010
@@ -1,3 +1,21 @@
+<#--
+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.
+-->
<div id="menubar" style="background-color: #ccc;">
<a href="<@o...@ofbizUrl>" class="headerlink">Home</a>
Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/images/blog.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/images/blog.css?rev=935322&r1=935321&r2=935322&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/images/blog.css (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/images/blog.css Sun Apr 18 09:58:02 2010
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
.blogs {
position: inherit;
width: inherit;
Modified: ofbiz/branches/release4.0/framework/example/testdef/assertdata/TestUserLoginData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/example/testdef/assertdata/TestUserLoginData.xml?rev=935322&r1=935321&r2=935322&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/example/testdef/assertdata/TestUserLoginData.xml (original)
+++ ofbiz/branches/release4.0/framework/example/testdef/assertdata/TestUserLoginData.xml Sun Apr 18 09:58:02 2010
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
<entity-engine-xml>
<UserLogin userLoginId="system" currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" />
<UserLogin userLoginId="anonymous" currentPassword="anonymous" />
Modified: ofbiz/branches/release4.0/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/mergefromtrunk.bat?rev=935322&r1=935321&r2=935322&view=diff
==============================================================================
--- ofbiz/branches/release4.0/mergefromtrunk.bat (original)
+++ ofbiz/branches/release4.0/mergefromtrunk.bat Sun Apr 18 09:58:02 2010
@@ -1,3 +1,21 @@
+rem #####################################################################
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem #####################################################################
rem interactive DOS version of mergefromtrunk.sh.
rem to use : launch and pass the trunk version number to merge in release
Modified: ofbiz/branches/release4.0/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/mergefromtrunk.sh?rev=935322&r1=935321&r2=935322&view=diff
==============================================================================
--- ofbiz/branches/release4.0/mergefromtrunk.sh (original)
+++ ofbiz/branches/release4.0/mergefromtrunk.sh Sun Apr 18 09:58:02 2010
@@ -1,4 +1,22 @@
#!/bin/sh
+#####################################################################
+# 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.
+#####################################################################
set -e
prevRev=`expr $1 - 1`
svn merge -r $prevRev:$1 https://svn.apache.org/repos/asf/ofbiz/trunk