You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/03 23:13:08 UTC
svn commit: r1333619 -
/ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java
Author: doogie
Date: Thu May 3 21:13:08 2012
New Revision: 1333619
URL: http://svn.apache.org/viewvc?rev=1333619&view=rev
Log:
FIX: Oops, my bad. Originally, this was never meant to actually be committed
upstream. However, I decided that it might be generally useful, so
committed it anyways. I forgot that I needed to add the copyright
header to it. I suppose I should add a pre-commit hook somehow either
in svn or git.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java?rev=1333619&r1=1333618&r2=1333619&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java Thu May 3 21:13:08 2012
@@ -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.base.crypto;
public class Main {
(backporting kek) Re: svn commit: r1333619 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java
Posted by Adam Heath <do...@brainfood.com>.
On 05/04/2012 12:11 AM, Jacopo Cappellato wrote:
> Hi Adam,
>
> are you going to backport this (and other relevant commits) to the 12.04 branch as well?
I plan to, yes, but I'm going to finish up the kek(key-encrypting-key)
support first. I've got the code done, just need to do more testing.
Re: svn commit: r1333619 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java
Posted by Jacopo Cappellato <ja...@hotwaxmedia.com>.
Hi Adam,
are you going to backport this (and other relevant commits) to the 12.04 branch as well?
Thanks,
Jacopo
On May 3, 2012, at 11:13 PM, doogie@apache.org wrote:
> Author: doogie
> Date: Thu May 3 21:13:08 2012
> New Revision: 1333619
>
> URL: http://svn.apache.org/viewvc?rev=1333619&view=rev
> Log:
> FIX: Oops, my bad. Originally, this was never meant to actually be committed
> upstream. However, I decided that it might be generally useful, so
> committed it anyways. I forgot that I needed to add the copyright
> header to it. I suppose I should add a pre-commit hook somehow either
> in svn or git.
>
> Modified:
> ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java?rev=1333619&r1=1333618&r2=1333619&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/Main.java Thu May 3 21:13:08 2012
> @@ -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.base.crypto;
>
> public class Main {
>
>