On Wed, Aug 8, 2012 at 4:41 PM, Alex Huang <alex.hu...@citrix.com> wrote: > Chip, > > I've removed the Base64 file from the utils branch. > >> Sun Licenses: >> Alex is working on removing these files, and pulling in a jar during >> build. >> We'll need to add the CDDL licensing to the NOTICE file once that work's >> complete. >> incubator-cloudstack/utils/src/javax/ejb/Local.java >> incubator-cloudstack/utils/src/javax/persistence/AssociationOverride.java >> incubator- >> cloudstack/utils/src/javax/persistence/AssociationOverrides.java > > I've removed these files and pulled in the following two jars from the maven > repository: cloud-ejb-api-3.0.jar and cloud-javax.persistence-2.0.0.jar. > I've placed the files into the deps directory so when we decide on what to do > with dependency, we can handle these files together. > > During the removal, I realized people have actually changed these > annotations. Here's how I dealt with the changes. > > - encryptTable was added to the Column annotation: I added an Encrypt > annotation and changed all of the fields that had this set to true to have > the @Encrypt annotation. I would prefer that we do not deviate from standard > javax.persistence even in this case but we'll have to deal with that later. > I've filed http://bugs.cloudstack.org/browse/CS-15918 for someone to look > into removing the @Encrypt annotation altogether. > > - join was added to the SecondaryTable annotation. I added JoinType > annotation to replace this modification for now. I've filed > http://bugs.cloudstack.org/browse/CS-15920 for someone to remove the JoinType > annotation. The usage for this is only at SecurityGroupRulesVO and that is > only used for API so we should be able to remove it once API moves to a > different search framework. > > --Alex >
Alex, Thanks for that! I just found another instance of base64.java: test/src/com/cloud/sample/Base64.java Can you confirm if this can be removed as well please? -chip
