incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [3/5] Removed all javax source code from utils package
Date Wed, 08 Aug 2012 20:03:36 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/DiscriminatorType.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/DiscriminatorType.java b/utils/src/javax/persistence/DiscriminatorType.java
deleted file mode 100644
index 7db7dd8..0000000
--- a/utils/src/javax/persistence/DiscriminatorType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-/**
- * Defines supported types of the discriminator column. 
- *
- * @since Java Persistence 1.0
- */
-public enum DiscriminatorType { 
-
-    /** String as the discriminator type */
-    STRING,
-
-    /** Single character as the discriminator type */
-    CHAR,
-
-    /** Integer as the discriminator type */
-    INTEGER
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/DiscriminatorValue.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/DiscriminatorValue.java b/utils/src/javax/persistence/DiscriminatorValue.java
deleted file mode 100644
index a090f42..0000000
--- a/utils/src/javax/persistence/DiscriminatorValue.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Is used to specify the value of the discriminator column for 
- * entities of the given type. The <code>DiscriminatorValue</code> 
- * annotation can only be specified on a concrete entity 
- * class. If the <code>DiscriminatorValue</code> annotation is not 
- * specified and a discriminator column is used, a provider-specific 
- * function will be used to generate a value representing the 
- * entity type.  If the {@link DiscriminatorType} is {@link 
- * DiscriminatorType#STRING STRING}, the discriminator value 
- * default is the entity name. 
- *
- * <p> The inheritance strategy and the discriminator column 
- * are only specified in the root of an entity class hierarchy 
- * or subhierarchy in which a different inheritance strategy is 
- * applied. The discriminator value, if not defaulted, should be 
- * specified for each entity class in the hierarchy.
- *
- * <pre>
- *
- *    Example:
- *
- *    &#064;Entity
- *    &#064;Table(name="CUST")
- *    &#064;Inheritance(strategy=SINGLE_TABLE)
- *    &#064;DiscriminatorColumn(name="DISC", discriminatorType=STRING,length=20)
- *    &#064;DiscriminatorValue("CUSTOMER")
- *    public class Customer { ... }
- *
- *    &#064;Entity
- *    &#064;DiscriminatorValue("VCUSTOMER")
- *    public class ValuedCustomer extends Customer { ... }
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({TYPE}) 
-@Retention(RUNTIME)
-
-public @interface DiscriminatorValue {
-
-    /**
-     * (Optional) The value that indicates that the
-     * row is an entity of the annotated entity type.
-     *
-     * <p> If the <code>DiscriminatorValue</code> annotation is not 
-     * specified and a discriminator column is used, a provider-specific 
-     * function will be used to generate a value representing the 
-     * entity type.  If the DiscriminatorType is {@link 
-     * DiscriminatorType#STRING STRING}, the discriminator value 
-     * default is the entity name. 
-     */
-    String value();
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/ElementCollection.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/ElementCollection.java b/utils/src/javax/persistence/ElementCollection.java
deleted file mode 100644
index ced47e4..0000000
--- a/utils/src/javax/persistence/ElementCollection.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(value = { METHOD, FIELD })
-@Retention(value = RetentionPolicy.RUNTIME)
-public @interface ElementCollection {
-    FetchType fetch() default FetchType.LAZY;
-
-    Class<?> targetClass() default void.class;
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/Embeddable.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/Embeddable.java b/utils/src/javax/persistence/Embeddable.java
deleted file mode 100644
index 2a0107e..0000000
--- a/utils/src/javax/persistence/Embeddable.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Defines a class whose instances are stored as an intrinsic 
- * part of an owning entity and share the identity of the entity. 
- * Each of the persistent properties or fields of the embedded 
- * object is mapped to the database table for the entity. Only 
- * {@link Basic}, {@link Column}, {@link Lob}, 
- * {@link Temporal}, and {@link Enumerated} mapping 
- * annotations may portably be used to map the persistent fields 
- * or properties of classes annotated as {@link Embeddable}.
- *
- * <p> Note that the {@link Transient} annotation may be used to 
- * designate the non-persistent state of an embeddable class.
- *
- * @since Java Persistence 1.0
- */
-@Target({TYPE}) 
-@Retention(RUNTIME)
-
-public @interface Embeddable {
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/Embedded.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/Embedded.java b/utils/src/javax/persistence/Embedded.java
deleted file mode 100644
index c683cde..0000000
--- a/utils/src/javax/persistence/Embedded.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Defines a persistent field or property of an entity whose 
- * value is an instance of an embeddable class. The embeddable 
- * class must be annotated as {@link Embeddable}.
- *
- * <pre>
- *   Example:
- *
- *   &#064;Embedded
- *   &#064;AttributeOverrides({
- *       &#064;AttributeOverride(name="startDate",
- *           column=&#064;Column("EMP_START")),
- *       &#064;AttributeOverride(name="endDate", column=&#064;Column("EMP_END"))
- *   })
- *   public EmploymentPeriod getEmploymentPeriod() { ... }
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-
-public @interface Embedded {
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/EmbeddedId.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/EmbeddedId.java b/utils/src/javax/persistence/EmbeddedId.java
deleted file mode 100644
index 98209cd..0000000
--- a/utils/src/javax/persistence/EmbeddedId.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Is applied to a persistent field or property of an entity 
- * class or mapped superclass to denote a composite primary 
- * key that is an embeddable class. The embeddable class 
- * must be annotated as {@link Embeddable}.
- *
- * <pre>
- *    Example:
- *
- *    &#064;EmbeddedId
- *    protected EmployeePK empPK;
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-
-public @interface EmbeddedId {}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/Entity.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/Entity.java b/utils/src/javax/persistence/Entity.java
deleted file mode 100644
index 55a980a..0000000
--- a/utils/src/javax/persistence/Entity.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Specifies that the class is an entity. This annotation is 
- * applied to the entity class.
- *
- * @since Java Persistence 1.0
- */
-@Target(TYPE) 
-@Retention(RUNTIME)
-
-public @interface Entity {
-
-    /** The name of an entity. Defaults to the unqualified 
-     * name of the entity class. This name is used to
-     * refer to the entity in queries. The name must not be 
-     * a reserved literal in the Java Persistence query language.  */
-    String name() default "";
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/EntityExistsException.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/EntityExistsException.java b/utils/src/javax/persistence/EntityExistsException.java
deleted file mode 100644
index dd2704f..0000000
--- a/utils/src/javax/persistence/EntityExistsException.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when {@link EntityManager#persist(Object) 
- * EntityManager.persist(Object)} is called and the entity
- * already exists. The current transaction, if one is active, 
- * will be marked for rollback.
- *
- * @see javax.persistence.EntityManager#persist(Object)
- *
- * @since Java Persistence 1.0
- */
-@SuppressWarnings("serial")
-public class EntityExistsException extends PersistenceException {
-	
-        /** 
-         * Constructs a new <code>EntityExistsException</code> exception 
-         * with <code>null</code> as its detail message.
-         */
-	public EntityExistsException() {
-		super();
-	}
-
-        /** 
-         * Constructs a new <code>EntityExistsException</code> exception 
-         * with the specified detail message.
-         * @param   message   the detail message.
-         */
-	public EntityExistsException(String message) {
-		super(message);
-	}
-
-        /** 
-         * Constructs a new <code>EntityExistsException</code> exception 
-         * with the specified detail message and cause.
-         * @param   message   the detail message.
-         * @param   cause     the cause.
-         */
-	public EntityExistsException(String message, Throwable cause) {
-		super(message, cause);
-	}
-	
-        /** 
-         * Constructs a new <code>EntityExistsException</code> exception 
-         * with the specified cause.
-         * @param   cause     the cause.
-         */
-	public EntityExistsException(Throwable cause) {
-		super(cause);
-	}
-};
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/EntityListeners.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/EntityListeners.java b/utils/src/javax/persistence/EntityListeners.java
deleted file mode 100644
index 934e3f6..0000000
--- a/utils/src/javax/persistence/EntityListeners.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Specifies the callback listener classes to be used for an 
- * entity or mapped superclass. This annotation may be applied 
- * to an entity class or mapped superclass.
- *
- * @since Java Persistence 1.0
- */
-@Target({TYPE}) 
-@Retention(RUNTIME)
-
-public @interface EntityListeners {
-
-    /** The callback listener classes */
-    Class[] value();
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/EntityNotFoundException.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/EntityNotFoundException.java b/utils/src/javax/persistence/EntityNotFoundException.java
deleted file mode 100755
index dee489b..0000000
--- a/utils/src/javax/persistence/EntityNotFoundException.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when an entity reference obtained by
- * {@link EntityManager#getReference EntityManager.getReference(Class,Object)}
- * is accessed but the entity does not exist. Also thrown when 
- * {@link EntityManager#refresh EntityManager.refresh(Object)} is called 
- * and the object no longer exists in the database. The 
- * current transaction, if one is active, will be marked for rollback.
- *
- * @see javax.persistence.EntityManager#getReference(Class,Object)
- * @see javax.persistence.EntityManager#refresh(Object)
- *
- * @since Java Persistence 1.0
- */
-@SuppressWarnings("serial")
-public class EntityNotFoundException extends PersistenceException {
-	
-        /**
-         * Constructs a new <code>EntityNotFoundException</code> exception
-         * with <code>null</code> as its detail message.
-         */
-	public EntityNotFoundException() {
-		super();
-	}
-
-        /**
-         * Constructs a new <code>EntityNotFoundException</code> exception
-         * with the specified detail message.
-         * @param   message   the detail message.
-         */
-	public EntityNotFoundException(String message) {
-		super(message);
-	}
-
-};

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/EntityResult.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/EntityResult.java b/utils/src/javax/persistence/EntityResult.java
deleted file mode 100644
index 0133fe7..0000000
--- a/utils/src/javax/persistence/EntityResult.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * References an entity in the SELECT clause of a SQL query.
- * If this annotation is used, the SQL statement should select 
- * all of the columns that are mapped to the entity object. 
- * This should include foreign key columns to related entities. 
- * The results obtained when insufficient data is available 
- * are undefined.
- *
- * <pre>
- *   Example
- *   Query q = em.createNativeQuery(
- *       "SELECT o.id, o.quantity, o.item, i.id, i.name, i.description "+
- *           "FROM Order o, Item i " +
- *           "WHERE (o.quantity > 25) AND (o.item = i.id)",
- *       "OrderItemResults");
- *   &#064;SqlResultSetMapping(name="OrderItemResults",
- *       entities={
- *           &#064;EntityResult(entityClass=com.acme.Order.class),
- *           &#064;EntityResult(entityClass=com.acme.Item.class)
- *   })
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({}) 
-@Retention(RUNTIME)
-
-public @interface EntityResult { 
-
-    /** The class of the result */
-    Class entityClass(); 
-
-    /** 
-     * Maps the columns specified in the SELECT list of the 
-     * query to the properties or fields of the entity class. 
-     */
-    FieldResult[] fields() default {};
-
-    /** 
-     * Specifies the column name (or alias) of the column in 
-     * the SELECT list that is used to determine the type of 
-     * the entity instance.
-     */
-    String discriminatorColumn() default "";
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/EntityTransaction.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/EntityTransaction.java b/utils/src/javax/persistence/EntityTransaction.java
deleted file mode 100755
index 26629f2..0000000
--- a/utils/src/javax/persistence/EntityTransaction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-/**
- * The <code>EntityTransaction</code> interface is used to control 
- * resource transactions on resource-local entity managers. The 
- * {@link EntityManager#getTransaction EntityManager.getTransaction()} 
- * method returns the <code>EntityTransaction</code> interface.
- *
- * @since Java Persistence 1.0
- */
-public interface EntityTransaction {
-    /**
-     * Start the resource transaction.
-     * @throws IllegalStateException if {@link #isActive()} is true.
-     */
-    public void begin();
- 
-    /**
-     * Commit the current transaction, writing any unflushed
-     * changes to the database.
-     * @throws IllegalStateException if {@link #isActive()} is false.
-     * @throws RollbackException if the commit fails.
-     */
-    public void commit();
- 
-    /**
-     * Roll back the current transaction
-     * @throws IllegalStateException if {@link #isActive()} is false.
-     * @throws PersistenceException if an unexpected error
-     * condition is encountered.
-     */
-    public void rollback();
-
-    /**
-     * Mark the current transaction so that the only possible
-     * outcome of the transaction is for the transaction to be
-     * rolled back.
-     * @throws IllegalStateException if {@link #isActive()} is false.
-     */
-    public void setRollbackOnly();
-
-    /**
-     * Determine whether the current transaction has been marked
-     * for rollback.
-     * @throws IllegalStateException if {@link #isActive()} is false.
-     */
-    public boolean getRollbackOnly();
- 
-    /**
-     * Indicate whether a transaction is in progress.
-     * @throws PersistenceException if an unexpected error
-     * condition is encountered.
-     */
-    public boolean isActive();
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/EnumType.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/EnumType.java b/utils/src/javax/persistence/EnumType.java
deleted file mode 100644
index b8e3def..0000000
--- a/utils/src/javax/persistence/EnumType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-/**
- * Defines mapping for the enumerated types.
- * The constants of this enumerated type specify how persistent 
- * property or field should be persisted as a enumerated type.
- *
- * @since Java Persistence 1.0
- */
-public enum EnumType {
-    /** Persist enumerated type property or field as an integer */
-    ORDINAL,
-
-    /** Persist enumerated type property or field as a string */
-    STRING
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/Enumerated.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/Enumerated.java b/utils/src/javax/persistence/Enumerated.java
deleted file mode 100644
index 546fc93..0000000
--- a/utils/src/javax/persistence/Enumerated.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static javax.persistence.EnumType.ORDINAL;
-
-/**
- * Specifies that a persistent property or field should be 
- * persisted as a enumerated type. It may be used in conjunction 
- * with the {@link Basic} annotation.
- *
- * <pre>
- *   Example:
- *
- *   public enum EmployeeStatus {FULL_TIME, PART_TIME, CONTRACT}
- *
- *   public enum SalaryRate {JUNIOR, SENIOR, MANAGER, EXECUTIVE}
- *
- *   &#064;Entity public class Employee {
- *       public EmployeeStatus getStatus() {...}
- *       &#064;Enumerated(STRING)
- *       public SalaryRate getPayScale() {...}
- *       ...
- *   }
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({METHOD, FIELD}) 
-@Retention(RUNTIME)
-public @interface Enumerated {
-
-    /** (Optional) The type used in mapping an enum type. */
-    EnumType value() default ORDINAL;
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/FetchType.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/FetchType.java b/utils/src/javax/persistence/FetchType.java
deleted file mode 100644
index dbc2add..0000000
--- a/utils/src/javax/persistence/FetchType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-/**
- * Defines strategies for fetching data from the database.
- * The <code>EAGER</code> strategy is a requirement on the persistence 
- * provider runtime that data must be eagerly fetched. The 
- * <code>LAZY</code> strategy is a hint to the persistence provider 
- * runtime that data should be fetched lazily when it is 
- * first accessed. The implementation is permitted to eagerly 
- * fetch data for which the <code>LAZY</code> strategy hint has been 
- * specified. In particular, lazy fetching might only be 
- * available for {@link Basic} mappings for which property-based 
- * access is used.
- *
- * <pre>
- *   Example:
- *   &#064;Basic(fetch=LAZY)
- *   protected String getName() { return name; }
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-public enum FetchType {
-
-    /** Defines that data can be lazily fetched */
-    LAZY,
-
-    /** Defines that data must be eagerly fetched */
-    EAGER
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/FieldResult.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/FieldResult.java b/utils/src/javax/persistence/FieldResult.java
deleted file mode 100644
index 54bb173..0000000
--- a/utils/src/javax/persistence/FieldResult.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Is used to map the columns specified in the SELECT list 
- * of the query to the properties or fields of the entity class.
- *
- * <pre>
- *
- * Example:
- *   Query q = em.createNativeQuery(
- *       "SELECT o.id AS order_id, " +
- *           "o.quantity AS order_quantity, " +
- *           "o.item AS order_item, " +
- *         "FROM Order o, Item i " +
- *         "WHERE (order_quantity > 25) AND (order_item = i.id)",
- *       "OrderResults");
- *
- *   &#064;SqlResultSetMapping(name="OrderResults",
- *       entities={
- *           &#064;EntityResult(entityClass=com.acme.Order.class, fields={
- *               &#064;FieldResult(name="id", column="order_id"),
- *               &#064;FieldResult(name="quantity", column="order_quantity"),
- *               &#064;FieldResult(name="item", column="order_item")})
- *       })
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({}) 
-@Retention(RUNTIME)
-
-public @interface FieldResult { 
-
-    /** Name of the persistent field or property of the class. */
-    String name();
-
-    /** 
-     * Name of the column in the SELECT clause - i.e., column 
-     * aliases, if applicable. 
-     */
-    String column();
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/FlushModeType.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/FlushModeType.java b/utils/src/javax/persistence/FlushModeType.java
deleted file mode 100644
index ffc49d5..0000000
--- a/utils/src/javax/persistence/FlushModeType.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-/**
- * Flush mode setting.
- *
- * <p> When queries are executed within a transaction, if 
- * <code>FlushModeType.AUTO</code> is set on the {@link Query} 
- * object, or if the flush mode setting for the persistence context 
- * is <code>AUTO</code> (the default) and a flush mode setting has 
- * not been specified for the {@link Query} object, the persistence 
- * provider is responsible for ensuring that all updates to the state 
- * of all entities in the persistence context which could potentially 
- * affect the result of the query are visible to the processing 
- * of the query. The persistence provider implementation may achieve 
- * this by flushing those entities to the database or by some other 
- * means. If <code>FlushModeType.COMMIT</code> is set, the effect 
- * of updates made to entities in the persistence context upon 
- * queries is unspecified.
- *
- * <p> If there is no transaction active, the persistence provider 
- * must not flush to the database.
- *
- * @since Java Persistence 1.0
- */
-public enum FlushModeType {
-
-    /** Flushing must occur only at transaction commit */
-    COMMIT,
-
-    /** (Default) Flushing to occur at query execution */
-    AUTO
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/GeneratedValue.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/GeneratedValue.java b/utils/src/javax/persistence/GeneratedValue.java
deleted file mode 100644
index b9334ae..0000000
--- a/utils/src/javax/persistence/GeneratedValue.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static javax.persistence.GenerationType.AUTO;
-
-/**
- * Provides for the specification of generation strategies for 
- * the values of primary keys. The <code>GeneratedValue</code> 
- * annotation may be applied to a primary key property or
- * field of an entity or mapped superclass in conjunction with 
- * the {@link Id} annotation.
- *
- * <pre>
- *
- * Example 1:
- *
- *     &#064;Id
- *     &#064;GeneratedValue(strategy=SEQUENCE, generator="CUST_SEQ")
- *     &#064;Column(name="CUST_ID")
- *     public Long getId() { return id; }
- *
- *     Example 2:
- *
- *     &#064;Id
- *     &#064;GeneratedValue(strategy=TABLE, generator="CUST_GEN")
- *     &#064;Column(name="CUST_ID")
- *     Long id;
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-
-public @interface GeneratedValue {
-
-    /**
-     * (Optional) The primary key generation strategy
-     * that the persistence provider must use to
-     * generate the annotated entity primary key.
-     */
-    GenerationType strategy() default AUTO;
-
-    /**
-     * (Optional) The name of the primary key generator
-     * to use as specified in the {@link SequenceGenerator} 
-     * or {@link TableGenerator} annotation.
-     * <p> Defaults to the id generator supplied by persistence provider.
-     */
-    String generator() default "";
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/GenerationType.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/GenerationType.java b/utils/src/javax/persistence/GenerationType.java
deleted file mode 100644
index 963d627..0000000
--- a/utils/src/javax/persistence/GenerationType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-/** 
- * Defines the types of primary key generation. 
- *
- * @since Java Persistence 1.0
- */
-public enum GenerationType { 
-
-    /**
-     * Indicates that the persistence provider must assign 
-     * primary keys for the entity using an underlying 
-     * database table to ensure uniqueness.
-     */
-    TABLE, 
-
-    /**
-     * Indicates that the persistence provider must assign 
-     * primary keys for the entity using database sequence column.
-     */
-    SEQUENCE, 
-
-    /**
-     * Indicates that the persistence provider must assign 
-     * primary keys for the entity using database identity column.
-     */
-    IDENTITY, 
-
-    /**
-     * Indicates that the persistence provider should pick an 
-     * appropriate strategy for the particular database. The 
-     * <code>AUTO</code> generation strategy may expect a database 
-     * resource to exist, or it may attempt to create one. A vendor 
-     * may provide documentation on how to create such resources 
-     * in the event that it does not support schema generation 
-     * or cannot create the schema resource at runtime.
-     */
-    AUTO
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/Id.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/Id.java b/utils/src/javax/persistence/Id.java
deleted file mode 100644
index 6a9fca0..0000000
--- a/utils/src/javax/persistence/Id.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Specifies the primary key property or field of an entity.
- *
- * <pre>
- *   Example:
- *
- *   &#064;Id
- *   public Long getId() { return id; }
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-
-public @interface Id {}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/IdClass.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/IdClass.java b/utils/src/javax/persistence/IdClass.java
deleted file mode 100644
index 3a5eef7..0000000
--- a/utils/src/javax/persistence/IdClass.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Specifies a composite primary key class that is mapped to 
- * multiple fields or properties of the entity.  
- *
- * <p> The names of the fields or properties in the primary key 
- * class and the primary key fields or properties of the entity 
- * must correspond and their types must be the same.
- *
- * <pre>
- *
- *   Example:
- *
- *   &#064;IdClass(com.acme.EmployeePK.class)
- *   &#064;Entity
- *   public class Employee {
- *     &#064;Id String empName;
- *     &#064;Id Date birthDay;
- *     ...
- *   }
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-
-public @interface IdClass {
-
-    /** Primary key class */
-    Class value();
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/Inheritance.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/Inheritance.java b/utils/src/javax/persistence/Inheritance.java
deleted file mode 100644
index abcb4a5..0000000
--- a/utils/src/javax/persistence/Inheritance.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static javax.persistence.InheritanceType.SINGLE_TABLE;
-
-/**
- * Defines the inheritance strategy to be used for an entity class 
- * hierarchy. It is specified on the entity class that is the root 
- * of the entity class hierarchy.
- *
- * <pre>
- *
- *   Example:
- *
- *   &#064;Entity
- *   &#064;Inheritance(strategy=JOINED)
- *   public class Customer { ... }
- *
- *   &#064;Entity
- *   public class ValuedCustomer extends Customer { ... }
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-
-public @interface Inheritance {
-
-    /** The strategy to be used */
-    InheritanceType strategy() default SINGLE_TABLE;
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/InheritanceType.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/InheritanceType.java b/utils/src/javax/persistence/InheritanceType.java
deleted file mode 100644
index 5c7906f..0000000
--- a/utils/src/javax/persistence/InheritanceType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-/**
- * Defines inheritance strategy options.
- *
- * @since Java Persistence 1.0
- */
-public enum InheritanceType { 
-
-    /** A single table per class hierarchy */
-    SINGLE_TABLE, 
-
-    /** A table per concrete entity class */
-    TABLE_PER_CLASS, 
-
-    /** 
-     * A strategy in which fields that are specific to a 
-     * subclass are mapped to a separate table than the fields 
-     * that are common to the parent class, and a join is 
-     * performed to instantiate the subclass.
-     */
-    JOINED 
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/JoinColumn.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/JoinColumn.java b/utils/src/javax/persistence/JoinColumn.java
deleted file mode 100644
index f24be9d..0000000
--- a/utils/src/javax/persistence/JoinColumn.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Is used to specify a mapped column for joining an entity association.
- *
- * <pre>
- *   Example:
- *
- *   &#064;ManyToOne
- *   &#064;JoinColumn(name="ADDR_ID")
- *   public Address getAddress() { return address; }
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-
-public @interface JoinColumn {
-
-    /** 
-     * (Optional) The name of the foreign key column.
-     * The table in which it is found depends upon the
-     * context. If the join is for a OneToOne or Many-
-     * ToOne mapping, the foreign key column is in the
-     * table of the source entity. If the join is for a
-     * ManyToMany, the foreign key is in a join table.
-     *
-     * Default (only applies if a single join column is used):
-     * The concatenation of the following: the name of the 
-     * referencing relationship property or field of the referencing 
-     * entity; "_"; the name of the referenced primary key column. 
-     * If there is no such referencing relationship property or 
-     * field in the entity, the join column name is formed as the 
-     * concatenation of the following: the name of the entity; "_"; 
-     * the name of the referenced primary key column.
-     */
-    String name() default "";
-
-    /**
-     * (Optional) The name of the column referenced
-     * by this foreign key column. When used with
-     * relationship mappings, the referenced column is
-     * in the table of the target entity. When used inside
-     * a JoinTable annotation, the referenced key column
-     * is in the entity table of the owning entity, or
-     * inverse entity if the join is part of the inverse join
-     * definition.
-     *
-     * Default (only applies if single join column is being 
-     * used): The same name as the primary key column of the 
-     * referenced table.
-     */
-    String referencedColumnName() default "";
-
-    /**
-     * (Optional) Whether the property is a unique key.
-     * This is a shortcut for the UniqueConstraint annotation
-     * at the table level and is useful for when the
-     * unique key constraint is only a single field. It is
-     * not necessary to explicitly specify this for a join
-     * column that corresponds to a primary key that is
-     * part of a foreign key.
-     */
-    boolean unique() default false;
-
-    /** (Optional) Whether the foreign key column is nullable. */
-    boolean nullable() default true;
-
-    /**
-     * (Optional) Whether the column is included in
-     * SQL INSERT statements generated by the persistence
-     * provider.
-     */
-    boolean insertable() default true;
-
-    /**
-     * (Optional) Whether the column is included in
-     * SQL UPDATE statements generated by the persistence
-     * provider.
-     */
-    boolean updatable() default true;
-
-    /**
-     * (Optional) The SQL fragment that is used when
-     * generating the DDL for the column.
-     * <p> Defaults to the generated SQL for the column.
-     */
-    String columnDefinition() default "";
-
-    /**
-     * (Optional) The name of the table that contains
-     * the column. If a table is not specified, the column
-     * is assumed to be in the primary table of the
-     * applicable entity.
-     */
-    String table() default "";
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/457f3b3d/utils/src/javax/persistence/JoinColumns.java
----------------------------------------------------------------------
diff --git a/utils/src/javax/persistence/JoinColumns.java b/utils/src/javax/persistence/JoinColumns.java
deleted file mode 100644
index e1f85f4..0000000
--- a/utils/src/javax/persistence/JoinColumns.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Defines mapping for the composite foreign keys. This annotation 
- * groups {@link JoinColumn} annotations for the same relationship.
- *
- * <p> When the <code>JoinColumns</code> annotation is used, 
- * both the {@link JoinColumn#name name} and the {@link 
- * JoinColumn#referencedColumnName referencedColumnName} elements 
- * must be specified in each such {@link JoinColumn} annotation.
- *
- * <pre>
- *
- *    Example:
- *    &#064;ManyToOne
- *    &#064;JoinColumns({
- *        &#064;JoinColumn(name="ADDR_ID", referencedColumnName="ID"),
- *        &#064;JoinColumn(name="ADDR_ZIP", referencedColumnName="ZIP")
- *    })
- *    public Address getAddress() { return address; }
- * </pre>
- *
- * @since Java Persistence 1.0
- */
-@Target({METHOD, FIELD}) 
-@Retention(RUNTIME)
-
-public @interface JoinColumns {
-    JoinColumn[] value();
-}


Mime
View raw message