From commits-return-6685-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Tue Jun 01 15:31:25 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 82703 invoked from network); 1 Jun 2010 15:31:24 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Jun 2010 15:31:24 -0000 Received: (qmail 81599 invoked by uid 500); 1 Jun 2010 15:31:24 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 81553 invoked by uid 500); 1 Jun 2010 15:31:24 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 81541 invoked by uid 99); 1 Jun 2010 15:31:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 15:31:23 +0000 X-ASF-Spam-Status: No, hits=-1994.3 required=10.0 tests=ALL_TRUSTED,HTML_MESSAGE,MIME_HTML_ONLY X-Spam-Check-By: apache.org Received: from [140.211.11.22] (HELO thor.apache.org) (140.211.11.22) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 15:31:21 +0000 Received: from thor (localhost [127.0.0.1]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id o51FV0DA019615 for ; Tue, 1 Jun 2010 15:31:00 GMT Date: Tue, 1 Jun 2010 11:31:00 -0400 (EDT) From: confluence@apache.org To: commits@openjpa.apache.org Message-ID: <13443941.2295.1275406260019.JavaMail.confluence@thor> Subject: [CONF] OpenJPA > Apply an Eclipse Patch MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit Auto-Submitted: auto-generated X-Virus-Checked: Checked by ClamAV on apache.org From commits-return-6686-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Tue Jun 01 16:50:21 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 10212 invoked from network); 1 Jun 2010 16:50:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Jun 2010 16:50:21 -0000 Received: (qmail 9374 invoked by uid 500); 1 Jun 2010 16:50:21 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 9321 invoked by uid 500); 1 Jun 2010 16:50:21 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 9314 invoked by uid 99); 1 Jun 2010 16:50:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 16:50:21 +0000 X-ASF-Spam-Status: No, hits=-1415.7 required=10.0 tests=ALL_TRUSTED,AWL,HTML_MESSAGE,MIME_HTML_ONLY X-Spam-Check-By: apache.org Received: from [140.211.11.22] (HELO thor.apache.org) (140.211.11.22) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 16:50:20 +0000 Received: from thor (localhost [127.0.0.1]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id o51Go0iD020515 for ; Tue, 1 Jun 2010 16:50:00 GMT Date: Tue, 1 Jun 2010 12:50:00 -0400 (EDT) From: confluence@apache.org To: commits@openjpa.apache.org Message-ID: <4170427.2297.1275411000164.JavaMail.confluence@thor> Subject: [CONF] OpenJPA > Apply an Eclipse Patch MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit Auto-Submitted: auto-generated From commits-return-6687-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Tue Jun 01 16:52:24 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 10434 invoked from network); 1 Jun 2010 16:52:24 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Jun 2010 16:52:24 -0000 Received: (qmail 11411 invoked by uid 500); 1 Jun 2010 16:52:24 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 11391 invoked by uid 500); 1 Jun 2010 16:52:24 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 11384 invoked by uid 99); 1 Jun 2010 16:52:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 16:52:24 +0000 X-ASF-Spam-Status: No, hits=-1994.3 required=10.0 tests=ALL_TRUSTED,HTML_MESSAGE,MIME_HTML_ONLY X-Spam-Check-By: apache.org Received: from [140.211.11.22] (HELO thor.apache.org) (140.211.11.22) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 16:52:22 +0000 Received: from thor (localhost [127.0.0.1]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id o51Gq0dZ020535 for ; Tue, 1 Jun 2010 16:52:00 GMT Date: Tue, 1 Jun 2010 12:52:00 -0400 (EDT) From: confluence@apache.org To: commits@openjpa.apache.org Message-ID: <31966504.2299.1275411120051.JavaMail.confluence@thor> Subject: [CONF] OpenJPA > Apply an Eclipse Patch MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit Auto-Submitted: auto-generated X-Virus-Checked: Checked by ClamAV on apache.org From commits-return-6688-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Tue Jun 01 16:55:21 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 10860 invoked from network); 1 Jun 2010 16:55:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Jun 2010 16:55:21 -0000 Received: (qmail 12704 invoked by uid 500); 1 Jun 2010 16:55:21 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 12686 invoked by uid 500); 1 Jun 2010 16:55:21 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 12679 invoked by uid 99); 1 Jun 2010 16:55:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 16:55:21 +0000 X-ASF-Spam-Status: No, hits=-1415.9 required=10.0 tests=ALL_TRUSTED,AWL,HTML_MESSAGE,MIME_HTML_ONLY X-Spam-Check-By: apache.org Received: from [140.211.11.22] (HELO thor.apache.org) (140.211.11.22) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 16:55:21 +0000 Received: from thor (localhost [127.0.0.1]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id o51Gt0Wr020567 for ; Tue, 1 Jun 2010 16:55:00 GMT Date: Tue, 1 Jun 2010 12:55:00 -0400 (EDT) From: confluence@apache.org To: commits@openjpa.apache.org Message-ID: <4474861.2301.1275411300016.JavaMail.confluence@thor> Subject: [CONF] OpenJPA > Apply an Eclipse Patch MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit Auto-Submitted: auto-generated From commits-return-6689-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Tue Jun 01 16:59:22 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 11609 invoked from network); 1 Jun 2010 16:59:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Jun 2010 16:59:22 -0000 Received: (qmail 15335 invoked by uid 500); 1 Jun 2010 16:59:22 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 15290 invoked by uid 500); 1 Jun 2010 16:59:22 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 15283 invoked by uid 99); 1 Jun 2010 16:59:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 16:59:22 +0000 X-ASF-Spam-Status: No, hits=-1416.1 required=10.0 tests=ALL_TRUSTED,AWL,HTML_MESSAGE,MIME_HTML_ONLY X-Spam-Check-By: apache.org Received: from [140.211.11.22] (HELO thor.apache.org) (140.211.11.22) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 16:59:21 +0000 Received: from thor (localhost [127.0.0.1]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id o51Gx0Dc020611 for ; Tue, 1 Jun 2010 16:59:00 GMT Date: Tue, 1 Jun 2010 12:59:00 -0400 (EDT) From: confluence@apache.org To: commits@openjpa.apache.org Message-ID: <20862640.2303.1275411540013.JavaMail.confluence@thor> Subject: [CONF] OpenJPA > Apply an Eclipse Patch MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit Auto-Submitted: auto-generated From commits-return-6690-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Tue Jun 01 17:02:23 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 13368 invoked from network); 1 Jun 2010 17:02:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Jun 2010 17:02:22 -0000 Received: (qmail 24746 invoked by uid 500); 1 Jun 2010 17:02:21 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 24723 invoked by uid 500); 1 Jun 2010 17:02:21 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 24693 invoked by uid 99); 1 Jun 2010 17:02:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 17:02:21 +0000 X-ASF-Spam-Status: No, hits=-1416.3 required=10.0 tests=ALL_TRUSTED,AWL,HTML_MESSAGE,MIME_HTML_ONLY X-Spam-Check-By: apache.org Received: from [140.211.11.22] (HELO thor.apache.org) (140.211.11.22) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 17:02:20 +0000 Received: from thor (localhost [127.0.0.1]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id o51H20vQ020685 for ; Tue, 1 Jun 2010 17:02:00 GMT Date: Tue, 1 Jun 2010 13:02:00 -0400 (EDT) From: confluence@apache.org To: commits@openjpa.apache.org Message-ID: <28257727.2305.1275411720029.JavaMail.confluence@thor> Subject: [CONF] OpenJPA > Apply an Eclipse Patch MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Auto-Submitted: auto-generated

Apply an Eclipse Patch

Page edited by Dianne Richards

Comment: Added the text

Changes (1)

=20 =20
h1. Apply an Eclipse Patch to= DayTrader

You can apply an Eclipse patch to DayTrader for the Criteria API= changes

h2. Setting up Eclipse

First install eclipse by = going to&nbsp;[http:/www.eclipse.org|http://www.eclipse.org] and downlo= ading a version of it. These instructions assume version 3.5. Unzip the d= ownloaded file into a directory. You can start eclipse by running eclipse.= exe in the eclipse directory.

Next install subclipse, the Subversi= on Eclipse Plugin:
# In Eclipse, go to Help \-> Install New software=
# Click on Add button - Enter Subclipse for Name and [http://subclipse= .tigris.org/update_1.6.x|http://subclipse.tigris.org/update_1.6.x] for loc= ation
# Select the Subclipse Plugin and click Next \-> Next
# Re= ad and accept the license and click Finish

Generate eclipse files = for the DayTrader project. From the *DayTrader/branches/2.1.3* directory, t= ype "mvn eclipse:eclipse"

Set the M2_REPO classpath vari= able in Eclipse:
# Go to Window \-> Preferences \-> Java \-> B= uild Path \-> Classpath Variables
# Add a new variable called M2_RE= PO, set to the maven repository directory..

Import DayTrader proj= ects into Eclipse.

# From Eclipse, Click on File \-> Import... =
# Under the General folder, select Existing Projects into Workspace an= d click on Next.
# Enter the root directory of *DayTrader/branches/2.1.= 3*
# Select all projects and click Finish

h2. Applying the Pat= ch

Apply the eclipse based patch using the following:
# Downlo= ad the patch (TBD - attach)
# In the Package Explorer view select all d= aytrader projects
# Right click and select Team \-> Apply Patch
= # Enter the path to the downloaded patch

Replace the following fil= es in your local file system copy of DayTrader:
* the pom.xml file in t= he root (*Daytrader/branches/2.1.3*) directory with [^pom.xml].
* the c= reateDerbyDB.bat\|.sh file in the *DayTrader/branches/2.1.3/bin/dbscripts/d= erby* directory with the appropriate one of the following:&nbsp;[^creat= eDerbyDB.bat] or [^createDerbyDB.sh].

Full Content

= Apply an Eclipse Patch to DayTrader

You can apply an Eclipse patch to DayTrader for the Criteria API changes=

Setting up Eclipse=

First install eclipse by going to http:/www.eclipse.org and do= wnloading a version of it. These instructions assume version 3.5. Unzip th= e downloaded file into a directory. You can start eclipse by running ecli= pse.exe in the eclipse directory.

Next install subclipse, the Subversion Eclipse Plugin:

    =09
  1. In Eclipse, go to Help -> Install New software
    2. =09
  2. Click on Add button - Enter Subclipse for Name and http://subclipse.tigris.org/update_1.6.x for location
    3. =09
  3. Select the Subclipse Plugin and click Next -> Next
    4. =09
  4. Read and accept the license and click Finish

Generate eclipse files for the DayTrader project. From the DayTrader/= branches/2.1.3 directory, type "mvn eclipse:eclipse"

Set the M2_REPO classpath variable in Eclipse:

    =09
  1. Go to Window -> Preferences -> Java -> Build Pa= th -> Classpath Variables
    2. =09
  2. Add a new variable called M2_REPO, set to the maven repository dire= ctory..

Import DayTrader projects into Eclipse.

    =09
  1. From Eclipse, Click on File -> Import...
    2. =09
  2. Under the General folder, select Existing Projects into Workspace a= nd click on Next.
    3. =09
  3. Enter the root directory of DayTrader/branches/2.1.3
    4. =09
  4. Select all projects and click Finish

Applying the Patch=

Apply the eclipse based patch using the following:

    =09
  1. Download the patch (TBD - attach)
    2. =09
  2. In the Package Explorer view select all daytrader projects
    3. =09
  3. Right click and select Team -> Apply Patch
    4. =09
  4. Enter the path to the downloaded patch

Replace the following files in your local file system copy of DayTrader:=

    =09
  • the pom.xml file in the root (Daytrader/branches/2.1.3) direc= tory with pom.xml.
    • =09
  • the createDerbyDB.bat|.sh file in the DayTrader/branches/2.1= .3/bin/dbscripts/derby directory with the appropriate one of the follow= ing: createDerbyDB.bat or createDerbyDB.sh.
View Online | View C= hanges | Add Comment
From commits-return-6691-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Wed Jun 02 15:19:22 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 93895 invoked from network); 2 Jun 2010 15:19:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jun 2010 15:19:21 -0000 Received: (qmail 98356 invoked by uid 500); 2 Jun 2010 15:19:21 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 98312 invoked by uid 500); 2 Jun 2010 15:19:21 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 98305 invoked by uid 99); 2 Jun 2010 15:19:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 15:19:21 +0000 X-ASF-Spam-Status: No, hits=-1418.8 required=10.0 tests=ALL_TRUSTED,AWL,HTML_MESSAGE,MIME_HTML_ONLY X-Spam-Check-By: apache.org Received: from [140.211.11.22] (HELO thor.apache.org) (140.211.11.22) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 15:19:21 +0000 Received: from thor (localhost [127.0.0.1]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id o52FJ0ke009910 for ; Wed, 2 Jun 2010 15:19:00 GMT Date: Wed, 2 Jun 2010 11:19:00 -0400 (EDT) From: confluence@apache.org To: commits@openjpa.apache.org Message-ID: <11044174.2517.1275491940024.JavaMail.confluence@thor> Subject: [CONF] OpenJPA > Apply an Eclipse Patch MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit Auto-Submitted: auto-generated From commits-return-6692-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Wed Jun 02 15:42:41 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 1120 invoked from network); 2 Jun 2010 15:42:41 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jun 2010 15:42:41 -0000 Received: (qmail 48387 invoked by uid 500); 2 Jun 2010 15:42:41 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 48343 invoked by uid 500); 2 Jun 2010 15:42:41 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 48336 invoked by uid 99); 2 Jun 2010 15:42:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 15:42:41 +0000 X-ASF-Spam-Status: No, hits=-1381.8 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 15:42:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B49512388A3B; Wed, 2 Jun 2010 15:42:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950604 - in /openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql: DB2Dictionary.java DBDictionary.java Date: Wed, 02 Jun 2010 15:42:20 -0000 To: commits@openjpa.apache.org From: faywang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100602154220.B49512388A3B@eris.apache.org> Author: faywang Date: Wed Jun 2 15:42:20 2010 New Revision: 950604 URL: http://svn.apache.org/viewvc?rev=950604&view=rev Log: OPENJPA-1596: port the change to 2.0 Modified: openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Modified: openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=950604&r1=950603&r2=950604&view=diff ============================================================================== --- openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original) +++ openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Jun 2 15:42:20 2010 @@ -33,6 +33,7 @@ import java.util.Set; import java.util.StringTokenizer; import org.apache.openjpa.jdbc.identifier.DBIdentifier; +import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier; import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration; import org.apache.openjpa.jdbc.kernel.exps.FilterValue; import org.apache.openjpa.jdbc.kernel.exps.Lit; @@ -912,8 +913,10 @@ public class DB2Dictionary // build the index for the sequence tables // the index name will be the fully qualified table name + _IDX Table tab = schema.getTable(table); - DBIdentifier idxName = DBIdentifier.append(tab.getFullIdentifier(), "IDX"); - Index idx = tab.addIndex(getValidIndexName(idxName, tab)); + DBIdentifier fullIdxId = tab.getFullIdentifier().clone(); + DBIdentifier unQualifiedName = DBIdentifier.append(fullIdxId.getUnqualifiedName(), "IDX"); + fullIdxId.setName(getValidIndexName(unQualifiedName, tab)); + Index idx = tab.addIndex(fullIdxId); idx.setUnique(true); idx.addColumn(pkColumn); } Modified: openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=950604&r1=950603&r2=950604&view=diff ============================================================================== --- openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original) +++ openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Wed Jun 2 15:42:20 2010 @@ -3408,8 +3408,13 @@ public class DBDictionary buf.append("CREATE "); if (index.isUnique()) buf.append("UNIQUE "); - String indexName = checkNameLength(toDBName(index.getIdentifier()), maxIndexNameLength, + + DBIdentifier fullIdxName = index.getIdentifier(); + DBIdentifier unQualifiedName = fullIdxName.getUnqualifiedName(); + checkNameLength(toDBName(unQualifiedName), maxIndexNameLength, "long-index-name"); + String indexName = toDBName(fullIdxName); + buf.append("INDEX ").append(indexName); buf.append(" ON ").append(getFullName(index.getTable(), false)); buf.append(" (").append(namingUtil.appendColumns(index.getColumns())). From commits-return-6693-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Wed Jun 02 17:25:07 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 36704 invoked from network); 2 Jun 2010 17:25:07 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jun 2010 17:25:07 -0000 Received: (qmail 45914 invoked by uid 500); 2 Jun 2010 17:25:06 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 45870 invoked by uid 500); 2 Jun 2010 17:25:06 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 45863 invoked by uid 99); 2 Jun 2010 17:25:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 17:25:06 +0000 X-ASF-Spam-Status: No, hits=-1481.4 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 17:25:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2B9D2238898B; Wed, 2 Jun 2010 17:24:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950676 - in /openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images: Add2Cart.jpg DataModel.jpg Deliver.jpg DomainModel.jpg OpenBooks.jpg SourceCode.jpg Supply.jpg add-to-cart.gif checkout.gif console_view.gif Date: Wed, 02 Jun 2010 17:24:46 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100602172446.2B9D2238898B@eris.apache.org> Author: ppoddar Date: Wed Jun 2 17:24:45 2010 New Revision: 950676 URL: http://svn.apache.org/viewvc?rev=950676&view=rev Log: delete images Removed: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/Add2Cart.jpg openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/DataModel.jpg openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/Deliver.jpg openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/DomainModel.jpg openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/OpenBooks.jpg openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/SourceCode.jpg openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/Supply.jpg openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/add-to-cart.gif openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/checkout.gif openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/console_view.gif From commits-return-6694-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Wed Jun 02 17:30:15 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 39014 invoked from network); 2 Jun 2010 17:30:15 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jun 2010 17:30:15 -0000 Received: (qmail 59131 invoked by uid 500); 2 Jun 2010 17:30:15 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 59107 invoked by uid 500); 2 Jun 2010 17:30:15 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 59100 invoked by uid 99); 2 Jun 2010 17:30:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 17:30:15 +0000 X-ASF-Spam-Status: No, hits=-1486.4 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 17:30:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 14CA9238898B; Wed, 2 Jun 2010 17:29:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950679 - in /openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images: browse.png cancel.png done.png error.png java_link.png login.gif nav_backward.gif nav_forward.gif openjpa-logo-small.png orders.gif search.gif start_task.gif Date: Wed, 02 Jun 2010 17:29:55 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100602172955.14CA9238898B@eris.apache.org> Author: ppoddar Date: Wed Jun 2 17:29:54 2010 New Revision: 950679 URL: http://svn.apache.org/viewvc?rev=950679&view=rev Log: delete images Removed: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/browse.png openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/cancel.png openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/done.png openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/error.png openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/java_link.png openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/login.gif openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_backward.gif openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_forward.gif openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/openjpa-logo-small.png openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/orders.gif openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/search.gif openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/start_task.gif From commits-return-6695-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Wed Jun 02 19:46:34 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 41655 invoked from network); 2 Jun 2010 19:46:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jun 2010 19:46:33 -0000 Received: (qmail 72055 invoked by uid 500); 2 Jun 2010 19:46:33 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 72027 invoked by uid 500); 2 Jun 2010 19:46:33 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 72018 invoked by uid 99); 2 Jun 2010 19:46:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 19:46:33 +0000 X-ASF-Spam-Status: No, hits=-1491.2 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 19:46:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B1992238890A; Wed, 2 Jun 2010 19:46:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950736 - /openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/ Date: Wed, 02 Jun 2010 19:46:12 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100602194612.B1992238890A@eris.apache.org> Author: ppoddar Date: Wed Jun 2 19:46:12 2010 New Revision: 950736 URL: http://svn.apache.org/viewvc?rev=950736&view=rev Log: Add images Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/OpenBooks.jpg (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/Thumbs.db (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/add-to-cart.gif (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/browse.png (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/cancel.png (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/checkout.gif (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/done.png (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/error.png (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/login.gif (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_backward.gif (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_forward.gif (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/openjpa-logo-small.png (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/orders.gif (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/search.gif (with props) openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/start_task.gif (with props) Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/OpenBooks.jpg URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/OpenBooks.jpg?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/OpenBooks.jpg ------------------------------------------------------------------------------ svn:mime-type = image/jpeg Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/Thumbs.db URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/Thumbs.db?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/Thumbs.db ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/add-to-cart.gif URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/add-to-cart.gif?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/add-to-cart.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/browse.png URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/browse.png?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/browse.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/cancel.png URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/cancel.png?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/cancel.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/checkout.gif URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/checkout.gif?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/checkout.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/done.png URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/done.png?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/done.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/error.png URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/error.png?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/error.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/login.gif URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/login.gif?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/login.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_backward.gif URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_backward.gif?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_backward.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_forward.gif URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_forward.gif?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/nav_forward.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/openjpa-logo-small.png URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/openjpa-logo-small.png?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/openjpa-logo-small.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/orders.gif URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/orders.gif?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/orders.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/search.gif URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/search.gif?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/search.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/start_task.gif URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/start_task.gif?rev=950736&view=auto ============================================================================== Binary file - no diff available. Propchange: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/start_task.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif From commits-return-6696-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Wed Jun 02 19:47:03 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 41724 invoked from network); 2 Jun 2010 19:47:03 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jun 2010 19:47:03 -0000 Received: (qmail 72251 invoked by uid 500); 2 Jun 2010 19:47:03 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 72227 invoked by uid 500); 2 Jun 2010 19:47:03 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 72220 invoked by uid 99); 2 Jun 2010 19:47:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 19:47:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 19:47:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0BEC9238890A; Wed, 2 Jun 2010 19:46:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950737 - /openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/Thumbs.db Date: Wed, 02 Jun 2010 19:46:40 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100602194640.0BEC9238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ppoddar Date: Wed Jun 2 19:46:39 2010 New Revision: 950737 URL: http://svn.apache.org/viewvc?rev=950737&view=rev Log: Remove extraneous file Removed: openjpa/trunk/openjpa-examples/openbooks/src/main/resources/images/Thumbs.db From commits-return-6697-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Thu Jun 03 12:32:01 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 16314 invoked from network); 3 Jun 2010 12:32:01 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Jun 2010 12:32:01 -0000 Received: (qmail 83184 invoked by uid 500); 3 Jun 2010 12:32:01 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 83125 invoked by uid 500); 3 Jun 2010 12:32:00 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 83118 invoked by uid 99); 3 Jun 2010 12:32:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2010 12:32:00 +0000 X-ASF-Spam-Status: No, hits=-1496.0 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2010 12:31:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CE8B423889EA; Thu, 3 Jun 2010 12:31:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950976 - /openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java Date: Thu, 03 Jun 2010 12:31:38 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100603123138.CE8B423889EA@eris.apache.org> Author: ppoddar Date: Thu Jun 3 12:31:38 2010 New Revision: 950976 URL: http://svn.apache.org/viewvc?rev=950976&view=rev Log: Adjust image locations Modified: openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java Modified: openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java?rev=950976&r1=950975&r2=950976&view=diff ============================================================================== --- openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java (original) +++ openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java Thu Jun 3 12:31:38 2010 @@ -22,18 +22,11 @@ import java.awt.Desktop; import java.awt.Dimension; import java.awt.Toolkit; import java.awt.event.ActionEvent; -import java.beans.PropertyChangeListener; -import java.io.File; -import java.io.IOException; import java.io.PrintStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.TreeMap; import java.util.concurrent.TimeUnit; import javax.swing.AbstractAction; @@ -43,7 +36,6 @@ import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JDialog; -import javax.swing.JEditorPane; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JScrollPane; @@ -56,7 +48,6 @@ import javax.swing.SwingUtilities; import javax.swing.SwingWorker; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; -import javax.swing.text.html.HTMLEditorKit; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; @@ -68,15 +59,9 @@ import jpa.tools.swing.MetamodelView; import jpa.tools.swing.PowerPointViewer; import jpa.tools.swing.PreparedQueryViewer; import jpa.tools.swing.ScrollingTextPane; -import jpa.tools.swing.SourceCodeViewer; import jpa.tools.swing.StatusBar; import jpa.tools.swing.SwingHelper; -import openbook.domain.Author; -import openbook.domain.Book; import openbook.domain.Customer; -import openbook.domain.Inventory; -import openbook.domain.LineItem; -import openbook.domain.PurchaseOrder; import openbook.server.OpenBookService; import openbook.server.ServiceFactory; import openbook.util.PropertyHelper; @@ -107,7 +92,6 @@ public class Demo extends JFrame { private Action _supply; private Action _viewConfig; private Action _viewDomain; - private Action _viewData; private Action _viewSource; private Action _viewQuery; @@ -125,7 +109,6 @@ public class Demo extends JFrame { private static Demo _instance; public static final Icon LOGO = Images.getIcon("images/OpenBooks.jpg"); private static final String SRC_ROOT = "source/"; - private boolean _debug = Boolean.getBoolean("openbook.debug"); /** * The handle to the service. @@ -184,7 +167,6 @@ public class Demo extends JFrame { _supply = new SupplyAction("Supply", "images/Supply.jpg", "Supply Books"); _viewConfig = new ViewConfigAction("Configuration", "images/browse.png", "View Configuration"); _viewDomain = new ViewDomainAction("Domain", "images/DomainModel.jpg", "View Domain Model"); - _viewData = new ViewDataAction("Data", "images/DataModel.jpg", "View Instances"); _viewSource = new ViewSourceAction("Source", "images/SourceCode.jpg", "View Source Code"); _viewQuery = new ViewQueryCacheAction("Query", "images/DataModel.jpg", "View Queries"); @@ -277,7 +259,6 @@ public class Demo extends JFrame { toolBar.add(_viewConfig); toolBar.add(_viewDomain); - toolBar.add(_viewData); toolBar.add(_viewSource); toolBar.add(_viewQuery); @@ -451,11 +432,12 @@ public class Demo extends JFrame { * An action to show a piece of code in an internal or external browser. * */ - public class ShowCodeAction extends AbstractAction { + public class ShowCodeAction extends OpenBookAction { private String _key; private String _page; + public ShowCodeAction() { - super("Show Code", Images.JAVA); + super("Show Code", Images.JAVA, "View Java Source Code"); } public void setPage(String key, String page) { @@ -622,7 +604,6 @@ public class Demo extends JFrame { views.add(new ActionTreeNode(_viewConfig)); views.add(new ActionTreeNode(_viewDomain)); views.add(new ActionTreeNode(_viewQuery)); - views.add(new ActionTreeNode(_viewData)); views.add(new ActionTreeNode(_viewSource)); From commits-return-6698-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Thu Jun 03 12:32:11 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 16349 invoked from network); 3 Jun 2010 12:32:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Jun 2010 12:32:11 -0000 Received: (qmail 83265 invoked by uid 500); 3 Jun 2010 12:32:11 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 83243 invoked by uid 500); 3 Jun 2010 12:32:11 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 83236 invoked by uid 99); 3 Jun 2010 12:32:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2010 12:32:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2010 12:32:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CFECC23889FA; Thu, 3 Jun 2010 12:31:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950977 - /openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java Date: Thu, 03 Jun 2010 12:31:46 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100603123146.CFECC23889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ppoddar Date: Thu Jun 3 12:31:46 2010 New Revision: 950977 URL: http://svn.apache.org/viewvc?rev=950977&view=rev Log: Adjust image locations Added: openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java Added: openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java?rev=950977&view=auto ============================================================================== --- openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java (added) +++ openjpa/trunk/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java Thu Jun 3 12:31:46 2010 @@ -0,0 +1,86 @@ +/* + * Licensed 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 openbook.client; + +import java.awt.Image; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.swing.Icon; +import javax.swing.ImageIcon; + +/** + * Utility to load and cache images. + * + * @author Pinaki Poddar + * + */ +public class Images { + + private static Map images = new HashMap(); + public static Icon NEXT = getIcon("images/nav_forward.gif"); + public static Icon BACK = getIcon("images/nav_backward.gif"); + public static Icon DONE = getIcon("images/done.png"); + public static Icon CANCEL = getIcon("images/cancel.png"); + public static Icon ERROR = getIcon("images/error.png"); + public static Icon BROWSE = getIcon("images/browse.png"); + public static Icon START = getIcon("images/start_task.gif"); + public static Icon MONITOR = getIcon("images/console_view.gif"); + public static Icon JAVA = getIcon("images/SourceCode.jpg", true); + + public static Icon getIcon(String name) { + Icon icon = images.get(name); + if (icon == null) { + icon = createImageIcon(name); + images.put(name, icon); + } + return icon; + } + + public static Icon getIcon(String name, boolean scale) { + return getIcon(name, 32, -1); + } + + public static Icon getIcon(String name, int width, int height) { + Icon icon = getIcon(name); + if (icon == null) { + return null; + } + icon = new ImageIcon(((ImageIcon)icon).getImage().getScaledInstance(width, height, Image.SCALE_SMOOTH)); + return icon; + } + + /** + * Returns an ImageIcon, or null if the path was invalid. + * + **/ + protected static ImageIcon createImageIcon(String path) { + if (path == null) + return null; + URL imgURL = Thread.currentThread().getContextClassLoader().getResource(path); + if (imgURL != null) { + return new ImageIcon(imgURL); + } else { + imgURL = Images.class.getResource(path); + if (imgURL != null) { + return new ImageIcon(imgURL); + } else { + System.err.println("Couldn't find file: " + path); + return null; + } + } + } + +} From commits-return-6699-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Thu Jun 03 12:33:39 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 16545 invoked from network); 3 Jun 2010 12:33:39 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Jun 2010 12:33:39 -0000 Received: (qmail 83910 invoked by uid 500); 3 Jun 2010 12:33:39 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 83894 invoked by uid 500); 3 Jun 2010 12:33:39 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 83887 invoked by uid 99); 3 Jun 2010 12:33:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2010 12:33:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2010 12:33:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6F37823889F1; Thu, 3 Jun 2010 12:33:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950978 - in /openjpa/trunk/openjpa-examples/openbooks/web: header.jsp intro.jsp Date: Thu, 03 Jun 2010 12:33:16 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100603123316.6F37823889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ppoddar Date: Thu Jun 3 12:33:16 2010 New Revision: 950978 URL: http://svn.apache.org/viewvc?rev=950978&view=rev Log: detect logged in user Modified: openjpa/trunk/openjpa-examples/openbooks/web/header.jsp openjpa/trunk/openjpa-examples/openbooks/web/intro.jsp Modified: openjpa/trunk/openjpa-examples/openbooks/web/header.jsp URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/web/header.jsp?rev=950978&r1=950977&r2=950978&view=diff ============================================================================== --- openjpa/trunk/openjpa-examples/openbooks/web/header.jsp (original) +++ openjpa/trunk/openjpa-examples/openbooks/web/header.jsp Thu Jun 3 12:33:16 2010 @@ -71,8 +71,6 @@ %> -%> -