You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2013/03/07 16:39:12 UTC

svn commit: r1453917 - in /juddi/trunk: docs/db/ddl/ juddi-core-openjpa/ juddi-core/ juddi-core/src/main/java/org/apache/juddi/model/

Author: kstam
Date: Thu Mar  7 15:39:11 2013
New Revision: 1453917

URL: http://svn.apache.org/r1453917
Log:
JUDDI-562 fixing build issues. Somehow we started running into the LOB max of 255 issue on Derby with Hibernate. Good catch by CI.

Modified:
    juddi/trunk/docs/db/ddl/README.txt
    juddi/trunk/docs/db/ddl/db2.ddl
    juddi/trunk/docs/db/ddl/derby.ddl
    juddi/trunk/juddi-core-openjpa/pom.xml
    juddi/trunk/juddi-core/pom.xml
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ObjectTypeContent.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Reference.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureTransformDataValue.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureValue.java

Modified: juddi/trunk/docs/db/ddl/README.txt
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/README.txt?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/README.txt (original)
+++ juddi/trunk/docs/db/ddl/README.txt Thu Mar  7 15:39:11 2013
@@ -26,6 +26,7 @@ Dialects can be found at https://www.hib
 
 DB2Dialect
 DerbyDialect
+MySQLDBDialect
 MySQL5InnoDBDialect
 Oracle9Dialect
 PostgreSQLDialect

Modified: juddi/trunk/docs/db/ddl/db2.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/db2.ddl?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/db2.ddl (original)
+++ juddi/trunk/docs/db/ddl/db2.ddl Thu Mar  7 15:39:11 2013
@@ -187,8 +187,8 @@
         id bigint generated by default as identity,
         key_data_name varchar(255),
         key_data_type varchar(255),
-        key_data_value blob(255),
-        key_data_value_string clob(255),
+        key_data_value blob(65636),
+        key_data_value_string clob(65636),
         key_data_value_key bigint,
         key_info_key bigint,
         primary key (id)
@@ -244,7 +244,7 @@
 
     create table j3_object_type_content (
         id bigint generated by default as identity,
-        content blob(255),
+        content blob(65636),
         object_type_key bigint not null,
         primary key (id)
     );
@@ -309,7 +309,7 @@
     create table j3_reference (
         id bigint generated by default as identity,
         digest_method varchar(255),
-        digest_value blob(255),
+        digest_value blob(65636),
         type varchar(255),
         uri varchar(255),
         xml_id varchar(255),
@@ -375,7 +375,7 @@
 
     create table j3_signature_transform_data_value (
         id bigint generated by default as identity,
-        content_bytes blob(255),
+        content_bytes blob(65636),
         content_type varchar(255),
         signature_transform_key bigint not null,
         primary key (id)
@@ -383,7 +383,7 @@
 
     create table j3_signature_value (
         id bigint generated by default as identity,
-        value_bytes blob(255),
+        value_bytes blob(65636),
         xml_id varchar(255),
         primary key (id)
     );

Modified: juddi/trunk/docs/db/ddl/derby.ddl
URL: http://svn.apache.org/viewvc/juddi/trunk/docs/db/ddl/derby.ddl?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/docs/db/ddl/derby.ddl (original)
+++ juddi/trunk/docs/db/ddl/derby.ddl Thu Mar  7 15:39:11 2013
@@ -187,8 +187,8 @@
         id bigint not null,
         key_data_name varchar(255),
         key_data_type varchar(255),
-        key_data_value blob(255),
-        key_data_value_string clob(255),
+        key_data_value blob(65636),
+        key_data_value_string clob(65636),
         key_data_value_key bigint,
         key_info_key bigint,
         primary key (id)
@@ -244,7 +244,7 @@
 
     create table j3_object_type_content (
         id bigint not null,
-        content blob(255),
+        content blob(65636),
         object_type_key bigint not null,
         primary key (id)
     );
@@ -309,7 +309,7 @@
     create table j3_reference (
         id bigint not null,
         digest_method varchar(255),
-        digest_value blob(255),
+        digest_value blob(65636),
         type varchar(255),
         uri varchar(255),
         xml_id varchar(255),
@@ -375,7 +375,7 @@
 
     create table j3_signature_transform_data_value (
         id bigint not null,
-        content_bytes blob(255),
+        content_bytes blob(65636),
         content_type varchar(255),
         signature_transform_key bigint not null,
         primary key (id)
@@ -383,7 +383,7 @@
 
     create table j3_signature_value (
         id bigint not null,
-        value_bytes blob(255),
+        value_bytes blob(65636),
         xml_id varchar(255),
         primary key (id)
     );

Modified: juddi/trunk/juddi-core-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/pom.xml?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/pom.xml (original)
+++ juddi/trunk/juddi-core-openjpa/pom.xml Thu Mar  7 15:39:11 2013
@@ -24,9 +24,6 @@
 	</parent>
 	<artifactId>juddi-core-openjpa</artifactId>
 	<packaging>bundle</packaging>
-	<properties>
-		<persistence>openjpa</persistence>
-	</properties>
 	
 	<name>jUDDI Core - OpenJPA</name>
 	<build>
@@ -67,6 +64,7 @@
 						<phase>compile</phase>
 						<configuration>
 							<tasks>
+							    <echo>PERSISTENCE***** ${persistence}</echo>
 							    <property name="persistence" value="${persistence}" />
 								<property name="juddi.core.dir" value="${basedir}/../juddi-core" />
 								<property name="dependency.juddi.core" value="${maven.dependency.org.apache.juddi.juddi-core.jar.path}" />
@@ -198,12 +196,11 @@
 	<profiles>
 		<profile>
 			<id>hibernate</id>
+			<properties>
+                <persistence>hibernate</persistence>
+            </properties>
 			<activation>
 				<activeByDefault>false</activeByDefault>
-				<property>
-					<name>persistence</name>
-					<value>hibernate</value>
-				</property>
 			</activation>
 			<dependencies>
 				<dependency>
@@ -237,12 +234,11 @@
 		</profile>
 		<profile>
 			<id>openjpa</id>
+			<properties>
+                <persistence>openjpa</persistence>
+            </properties>
 			<activation>
 				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>persistence</name>
-					<value>openjpa</value>
-				</property>
 			</activation>
 			<dependencies>
 				<dependency>

Modified: juddi/trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/pom.xml?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/juddi-core/pom.xml (original)
+++ juddi/trunk/juddi-core/pom.xml Thu Mar  7 15:39:11 2013
@@ -24,9 +24,6 @@
 	</parent>
 	<artifactId>juddi-core</artifactId>
 	<packaging>bundle</packaging>
-	<properties>
-		<persistence>hibernate</persistence>
-	</properties>
 	
 	<name>jUDDI Core</name>
 	<build>
@@ -57,6 +54,7 @@
 				</instructions>
 				</configuration>
 			</plugin>
+			<!--  
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
@@ -113,6 +111,7 @@
 					</execution>
 				</executions>
 			</plugin>
+			-->
 		</plugins>
 	</build>
 	<dependencies>
@@ -193,13 +192,12 @@
 	</dependencies>
 	<profiles>
 		<profile>
-			<id>hibernate</id>
+		    <id>hibernate</id>
+		    <properties>
+                <persistence>hibernate</persistence>
+            </properties>
 			<activation>
 				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>persistence</name>
-					<value>hibernate</value>
-				</property>
 			</activation>
 			<dependencies>
 				<dependency>
@@ -308,12 +306,11 @@
 		</profile>
 		<profile>
 			<id>openjpa</id>
+			<properties>
+                <persistence>openjpa</persistence>
+            </properties>
 			<activation>
 			    <activeByDefault>false</activeByDefault>
-				<property>
-					<name>persistence</name>
-					<value>openjpa</value>
-				</property>
 			</activation>
 			<dependencies>
 				<dependency>

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java Thu Mar  7 15:39:11 2013
@@ -121,7 +121,7 @@ public class KeyDataValue implements jav
     }
 
     @Lob
-    @Column(name="key_data_value")
+    @Column(name="key_data_value", length = 65636)
     public byte[] getKeyDataValueBytes() {
         return keyDataValueBytes;
     }
@@ -131,7 +131,7 @@ public class KeyDataValue implements jav
     }
 
     @Lob
-    @Column(name="key_data_value_string")
+    @Column(name="key_data_value_string", length = 65636)
     public String getKeyDataValueString() {
         return keyDataValueString;
     }

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ObjectTypeContent.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ObjectTypeContent.java?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ObjectTypeContent.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/ObjectTypeContent.java Thu Mar  7 15:39:11 2013
@@ -15,6 +15,7 @@
  */
 package org.apache.juddi.model;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -58,6 +59,7 @@ public class ObjectTypeContent implement
     }
     
     @Lob
+    @Column(length = 65636)
     public byte[] getContent() {
         return content;
     }

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Reference.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Reference.java?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Reference.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Reference.java Thu Mar  7 15:39:11 2013
@@ -88,7 +88,7 @@ public class Reference {
     }
 
     @Lob
-    @Column(name="digest_value")
+    @Column(name="digest_value", length = 65636)
     public byte[] getDigestValue() {
         return digestValue;
     }

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureTransformDataValue.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureTransformDataValue.java?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureTransformDataValue.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureTransformDataValue.java Thu Mar  7 15:39:11 2013
@@ -69,7 +69,7 @@ public class SignatureTransformDataValue
     }
 
     @Lob
-    @Column(name="content_bytes")
+    @Column(name="content_bytes", length = 65636)
     public byte[] getContentBytes() {
         return contentBytes;
     }

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureValue.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureValue.java?rev=1453917&r1=1453916&r2=1453917&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureValue.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/SignatureValue.java Thu Mar  7 15:39:11 2013
@@ -45,7 +45,7 @@ public class SignatureValue implements j
         this.id = id;
     }
 
-    @Column(name="value_bytes")
+    @Column(name="value_bytes", length = 65636)
     @Lob
     public byte[] getValue() {
         return value;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org