You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/08/20 14:10:58 UTC
svn commit: r806137 - in /ofbiz/branches/release09.04: ./
applications/content/config/ applications/content/template/email/
specialpurpose/cmssite/webapp/ofbizsite/images/
specialpurpose/pos/src/org/ofbiz/pos/screen/
Author: jleroux
Date: Thu Aug 20 12:10:57 2009
New Revision: 806137
URL: http://svn.apache.org/viewvc?rev=806137&view=rev
Log:
"Applied fix from trunk for revision: 806127"
------------------------------------------------------------------------
r806127 | jleroux | 2009-08-20 13:24:07 +0200 (jeu. 20 ao–t 2009) | 1 ligne
------------------------------------------------------------------------
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/content/config/forum.properties
ofbiz/branches/release09.04/applications/content/template/email/servicenotification.ftl
ofbiz/branches/release09.04/specialpurpose/cmssite/webapp/ofbizsite/images/ofbws.css
ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 20 12:10:57 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127
Modified: ofbiz/branches/release09.04/applications/content/config/forum.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/content/config/forum.properties?rev=806137&r1=806136&r2=806137&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/content/config/forum.properties (original)
+++ ofbiz/branches/release09.04/applications/content/config/forum.properties Thu Aug 20 12:10:57 2009
@@ -1 +1,19 @@
-descriptLen=80
\ No newline at end of file
+###############################################################################
+# 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.
+###############################################################################
+descriptLen=80
Modified: ofbiz/branches/release09.04/applications/content/template/email/servicenotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/content/template/email/servicenotification.ftl?rev=806137&r1=806136&r2=806137&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/content/template/email/servicenotification.ftl (original)
+++ ofbiz/branches/release09.04/applications/content/template/email/servicenotification.ftl Thu Aug 20 12:10:57 2009
@@ -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/release09.04/specialpurpose/cmssite/webapp/ofbizsite/images/ofbws.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/cmssite/webapp/ofbizsite/images/ofbws.css?rev=806137&r1=806136&r2=806137&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/cmssite/webapp/ofbizsite/images/ofbws.css (original)
+++ ofbiz/branches/release09.04/specialpurpose/cmssite/webapp/ofbizsite/images/ofbws.css Thu Aug 20 12:10:57 2009
@@ -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.
+ */
+
/* Apache general header color R:G:B 82:93:118, #525D76 */
BODY {
Modified: ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java?rev=806137&r1=806136&r2=806137&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java (original)
+++ ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java Thu Aug 20 12:10:57 2009
@@ -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.
+ *******************************************************************************/
package org.ofbiz.pos.screen;
import net.xoetrope.swing.XButton;