openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r803521 [1/4] - in /openjpa/branches/1.3.x: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/
Date Wed, 12 Aug 2009 14:10:58 GMT
Author: mikedd
Date: Wed Aug 12 14:10:57 2009
New Revision: 803521

URL: http://svn.apache.org/viewvc?rev=803521&view=rev
Log:
OPENJPA-1185:
Setting eol-style=native for new files

Modified:
    openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Account.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Address.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/CompUser.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Contact.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Customer.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Department.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Dependent.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/DependentId.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Employee.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Exempt.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/FrequentFlierPlan.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/LineItem.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Magazine.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Manager.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Order.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Phone.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Product.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Publisher.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Request.java   (contents, props changed)
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/TestJPQLSubquery.java   (contents, props changed)

Modified: openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java (original)
+++ openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java Wed Aug 12 14:10:57 2009
@@ -1,238 +1,238 @@
-/*
- * 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.apache.openjpa.kernel.exps;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.openjpa.kernel.jpql.JPQLExpressionBuilder.ParsedJPQL;
-import org.apache.openjpa.meta.ClassMetaData;
-
-/**
- * JPQL / Criteria Query Context
- * @since 2.0, retrofit to 1.3.x
- *
- */
-public class Context implements Serializable {
-
-    public final ParsedJPQL parsed;
-    public ClassMetaData meta;
-    public String schemaAlias;
-    public Subquery subquery;
-    public Expression from = null;
-    public Context cloneFrom = null;
-    private final Context parent;
-    private List subsels = null;
-    private Object select = null;
-    protected int aliasCount = -1; 
-    private Map variables = new HashMap();
-    private Map schemas = new HashMap();
-
-    public Context(ParsedJPQL parsed, Subquery subquery, Context parent) {
-        this.parsed = parsed;
-        this.subquery = subquery;
-        this.parent = parent;
-        if (subquery != null) {
-            this.select = subquery.getSelect();
-            parent.addSubselContext(this);
-        }
-    }
-
-    public void setSubquery(Subquery subquery) {
-        this.subquery = subquery;
-        this.select = subquery.getSelect();
-        parent.addSubselContext(this);
-    }
-    
-    public ClassMetaData meta() {
-        return meta;
-    }
-
-    public String schemaAlias() {
-        return schemaAlias;
-    }
-
-    public Subquery subquery() {
-        return subquery;
-    }
-
-    /**
-     * Returns next table alias to be created.
-     * @return
-     */
-    public int nextAlias() {
-        Context p = this;
-        while (p.subquery != null) {
-            p = p.parent;
-        }
-        p.aliasCount++;
-        return p.aliasCount;
-    }
-
-    /**
-     * Reset alias count for prepared query cache
-     *
-     */
-    public void resetAliasCount() {
-        Context p = this;
-        while (p.subquery != null) {
-            p = p.parent;
-        }
-        p.aliasCount = -1;
-    }
-
-    /**
-     * Register the select for this context.
-     * @param select
-     */
-    public void setSelect(Object select) {
-        this.select = select;
-    }
-
-    /**
-     * Returns the select associated with this context.
-     * @return
-     */
-    public Object getSelect() {
-        return select;
-    }
-
-    /**
-     * Register the subquery context in this context.
-     * @param sub
-     */
-    public void addSubselContext(Context sub) {
-        if (sub == null)
-            return;
-        if (subsels == null)
-            subsels = new ArrayList();
-        subsels.add(sub);
-    }
-
-    /**
-     * Returns the subquery context.
-     * @return
-     */
-    public List getSubselContexts() {
-        return subsels;
-    }
-
-    /**
-     * Returns the subquery in this context.
-     * @return
-     */
-    public Subquery getSubquery() {
-        return subquery;
-    }
-
-    public Context getParent() {
-        return parent;
-    }
-
-    public void addVariable(String id, Value var) {
-        variables.put(id.toLowerCase(), var);
-    }
-
-    public Map getVariables() {
-        return variables;
-    }
-    
-    public void setVariables(Map variables) {
-        this.variables = variables;
-    }
-
-    public void addSchema(String id, ClassMetaData meta) {
-        schemas.put(id.toLowerCase(), meta);
-    }
-
-    public ClassMetaData getSchema(String id) {
-        if (id != null)
-            return (ClassMetaData) schemas.get(id.toLowerCase());
-        return null;
-    }
-    
-    public Map getSchemas() {
-        return schemas;
-    }
-    
-    public void setSchemas(Map schemas) {
-        this.schemas = schemas;
-    }
-
-    /**
-     * Given an alias and return its associated variable.
-     * @param alias
-     * @return
-     */
-    public Value getVariable(String alias) {
-        Value variable = alias == null ? null 
-            : (Value) variables.get(alias.toLowerCase());
-        return variable;
-    }
-
-    /**
-     * Given an alias find the context of its associated
-     * variable where it is defined.
-     * @param alias
-     * @return
-     */
-    public Context findContext(String alias) {
-        Value var = getVariable(alias);
-        if (var != null)
-            return this;
-        for (Context p = parent; p != null; ) {
-            var = p.getVariable(alias);
-            if (var != null)
-                return p;
-            p = p.parent;
-        }
-        if (subsels != null) {
-            for (Object subsel : subsels) {
-                if (subsel != null) {
-                    var = ((Context) subsel).getVariable(alias);
-                    if (var != null)
-                        return (Context) subsel;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Given an alias find the variable in JPQL contexts.
-     * @param alias
-     * @return
-     */
-    public Value findVariable(String alias) {
-        Value var = getVariable(alias);
-        if (var != null)
-            return var;
-        for (Context p = parent; p != null; ) {
-            var = p.getVariable(alias);
-            if (var != null)
-                return var;
-            p = p.parent;
-        }
-        return null;
-    }
-}
-
+/*
+ * 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.apache.openjpa.kernel.exps;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.openjpa.kernel.jpql.JPQLExpressionBuilder.ParsedJPQL;
+import org.apache.openjpa.meta.ClassMetaData;
+
+/**
+ * JPQL / Criteria Query Context
+ * @since 2.0, retrofit to 1.3.x
+ *
+ */
+public class Context implements Serializable {
+
+    public final ParsedJPQL parsed;
+    public ClassMetaData meta;
+    public String schemaAlias;
+    public Subquery subquery;
+    public Expression from = null;
+    public Context cloneFrom = null;
+    private final Context parent;
+    private List subsels = null;
+    private Object select = null;
+    protected int aliasCount = -1; 
+    private Map variables = new HashMap();
+    private Map schemas = new HashMap();
+
+    public Context(ParsedJPQL parsed, Subquery subquery, Context parent) {
+        this.parsed = parsed;
+        this.subquery = subquery;
+        this.parent = parent;
+        if (subquery != null) {
+            this.select = subquery.getSelect();
+            parent.addSubselContext(this);
+        }
+    }
+
+    public void setSubquery(Subquery subquery) {
+        this.subquery = subquery;
+        this.select = subquery.getSelect();
+        parent.addSubselContext(this);
+    }
+    
+    public ClassMetaData meta() {
+        return meta;
+    }
+
+    public String schemaAlias() {
+        return schemaAlias;
+    }
+
+    public Subquery subquery() {
+        return subquery;
+    }
+
+    /**
+     * Returns next table alias to be created.
+     * @return
+     */
+    public int nextAlias() {
+        Context p = this;
+        while (p.subquery != null) {
+            p = p.parent;
+        }
+        p.aliasCount++;
+        return p.aliasCount;
+    }
+
+    /**
+     * Reset alias count for prepared query cache
+     *
+     */
+    public void resetAliasCount() {
+        Context p = this;
+        while (p.subquery != null) {
+            p = p.parent;
+        }
+        p.aliasCount = -1;
+    }
+
+    /**
+     * Register the select for this context.
+     * @param select
+     */
+    public void setSelect(Object select) {
+        this.select = select;
+    }
+
+    /**
+     * Returns the select associated with this context.
+     * @return
+     */
+    public Object getSelect() {
+        return select;
+    }
+
+    /**
+     * Register the subquery context in this context.
+     * @param sub
+     */
+    public void addSubselContext(Context sub) {
+        if (sub == null)
+            return;
+        if (subsels == null)
+            subsels = new ArrayList();
+        subsels.add(sub);
+    }
+
+    /**
+     * Returns the subquery context.
+     * @return
+     */
+    public List getSubselContexts() {
+        return subsels;
+    }
+
+    /**
+     * Returns the subquery in this context.
+     * @return
+     */
+    public Subquery getSubquery() {
+        return subquery;
+    }
+
+    public Context getParent() {
+        return parent;
+    }
+
+    public void addVariable(String id, Value var) {
+        variables.put(id.toLowerCase(), var);
+    }
+
+    public Map getVariables() {
+        return variables;
+    }
+    
+    public void setVariables(Map variables) {
+        this.variables = variables;
+    }
+
+    public void addSchema(String id, ClassMetaData meta) {
+        schemas.put(id.toLowerCase(), meta);
+    }
+
+    public ClassMetaData getSchema(String id) {
+        if (id != null)
+            return (ClassMetaData) schemas.get(id.toLowerCase());
+        return null;
+    }
+    
+    public Map getSchemas() {
+        return schemas;
+    }
+    
+    public void setSchemas(Map schemas) {
+        this.schemas = schemas;
+    }
+
+    /**
+     * Given an alias and return its associated variable.
+     * @param alias
+     * @return
+     */
+    public Value getVariable(String alias) {
+        Value variable = alias == null ? null 
+            : (Value) variables.get(alias.toLowerCase());
+        return variable;
+    }
+
+    /**
+     * Given an alias find the context of its associated
+     * variable where it is defined.
+     * @param alias
+     * @return
+     */
+    public Context findContext(String alias) {
+        Value var = getVariable(alias);
+        if (var != null)
+            return this;
+        for (Context p = parent; p != null; ) {
+            var = p.getVariable(alias);
+            if (var != null)
+                return p;
+            p = p.parent;
+        }
+        if (subsels != null) {
+            for (Object subsel : subsels) {
+                if (subsel != null) {
+                    var = ((Context) subsel).getVariable(alias);
+                    if (var != null)
+                        return (Context) subsel;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Given an alias find the variable in JPQL contexts.
+     * @param alias
+     * @return
+     */
+    public Value findVariable(String alias) {
+        Value var = getVariable(alias);
+        if (var != null)
+            return var;
+        for (Context p = parent; p != null; ) {
+            var = p.getVariable(alias);
+            if (var != null)
+                return var;
+            p = p.parent;
+        }
+        return null;
+    }
+}
+

Propchange: openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Account.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Account.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Account.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Account.java Wed Aug 12 14:10:57 2009
@@ -1,93 +1,93 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-/**
- * Persistent class used in testing QueryDefinition API.
- */
-@Entity
-@Table(name="CR_ACCT")
-public class Account {
-    @Id
-    @GeneratedValue
-    private long id;
-
-    private int balance;
-    private Integer loan;
-    
-    @ManyToOne
-    private Customer customer;
-    
-    @ManyToOne(optional = false, fetch = FetchType.LAZY)
-    private Product product;
-    
-    private String name;
-
-    public long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getBalance() {
-        return balance;
-    }
-
-    public void setBalance(int balance) {
-        this.balance = balance;
-    }
-
-    public Integer getLoan() {
-        return loan;
-    }
-
-    public void setLoan(Integer loan) {
-        this.loan = loan;
-    }
-    
-    public Product getProduct() {
-        return product;
-    }
-    
-    public void setProduct(Product product) {
-        this.product = product;
-    }
-
-    public Customer getCustomer() {
-        return customer;
-    }
-    
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+/**
+ * Persistent class used in testing QueryDefinition API.
+ */
+@Entity
+@Table(name="CR_ACCT")
+public class Account {
+    @Id
+    @GeneratedValue
+    private long id;
+
+    private int balance;
+    private Integer loan;
+    
+    @ManyToOne
+    private Customer customer;
+    
+    @ManyToOne(optional = false, fetch = FetchType.LAZY)
+    private Product product;
+    
+    private String name;
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getBalance() {
+        return balance;
+    }
+
+    public void setBalance(int balance) {
+        this.balance = balance;
+    }
+
+    public Integer getLoan() {
+        return loan;
+    }
+
+    public void setLoan(Integer loan) {
+        this.loan = loan;
+    }
+    
+    public Product getProduct() {
+        return product;
+    }
+    
+    public void setProduct(Product product) {
+        this.product = product;
+    }
+
+    public Customer getCustomer() {
+        return customer;
+    }
+    
+    public void setCustomer(Customer customer) {
+        this.customer = customer;
+    }
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Account.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Address.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Address.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Address.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Address.java Wed Aug 12 14:10:57 2009
@@ -1,113 +1,113 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-
-/**
- * Used for testing Criteria API.
- * The fields are sometimes not declared as there is no validation yet during 
- * Query construction.
- * 
- */
-@Entity
-@Table(name="CR_ADDR")
-@Embeddable
-public class Address {
-	@Id
-	@GeneratedValue
-	private long id;
-	
-	private String street;
-	private String city;
-	private String state;
-	private String county;
-    private String country;
-	private String zipCode;
-    @OneToOne(mappedBy="address")
-    private CompUser user;
-	
-    public Address(){}
-
-    public Address(String street, String city, String country, String zipcode)
-    {
-        this.street = street;
-        this.city = city;
-        this.country = country;
-        this.zipCode = zipcode;
-    }
-
-    public long getId() {
-        return id;
-    }
-    
-    public String getStreet() {
-        return street;
-    }
-    
-    public void setStreet(String street) {
-        this.street = street;
-    }
-    
-    public String getCity() {
-        return city;
-    }
-    
-    public void setCity(String city) {
-        this.city = city;
-    }
-    
-    public String getCounty() {
-        return county;
-    }
-    
-    public void setCounty(String county) {
-        this.county = county;
-    }
-
-    public String getState() {
-        return state;
-    }
-    
-    public void setState(String state) {
-        this.state = state;
-    }
-    
-    public String getZipcode() {
-        return zipCode;
-    }
-    
-    public String getCountry() {
-        return country;
-    }
-    
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public void setZipcode(String zipCode) {
-        this.zipCode = zipCode;
-    }
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+
+/**
+ * Used for testing Criteria API.
+ * The fields are sometimes not declared as there is no validation yet during 
+ * Query construction.
+ * 
+ */
+@Entity
+@Table(name="CR_ADDR")
+@Embeddable
+public class Address {
+	@Id
+	@GeneratedValue
+	private long id;
+	
+	private String street;
+	private String city;
+	private String state;
+	private String county;
+    private String country;
+	private String zipCode;
+    @OneToOne(mappedBy="address")
+    private CompUser user;
+	
+    public Address(){}
+
+    public Address(String street, String city, String country, String zipcode)
+    {
+        this.street = street;
+        this.city = city;
+        this.country = country;
+        this.zipCode = zipcode;
+    }
+
+    public long getId() {
+        return id;
+    }
+    
+    public String getStreet() {
+        return street;
+    }
+    
+    public void setStreet(String street) {
+        this.street = street;
+    }
+    
+    public String getCity() {
+        return city;
+    }
+    
+    public void setCity(String city) {
+        this.city = city;
+    }
+    
+    public String getCounty() {
+        return county;
+    }
+    
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getState() {
+        return state;
+    }
+    
+    public void setState(String state) {
+        this.state = state;
+    }
+    
+    public String getZipcode() {
+        return zipCode;
+    }
+    
+    public String getCountry() {
+        return country;
+    }
+    
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public void setZipcode(String zipCode) {
+        this.zipCode = zipCode;
+    }
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Address.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/CompUser.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/CompUser.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/CompUser.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/CompUser.java Wed Aug 12 14:10:57 2009
@@ -1,109 +1,109 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import javax.persistence.*;
-import org.apache.openjpa.persistence.*;
-
-@Entity
-@Inheritance(strategy=InheritanceType.SINGLE_TABLE)
-public class CompUser
-{
-	@Basic
-	@Column(length=50)
-	private String name;
-
-	@Basic
-	private int age;
-
-	@Basic
-	@Column(name="compName", length=50)
-	private String computerName;
-
-	@PersistentCollection(fetch=FetchType.EAGER)
-	private String[] nicknames = new String[0];
-
-	@OneToOne(cascade={CascadeType.PERSIST, CascadeType.REMOVE})
-	@JoinColumn(name="ADD_ID")
-	private Address address;
-
-	@Id
-	@GeneratedValue(strategy=GenerationType.AUTO)
-	public int userid;
-	
-    @Enumerated
-    @Basic
-    private CreditRating creditRating;
-	
-	public CompUser(){}
-
-	public CompUser(String name, String cName, Address address, int age)
-	{
-		this.name = name;
-		this.computerName = cName;
-		this.address = address;
-		this.age = age;
-	}
-
-	public String getComputerName() {
-		return computerName;
-	}
-
-	public void setComputerName(String computerName) {
-		this.computerName = computerName;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getUserid() {
-		return userid;
-	}
-
-	public Address getAddress() {
-		return address;
-	}
-
-	public void setAddress(Address address) {
-		this.address = address;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-    public CreditRating getRating() {
-        return creditRating;
-    }
-    
-    public void setRating(CreditRating rating) {
-        this.creditRating = rating;
-    }
-	
-    public enum CreditRating { POOR, GOOD, EXCELLENT };
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import javax.persistence.*;
+import org.apache.openjpa.persistence.*;
+
+@Entity
+@Inheritance(strategy=InheritanceType.SINGLE_TABLE)
+public class CompUser
+{
+	@Basic
+	@Column(length=50)
+	private String name;
+
+	@Basic
+	private int age;
+
+	@Basic
+	@Column(name="compName", length=50)
+	private String computerName;
+
+	@PersistentCollection(fetch=FetchType.EAGER)
+	private String[] nicknames = new String[0];
+
+	@OneToOne(cascade={CascadeType.PERSIST, CascadeType.REMOVE})
+	@JoinColumn(name="ADD_ID")
+	private Address address;
+
+	@Id
+	@GeneratedValue(strategy=GenerationType.AUTO)
+	public int userid;
+	
+    @Enumerated
+    @Basic
+    private CreditRating creditRating;
+	
+	public CompUser(){}
+
+	public CompUser(String name, String cName, Address address, int age)
+	{
+		this.name = name;
+		this.computerName = cName;
+		this.address = address;
+		this.age = age;
+	}
+
+	public String getComputerName() {
+		return computerName;
+	}
+
+	public void setComputerName(String computerName) {
+		this.computerName = computerName;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getUserid() {
+		return userid;
+	}
+
+	public Address getAddress() {
+		return address;
+	}
+
+	public void setAddress(Address address) {
+		this.address = address;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+    public CreditRating getRating() {
+        return creditRating;
+    }
+    
+    public void setRating(CreditRating rating) {
+        this.creditRating = rating;
+    }
+	
+    public enum CreditRating { POOR, GOOD, EXCELLENT };
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/CompUser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Contact.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Contact.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Contact.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Contact.java Wed Aug 12 14:10:57 2009
@@ -1,50 +1,50 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import java.util.List;
-
-import javax.persistence.Embeddable;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-
-@Embeddable
-public class Contact {
-	@OneToOne 
-	private Address address;
-	
-	@OneToMany
-	private List<Phone> phones;
-	
-    public List<Phone> getPhones() {
-        return phones;
-    }
-    
-    public void addPhone(Phone phone) {
-        phones.add(phone);
-    }
-    
-    public Address getAddress() {
-        return address;
-    }
-  
-    public void setAddress(Address address) {
-        this.address = address;
-    }
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import java.util.List;
+
+import javax.persistence.Embeddable;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+@Embeddable
+public class Contact {
+	@OneToOne 
+	private Address address;
+	
+	@OneToMany
+	private List<Phone> phones;
+	
+    public List<Phone> getPhones() {
+        return phones;
+    }
+    
+    public void addPhone(Phone phone) {
+        phones.add(phone);
+    }
+    
+    public Address getAddress() {
+        return address;
+    }
+  
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Contact.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Customer.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Customer.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Customer.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Customer.java Wed Aug 12 14:10:57 2009
@@ -1,159 +1,159 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="CR_CUST")
-public class Customer {
-    @Id
-    @GeneratedValue
-	private long id;
-    
-	private String firstName;
-	private String lastName;
-	private String name;
-	
-	@OneToMany(mappedBy="customer")
-	private Set<Order> orders = new HashSet<Order>(); 
-	
-	private int status;
-	private int balanceOwed;
-	
-	@OneToOne
-	private Address address;
-	
-	private int filledOrderCount;
-	
-    private long accountNum;
-	
-	@OneToMany
-	private List<Account> accounts = new ArrayList<Account>();
-	
-    @Enumerated
-    @Basic
-    private CreditRating creditRating;
-
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-    
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-    
-    public String getLastName() {
-        return lastName;
-    }
-    
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public Set<Order> getOrders() {
-        return orders;
-    }
-    
-    public void setOrders(Set<Order> orders) {
-        this.orders = orders;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public Address getAddress() {
-        return address;
-    }
-
-    public void setAddress(Address address) {
-        this.address = address;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-    
-    public void setStatus(int status) {
-        this.status = status;
-    }
-    
-    public long getAccountNum() {
-        return accountNum;
-    }
-    
-    public void setAccountNum(long accountNum) {
-        this.accountNum = accountNum;
-    }
-
-    public int getBalanceOwed() {
-        return balanceOwed;
-    }
-    
-    public void setBalanceOwed(int balanceOwed) {
-        this.balanceOwed = balanceOwed;
-    }
-	
-    public int getFilledOrderCount() {
-        return filledOrderCount;
-    }
-    
-    public void setFilledOrderCount(int filledOrderCount) {
-        this.filledOrderCount = filledOrderCount;
-    }
-    
-    public List<Account> getAccounts() {
-        return accounts;
-    }
-    
-    public void setAccounts(List<Account> accounts) {
-        this.accounts = accounts;
-    }
-
-    public CreditRating getRating() {
-        return creditRating;
-    }
-    
-    public void setRating(CreditRating rating) {
-        this.creditRating = rating;
-    }
-    
-    public enum CreditRating { POOR, GOOD, EXCELLENT };
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="CR_CUST")
+public class Customer {
+    @Id
+    @GeneratedValue
+	private long id;
+    
+	private String firstName;
+	private String lastName;
+	private String name;
+	
+	@OneToMany(mappedBy="customer")
+	private Set<Order> orders = new HashSet<Order>(); 
+	
+	private int status;
+	private int balanceOwed;
+	
+	@OneToOne
+	private Address address;
+	
+	private int filledOrderCount;
+	
+    private long accountNum;
+	
+	@OneToMany
+	private List<Account> accounts = new ArrayList<Account>();
+	
+    @Enumerated
+    @Basic
+    private CreditRating creditRating;
+
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+    
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+    
+    public String getLastName() {
+        return lastName;
+    }
+    
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public Set<Order> getOrders() {
+        return orders;
+    }
+    
+    public void setOrders(Set<Order> orders) {
+        this.orders = orders;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+    
+    public void setStatus(int status) {
+        this.status = status;
+    }
+    
+    public long getAccountNum() {
+        return accountNum;
+    }
+    
+    public void setAccountNum(long accountNum) {
+        this.accountNum = accountNum;
+    }
+
+    public int getBalanceOwed() {
+        return balanceOwed;
+    }
+    
+    public void setBalanceOwed(int balanceOwed) {
+        this.balanceOwed = balanceOwed;
+    }
+	
+    public int getFilledOrderCount() {
+        return filledOrderCount;
+    }
+    
+    public void setFilledOrderCount(int filledOrderCount) {
+        this.filledOrderCount = filledOrderCount;
+    }
+    
+    public List<Account> getAccounts() {
+        return accounts;
+    }
+    
+    public void setAccounts(List<Account> accounts) {
+        this.accounts = accounts;
+    }
+
+    public CreditRating getRating() {
+        return creditRating;
+    }
+    
+    public void setRating(CreditRating rating) {
+        this.creditRating = rating;
+    }
+    
+    public enum CreditRating { POOR, GOOD, EXCELLENT };
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Customer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Department.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Department.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Department.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Department.java Wed Aug 12 14:10:57 2009
@@ -1,64 +1,64 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-
-@Entity
-@Table(name="CR_DEPT")
-
-public class Department {
-    @Id
-    @GeneratedValue
-	private int deptNo;
-	private String name;
-	@OneToMany
-	private Set<Employee> employees;
-	
-    public int getDeptno() {
-        return deptNo;
-    }
-    
-    public void setDeptno(int deptNo) {
-        this.deptNo = deptNo;
-    }
-
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Set<Employee> getEmployees() {
-        return employees;
-    }
-    
-    public void setEmployees(Set<Employee> employees){
-        this.employees = employees;
-    }
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import java.util.Set;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+
+@Entity
+@Table(name="CR_DEPT")
+
+public class Department {
+    @Id
+    @GeneratedValue
+	private int deptNo;
+	private String name;
+	@OneToMany
+	private Set<Employee> employees;
+	
+    public int getDeptno() {
+        return deptNo;
+    }
+    
+    public void setDeptno(int deptNo) {
+        this.deptNo = deptNo;
+    }
+
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Set<Employee> getEmployees() {
+        return employees;
+    }
+    
+    public void setEmployees(Set<Employee> employees){
+        this.employees = employees;
+    }
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Department.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Dependent.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Dependent.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Dependent.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Dependent.java Wed Aug 12 14:10:57 2009
@@ -1,76 +1,76 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import java.util.Date;
-
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-@Entity
-@Table(name="CR_DEPENDENT")
-public class Dependent {
-    @EmbeddedId
-    private DependentId id;
-
-    @OneToOne
-    private Employee emp;
-    
-    @Temporal(TemporalType.TIMESTAMP)
-    private Date endDate;
-    
-    private int curStatusId;
-
-    public int getCurStatusId() {
-        return curStatusId;
-    }
-
-    public void setCurStatusId(int curStatusId) {
-        this.curStatusId = curStatusId;
-    }
-
-    public DependentId getId() {
-        return id;
-    }
-
-    public void setId(DependentId id) {
-        this.id = id;
-    }
-
-    public Employee getEmp() {
-        return emp;
-    }
-
-    public void setEmp(Employee emp) {
-        this.emp = emp;
-    }
-
-    public Date getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import java.util.Date;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@Table(name="CR_DEPENDENT")
+public class Dependent {
+    @EmbeddedId
+    private DependentId id;
+
+    @OneToOne
+    private Employee emp;
+    
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date endDate;
+    
+    private int curStatusId;
+
+    public int getCurStatusId() {
+        return curStatusId;
+    }
+
+    public void setCurStatusId(int curStatusId) {
+        this.curStatusId = curStatusId;
+    }
+
+    public DependentId getId() {
+        return id;
+    }
+
+    public void setId(DependentId id) {
+        this.id = id;
+    }
+
+    public Employee getEmp() {
+        return emp;
+    }
+
+    public void setEmp(Employee emp) {
+        this.emp = emp;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Dependent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/DependentId.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/DependentId.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/DependentId.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/DependentId.java Wed Aug 12 14:10:57 2009
@@ -1,88 +1,88 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import java.util.Date;
-
-import javax.persistence.Embeddable;
-
-@Embeddable
-public class DependentId {
-    private String name;
-    private long empid; 
-    private Date effDate;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getEmpid() {
-        return empid;
-    }
-
-    public void setEmpid(long empid) {
-        this.empid = empid;
-    }
-
-    public Date getEffDate() {
-        return effDate;
-    }
-
-    public void setEffDate(Date effDate) {
-        this.effDate = effDate;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((effDate == null) ? 0 : effDate.hashCode());
-        result = prime * result + (int) (empid ^ (empid >>> 32));
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        DependentId other = (DependentId) obj;
-        if (effDate == null) {
-            if (other.effDate != null)
-                return false;
-        } else if (!effDate.equals(other.effDate))
-            return false;
-        if (empid != other.empid)
-            return false;
-        if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        return true;
-    }
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import java.util.Date;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class DependentId {
+    private String name;
+    private long empid; 
+    private Date effDate;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public long getEmpid() {
+        return empid;
+    }
+
+    public void setEmpid(long empid) {
+        this.empid = empid;
+    }
+
+    public Date getEffDate() {
+        return effDate;
+    }
+
+    public void setEffDate(Date effDate) {
+        this.effDate = effDate;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((effDate == null) ? 0 : effDate.hashCode());
+        result = prime * result + (int) (empid ^ (empid >>> 32));
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        DependentId other = (DependentId) obj;
+        if (effDate == null) {
+            if (other.effDate != null)
+                return false;
+        } else if (!effDate.equals(other.effDate))
+            return false;
+        if (empid != other.empid)
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/DependentId.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Employee.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Employee.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Employee.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Employee.java Wed Aug 12 14:10:57 2009
@@ -1,121 +1,121 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import javax.persistence.Basic;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="CR_EMP")
-@Inheritance
-@DiscriminatorColumn(name="EMP_TYPE")  
-public class Employee {
-    @Id
-    @GeneratedValue
-    private int empId;
-    
-	private String name;
-	@Embedded
-	private Contact contactInfo;
-	@ManyToOne
-	private Department department;
-	
-	@OneToOne
-	private Employee spouse;
-	@ManyToOne
-	private Manager manager;
-	
-	@OneToOne
-	private FrequentFlierPlan frequentFlierPlan;
-
-    @Basic
-    private long salary;
-    
-    @Basic
-    private int rating;
-    
-	
-    public int getEmpId() {
-        return empId;
-    }
-    
-    public void setContactInfo(Contact contactInfo) {
-        this.contactInfo = contactInfo;
-    }
-    
-    public Contact getContactInfo() {
-        return contactInfo;
-    }
-    
-    public void setDepartment(Department department) {
-        this.department = department;
-    }
-    
-    public Department getDepartment() {
-        return department;
-    }
-
-    public void setSpouse(Employee spouse) {
-        this.spouse = spouse;
-    }
-    
-    public Employee getSpouse() {
-        return spouse;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-	
-    public void setManager(Manager manager) {
-        this.manager = manager;
-    }
-    
-    public Manager getManager() {
-        return manager;
-    }
-    
-    public void setSalary(long salary) {
-        this.salary = salary;
-    }
-    
-    public long getSalary() {
-        return salary;
-    }
-    
-    public void setRating(int rating) {
-        this.rating = rating;
-    }
-    
-    public long getRating() {
-        return rating;
-    }
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="CR_EMP")
+@Inheritance
+@DiscriminatorColumn(name="EMP_TYPE")  
+public class Employee {
+    @Id
+    @GeneratedValue
+    private int empId;
+    
+	private String name;
+	@Embedded
+	private Contact contactInfo;
+	@ManyToOne
+	private Department department;
+	
+	@OneToOne
+	private Employee spouse;
+	@ManyToOne
+	private Manager manager;
+	
+	@OneToOne
+	private FrequentFlierPlan frequentFlierPlan;
+
+    @Basic
+    private long salary;
+    
+    @Basic
+    private int rating;
+    
+	
+    public int getEmpId() {
+        return empId;
+    }
+    
+    public void setContactInfo(Contact contactInfo) {
+        this.contactInfo = contactInfo;
+    }
+    
+    public Contact getContactInfo() {
+        return contactInfo;
+    }
+    
+    public void setDepartment(Department department) {
+        this.department = department;
+    }
+    
+    public Department getDepartment() {
+        return department;
+    }
+
+    public void setSpouse(Employee spouse) {
+        this.spouse = spouse;
+    }
+    
+    public Employee getSpouse() {
+        return spouse;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+	
+    public void setManager(Manager manager) {
+        this.manager = manager;
+    }
+    
+    public Manager getManager() {
+        return manager;
+    }
+    
+    public void setSalary(long salary) {
+        this.salary = salary;
+    }
+    
+    public long getSalary() {
+        return salary;
+    }
+    
+    public void setRating(int rating) {
+        this.rating = rating;
+    }
+    
+    public long getRating() {
+        return rating;
+    }
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Employee.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Exempt.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Exempt.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Exempt.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Exempt.java Wed Aug 12 14:10:57 2009
@@ -1,39 +1,39 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import java.util.Date;
-
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-
-@Entity
-public class Exempt extends Employee {
-    @Basic
-    private Date hireDate;
-    
-    public void setHireDate(Date hireDate) {
-        this.hireDate = hireDate;
-    }
-    
-    public Date getHireDate() {
-        return hireDate;
-    }
-    
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+
+@Entity
+public class Exempt extends Employee {
+    @Basic
+    private Date hireDate;
+    
+    public void setHireDate(Date hireDate) {
+        this.hireDate = hireDate;
+    }
+    
+    public Date getHireDate() {
+        return hireDate;
+    }
+    
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Exempt.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/FrequentFlierPlan.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/FrequentFlierPlan.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/FrequentFlierPlan.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/FrequentFlierPlan.java Wed Aug 12 14:10:57 2009
@@ -1,32 +1,32 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-@Entity
-public class FrequentFlierPlan {
-    @Id
-    @GeneratedValue
-    private String id;
-	private String name;
-	private int annualMiles;
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class FrequentFlierPlan {
+    @Id
+    @GeneratedValue
+    private String id;
+	private String name;
+	private int annualMiles;
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/FrequentFlierPlan.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/LineItem.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/LineItem.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/LineItem.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/LineItem.java Wed Aug 12 14:10:57 2009
@@ -1,92 +1,92 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="CR_LI")
-
-public class LineItem {
-    @Id
-    @GeneratedValue
-    private int id;
-
-    private double price;
-
-	@ManyToOne
-	private Order order;
-
-    private int quantity;
-    
-    private double cost;
-    
-    @ManyToOne (fetch=FetchType.EAGER)
-    Product product;
-     
-    public long getId() {
-        return id;
-    }
-	
-    public Order getOrder() {
-        return order;
-    }
-
-    public void setOrder(Order order) {
-        this.order = order;
-    }
-
-    public double getPrice() {
-        return price;
-    }
-
-    public void setPrice(double price) {
-        this.price = price;
-    }
-
-    public double getCost() {
-        return cost;
-    }
-
-    public void setCost(double cost) {
-        this.cost = cost;
-    }
-
-    public Product getProduct() {
-        return product;
-    }
-
-    public void setProduct(Product product) {
-        this.product = product;
-    }
-
-    public int getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(int quantity) {
-        this.quantity = quantity;
-    }
-	
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="CR_LI")
+
+public class LineItem {
+    @Id
+    @GeneratedValue
+    private int id;
+
+    private double price;
+
+	@ManyToOne
+	private Order order;
+
+    private int quantity;
+    
+    private double cost;
+    
+    @ManyToOne (fetch=FetchType.EAGER)
+    Product product;
+     
+    public long getId() {
+        return id;
+    }
+	
+    public Order getOrder() {
+        return order;
+    }
+
+    public void setOrder(Order order) {
+        this.order = order;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
+    public double getCost() {
+        return cost;
+    }
+
+    public void setCost(double cost) {
+        this.cost = cost;
+    }
+
+    public Product getProduct() {
+        return product;
+    }
+
+    public void setProduct(Product product) {
+        this.product = product;
+    }
+
+    public int getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(int quantity) {
+        this.quantity = quantity;
+    }
+	
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/LineItem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Magazine.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Magazine.java?rev=803521&r1=803520&r2=803521&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Magazine.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Magazine.java Wed Aug 12 14:10:57 2009
@@ -1,92 +1,92 @@
-/*
- * 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.apache.openjpa.persistence.subquery;
-
-import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.FetchType;
-import javax.persistence.Table;
-
-import java.sql.Date;
-
-@Entity
-@Table(name="CR_MG")
-public class Magazine implements Serializable {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id")
-    private int id;
-
-    @Column(name="name")
-    private String name;
-    
-    @Column(name="date_published")
-    private Date datePublished;
-
-    @ManyToOne(fetch=FetchType.LAZY)
-    @JoinColumn(name="id_publisher")
-    private Publisher idPublisher;
-
-
-    private static final long serialVersionUID = 1L;
-
-    public int getId() {
-        return this.id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Publisher getIdPublisher() {
-        return this.idPublisher;
-    }
-
-    public void setIdPublisher(Publisher idPublisher) {
-        this.idPublisher = idPublisher;
-    }
-    
-    public Date getDatePublished() {
-        return datePublished;
-    }
-
-    public void setDatePublished(Date datePublished) {
-        this.datePublished = datePublished;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-}
+/*
+ * 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.apache.openjpa.persistence.subquery;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.FetchType;
+import javax.persistence.Table;
+
+import java.sql.Date;
+
+@Entity
+@Table(name="CR_MG")
+public class Magazine implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id")
+    private int id;
+
+    @Column(name="name")
+    private String name;
+    
+    @Column(name="date_published")
+    private Date datePublished;
+
+    @ManyToOne(fetch=FetchType.LAZY)
+    @JoinColumn(name="id_publisher")
+    private Publisher idPublisher;
+
+
+    private static final long serialVersionUID = 1L;
+
+    public int getId() {
+        return this.id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Publisher getIdPublisher() {
+        return this.idPublisher;
+    }
+
+    public void setIdPublisher(Publisher idPublisher) {
+        this.idPublisher = idPublisher;
+    }
+    
+    public Date getDatePublished() {
+        return datePublished;
+    }
+
+    public void setDatePublished(Date datePublished) {
+        this.datePublished = datePublished;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

Propchange: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/subquery/Magazine.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message