Return-Path: Delivered-To: apmail-ws-juddi-cvs-archive@www.apache.org Received: (qmail 71718 invoked from network); 29 May 2009 18:54:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 May 2009 18:54:21 -0000 Received: (qmail 7040 invoked by uid 500); 29 May 2009 18:54:33 -0000 Delivered-To: apmail-ws-juddi-cvs-archive@ws.apache.org Received: (qmail 6999 invoked by uid 500); 29 May 2009 18:54:33 -0000 Mailing-List: contact juddi-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list juddi-cvs@ws.apache.org Received: (qmail 6990 invoked by uid 99); 29 May 2009 18:54:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 May 2009 18:54:33 +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; Fri, 29 May 2009 18:54:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6A3322388868; Fri, 29 May 2009 18:54:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780067 - in /webservices/juddi/branches/v3_trunk: juddi-core/src/main/java/org/apache/juddi/model/ juddi-core/src/main/resources/persistence/ juddi-cxf/persistence/ Date: Fri, 29 May 2009 18:54:08 -0000 To: juddi-cvs@ws.apache.org From: kstam@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090529185408.6A3322388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kstam Date: Fri May 29 18:54:07 2009 New Revision: 780067 URL: http://svn.apache.org/viewvc?rev=780067&view=rev Log: Fixing the serviceProjection config so openjpa can work with it. Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjectionId.java Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjection.java webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml webservices/juddi/branches/v3_trunk/juddi-cxf/persistence/openjpa-persistence.xml Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjection.java URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjection.java?rev=780067&r1=780066&r2=780067&view=diff ============================================================================== --- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjection.java (original) +++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjection.java Fri May 29 18:54:07 2009 @@ -16,8 +16,6 @@ */ package org.apache.juddi.model; -import javax.persistence.Column; -import javax.persistence.Embeddable; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.JoinColumn; @@ -31,59 +29,11 @@ @Table(name = "juddiv3_service_projection") public class ServiceProjection implements java.io.Serializable { - @Embeddable - public static class Id implements java.io.Serializable { - - private static final long serialVersionUID = 1L; - - @Column(name = "business_key", nullable = false, length = 255) - private String businessKey; - @Column(name = "service_key", nullable = false, length = 255) - String serviceKey; - - public Id() { - } - public Id(String businessKey, String serviceKey) { - this.businessKey = businessKey; - this.serviceKey = serviceKey; - } - - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((businessKey == null) ? 0 : businessKey.hashCode()); - result = prime * result - + ((serviceKey == null) ? 0 : serviceKey.hashCode()); - return result; - } - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Id other = (Id) obj; - if (businessKey == null) { - if (other.businessKey != null) - return false; - } else if (!businessKey.equals(other.businessKey)) - return false; - if (serviceKey == null) { - if (other.serviceKey != null) - return false; - } else if (!serviceKey.equals(other.serviceKey)) - return false; - return true; - } - - } - + private static final long serialVersionUID = 1L; @EmbeddedId - private Id id = new Id(); + private ServiceProjectionId id = new ServiceProjectionId(); @ManyToOne @JoinColumn(name = "business_key", insertable = false, updatable = false) private BusinessEntity businessEntity; @@ -105,10 +55,10 @@ businessService.getProjectingBusinesses().add(this); } - public Id getId() { + public ServiceProjectionId getId() { return id; } - public void setId(Id id) { + public void setId(ServiceProjectionId id) { this.id = id; } Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjectionId.java URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjectionId.java?rev=780067&view=auto ============================================================================== --- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjectionId.java (added) +++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceProjectionId.java Fri May 29 18:54:07 2009 @@ -0,0 +1,74 @@ +/* + * Copyright 2001-2008 The Apache Software Foundation. + * + * 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 org.apache.juddi.model; + +import javax.persistence.Column; +import javax.persistence.Embeddable; + +/** + * @author Jeff Faath + */ + + +@Embeddable +public class ServiceProjectionId implements java.io.Serializable { + + private static final long serialVersionUID = 1L; + + @Column(name = "business_key", nullable = false, length = 255) + String businessKey; + @Column(name = "service_key", nullable = false, length = 255) + String serviceKey; + + public ServiceProjectionId() { + } + public ServiceProjectionId(String businessKey, String serviceKey) { + this.businessKey = businessKey; + this.serviceKey = serviceKey; + } + + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((businessKey == null) ? 0 : businessKey.hashCode()); + result = prime * result + + ((serviceKey == null) ? 0 : serviceKey.hashCode()); + return result; + } + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ServiceProjectionId other = (ServiceProjectionId) obj; + if (businessKey == null) { + if (other.businessKey != null) + return false; + } else if (!businessKey.equals(other.businessKey)) + return false; + if (serviceKey == null) { + if (other.serviceKey != null) + return false; + } else if (!serviceKey.equals(other.serviceKey)) + return false; + return true; + } + +} Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml?rev=780067&r1=780066&r2=780067&view=diff ============================================================================== --- webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml (original) +++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml Fri May 29 18:54:07 2009 @@ -38,6 +38,8 @@ org.apache.juddi.model.ServiceCategoryBag org.apache.juddi.model.ServiceDescr org.apache.juddi.model.ServiceName + org.apache.juddi.model.ServiceProjection + org.apache.juddi.model.ServiceProjectionId org.apache.juddi.model.Subscription org.apache.juddi.model.SubscriptionChunkToken org.apache.juddi.model.SubscriptionMatch Modified: webservices/juddi/branches/v3_trunk/juddi-cxf/persistence/openjpa-persistence.xml URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-cxf/persistence/openjpa-persistence.xml?rev=780067&r1=780066&r2=780067&view=diff ============================================================================== --- webservices/juddi/branches/v3_trunk/juddi-cxf/persistence/openjpa-persistence.xml (original) +++ webservices/juddi/branches/v3_trunk/juddi-cxf/persistence/openjpa-persistence.xml Fri May 29 18:54:07 2009 @@ -38,6 +38,8 @@ org.apache.juddi.model.ServiceCategoryBag org.apache.juddi.model.ServiceDescr org.apache.juddi.model.ServiceName + org.apache.juddi.model.ServiceProjection + org.apache.juddi.model.ServiceProjectionId org.apache.juddi.model.Subscription org.apache.juddi.model.SubscriptionChunkToken org.apache.juddi.model.SubscriptionMatch --------------------------------------------------------------------- To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: juddi-cvs-help@ws.apache.org