Merge branch 'master' into bug/JUDDI-1015
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java b/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
index eceb877..41c2cc4 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
@@ -23,6 +23,7 @@
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
@@ -89,6 +90,7 @@
this.accessPointType = accessPointType;
}
+ @Lob
@Column(name = "access_point_url", length = 4096)
public String getAccessPointUrl() {
return this.accessPointUrl;
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java b/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java
index a95c619..abf5920 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java
@@ -22,6 +22,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@@ -75,6 +76,7 @@
this.useType = useType;
}
+ @Lob
@Column(name = "url", nullable = false, length=4096)
public String getUrl() {
return this.url;
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Email.java b/juddi-core/src/main/java/org/apache/juddi/model/Email.java
index 2bf0d74..c80ccb6 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Email.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Email.java
@@ -22,6 +22,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@@ -79,6 +80,7 @@
this.useType = useType;
}
+ @Lob
@Column(name = "email_address", nullable = false, length=4096)
public String getEmailAddress() {
return this.emailAddress;
diff --git a/juddi-tomcat/build.xml b/juddi-tomcat/build.xml
index d912823..be5e480 100644
--- a/juddi-tomcat/build.xml
+++ b/juddi-tomcat/build.xml
@@ -56,6 +56,8 @@
<copy file="${dependency.mysql.jar}" todir="${lib.dir}"/>
<copy file="${dependency.postgres.jar}" todir="${lib.dir}"/>
+ <copy file="${dependency.mssql.jar}" todir="${lib.dir}"/>
+ <copy file="${dependency.oracle.jar}" todir="${lib.dir}"/>
<copy file="${dependency.log4j.jar}" todir="${lib.dir}"/>
<copy file="${dependency.derby.jar}" todir="${lib.dir}"/>
<copy file="${dependency.commons-discovery.jar}" todir="${lib.dir}"/>
diff --git a/juddi-tomcat/context.xml b/juddi-tomcat/context.xml
index 28ff8b5..fef1eb6 100644
--- a/juddi-tomcat/context.xml
+++ b/juddi-tomcat/context.xml
@@ -18,14 +18,14 @@
-->
<Context>
<WatchedResource>WEB-INF/web.xml</WatchedResource>
- <!-- -->
+ <!-- apache derby embedded -->
<Resource name="jdbc/JuddiDS" auth="Container"
type="javax.sql.DataSource" username="" password=""
driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
url="jdbc:derby:target/juddi-derby-test-db;create=true"
maxTotal="8"
/>
-
+
<!-- mysql
<Resource name="jdbc/JuddiDS" auth="Container"
type="javax.sql.DataSource" username="root" password=""
@@ -36,11 +36,20 @@
-->
<!-- postgresql
<Resource name="jdbc/JuddiDS" auth="Container"
- type="javax.sql.DataSource" username="juddi" password="juddi"
+ type="javax.sql.DataSource" username="juddi" password=""
driverClassName="org.postgresql.Driver"
url="jdbc:postgresql://localhost:5432/juddi"
maxActive="8"
/>
-->
+
+ <!-- oracle
+ <Resource name="jdbc/JuddiDS" auth="Container"
+ type="javax.sql.DataSource" username="juddi" password=""
+ driverClassName="oracle.jdbc.driver.OracleDriver"
+ url="jdbc:juddi:thin:@localhost:1521:xe"
+ maxActive="8"
+ />
+ -->
</Context>
diff --git a/juddi-tomcat/pom.xml b/juddi-tomcat/pom.xml
index f4820cd..14b063a 100644
--- a/juddi-tomcat/pom.xml
+++ b/juddi-tomcat/pom.xml
@@ -84,6 +84,18 @@
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>8.2.2.jre8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ <version>19.7.0.0</version>
+ </dependency>
+
+
</dependencies>
<build>
@@ -134,6 +146,9 @@
<property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}" />
<property name="dependency.mysql.jar" value="${maven.dependency.mysql.mysql-connector-java.jar.path}" />
<property name="dependency.postgres.jar" value="${maven.dependency.org.postgresql.postgresql.jar.path}" />
+ <property name="dependency.mssql.jar" value="${maven.dependency.com.microsoft.sqlserver.mssql-jdbc.jar.path}" />
+ <property name="dependency.oracle.jar" value="${maven.dependency.com.oracle.database.jdbc.ojdbc8.jar.path}" />
+
<property name="dependency.commons-discovery.jar" value="${maven.dependency.commons-discovery.commons-discovery.jar.path}" />
<property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}" />
<property name="dependency.tomcat.zip" value="${maven.dependency.org.apache.tomcat.tomcat.zip.path}" />
