You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2008/10/29 15:10:10 UTC

svn commit: r708910 - in /webservices/juddi/branches/v3_trunk: ./ juddi-core/ juddi-core/src/main/java/org/apache/juddi/model/ juddi-core/src/main/resources/META-INF/

Author: tcunning
Date: Wed Oct 29 07:10:10 2008
New Revision: 708910

URL: http://svn.apache.org/viewvc?rev=708910&view=rev
Log:
Convert to using derby as back end by default.

Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBagGroup.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Subscription.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/META-INF/persistence.xml
    webservices/juddi/branches/v3_trunk/pom.xml

Modified: webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/pom.xml?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/pom.xml Wed Oct 29 07:10:10 2008
@@ -67,6 +67,12 @@
 			<scope>test</scope>
 			<classifier>jdk15</classifier>
 		</dependency>
+                <dependency>
+                        <groupId>org.apache.derby</groupId>
+                        <artifactId>derby</artifactId>
+                        <version>10.1.2.1</version>
+                        <scope>test</scope>
+                </dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate</artifactId>
@@ -109,4 +115,4 @@
 	    </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AuthToken.java Wed Oct 29 07:10:10 2008
@@ -56,7 +56,7 @@
 	}
 
 	@Id
-	@Column(name = "auth_token", unique = true, nullable = false, length = 51)
+	@Column(name = "auth_token", nullable = false, length = 51)
 	public String getAuthToken() {
 		return this.authToken;
 	}

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java Wed Oct 29 07:10:10 2008
@@ -71,7 +71,7 @@
 	}
 
 	@Id
-	@Column(name = "binding_key", unique = true, nullable = false, length = 255)
+	@Column(name = "binding_key", nullable = false, length = 255)
 	public String getBindingKey() {
 		return this.bindingKey;
 	}

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java Wed Oct 29 07:10:10 2008
@@ -86,7 +86,7 @@
 	}
 
 	@Id
-	@Column(name = "business_key", unique = true, nullable = false, length = 255)
+	@Column(name = "business_key", nullable = false, length = 255)
 	public String getBusinessKey() {
 		return this.businessKey;
 	}

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java Wed Oct 29 07:10:10 2008
@@ -66,7 +66,7 @@
 	}
 
 	@Id
-	@Column(name = "service_key", unique = true, nullable = false, length = 255)
+	@Column(name = "service_key", nullable = false, length = 255)
 	public String getServiceKey() {
 		return this.serviceKey;
 	}

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBagGroup.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBagGroup.java?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBagGroup.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBagGroup.java Wed Oct 29 07:10:10 2008
@@ -43,7 +43,7 @@
 	}
 
 	@Id
-	@Column(name = "bag_group_id", unique = true, nullable = false)
+	@Column(name = "bag_group_id", nullable = false)
 
 	public int getBagGroupId() {
 		return this.bagGroupId;

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java Wed Oct 29 07:10:10 2008
@@ -61,7 +61,7 @@
 	}
 
 	@Id
-	@Column(name = "publisher_id", unique = true, nullable = false, length = 20)
+	@Column(name = "publisher_id", nullable = false, length = 20)
 	public String getPublisherId() {
 		return this.publisherId;
 	}

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Subscription.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Subscription.java?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Subscription.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Subscription.java Wed Oct 29 07:10:10 2008
@@ -43,7 +43,7 @@
 	}
 
 	@Id
-	@Column(name = "subscription_key", unique = true, nullable = false, length = 255)
+	@Column(name = "subscription_key", nullable = false, length = 255)
 	public String getSubscriptionKey() {
 		return this.subscriptionKey;
 	}

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java Wed Oct 29 07:10:10 2008
@@ -77,7 +77,7 @@
 	}
 
 	@Id
-	@Column(name = "tmodel_key", unique = true, nullable = false, length = 255)
+	@Column(name = "tmodel_key", nullable = false, length = 255)
 	public String getTmodelKey() {
 		return this.tmodelKey;
 	}

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java Wed Oct 29 07:10:10 2008
@@ -47,7 +47,7 @@
 	}
 
 	@Id
-	@Column(name = "tmodel_overview_id", unique = true, nullable = false)
+	@Column(name = "tmodel_overview_id", nullable = false)
 
 	public int getTmodelOverviewId() {
 		return this.tmodelOverviewId;

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/META-INF/persistence.xml?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/META-INF/persistence.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/META-INF/persistence.xml Wed Oct 29 07:10:10 2008
@@ -14,12 +14,13 @@
       <property name="hibernate.archive.autodetection" value="class"/>
       <property name="hibernate.hbm2ddl.auto" value="update"/>
       <property name="hibernate.show_sql" value="true"/>
-       
+
       <!-- connection properties -->
-      <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"/>
-      <property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/juddi?autoReconnect=true"/>
-      <property name="hibernate.connection.username" value="juddi"/>
-      <property name="hibernate.connection.password" value="juddi"/>
+      <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
+       <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+      <property name="hibernate.connection.url" value="jdbc:derby:juddi-derby-test-db;create=true"/>
+      <property name="hibernate.connection.username" value=""/>
+      <property name="hibernate.connection.password" value=""/>
 
       <!-- connection pool properties -->
       <property name="hibernate.dbcp.maxActive" value="100"/>

Modified: webservices/juddi/branches/v3_trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/pom.xml?rev=708910&r1=708909&r2=708910&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/pom.xml Wed Oct 29 07:10:10 2008
@@ -162,6 +162,12 @@
 			<version>1.0</version>
 		</dependency>
 		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.1.2.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>5.1.6</version>
@@ -187,4 +193,4 @@
 	      <version>1.2.13</version>
 	    </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>



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