You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2020/08/13 00:39:43 UTC
[juddi] branch bug/JUDDI-1015 updated (28dd720 -> 4d7bc5a)
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a change to branch bug/JUDDI-1015
in repository https://gitbox.apache.org/repos/asf/juddi.git.
from 28dd720 NOJIRA removing the oracle jdbc drive due to asf license compatibilityh concerns
add 033870a NOJIRA updates tomcat version
add ab72847 JUDDI-1009 reworks a number of functions in the ui related to paging operations, limits, offsets, etc. i think everything is working now. Adds some new functionality and some alt text warnings when using uddiv2 connections (offsets are not in the data model)
add 1c7db5d JUDDI-1014 adds a field to display the display name of tmodels when adding tmodel instance info, tmodel instance params
new 7a26bed Merge branch 'master' into bug/JUDDI-1015
new 4d7bc5a JUDDI-1015 reduces sql identifiers for better support for both mssql and for oracledb. JUDDI-1101 related. also resolves sql query issues for discoery url due to varchar to clob change
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/juddi/model/PublisherAssertion.java | 2 +-
.../juddi/model/ReplicationConfiguration.java | 7 +-
.../juddi/model/ReplicationConfigurationNode.java | 2 +-
.../java/org/apache/juddi/model/Signature.java | 2 +-
.../query/FindBusinessByDiscoveryURLQuery.java | 4 +-
.../java/org/apache/juddi/ddl/generator/App.java | 1 -
.../apache/juddi/webconsole/PostBackConstants.java | 1 +
.../org/apache/juddi/webconsole/hub/UddiHub.java | 24 ++++-
.../juddi/webconsole/hub/builders/Printers.java | 6 +-
.../juddi/webconsole/resources/web.properties | 2 +
.../juddi/webconsole/resources/web_es.properties | 2 +
juddi-gui/src/main/webapp/about.jsp | 4 +-
juddi-gui/src/main/webapp/advanced.jsp | 4 +-
juddi-gui/src/main/webapp/ajax/businesssearch.jsp | 8 +-
juddi-gui/src/main/webapp/ajax/servicesearch.jsp | 2 +-
juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp | 6 +-
juddi-gui/src/main/webapp/assertions.jsp | 4 +-
juddi-gui/src/main/webapp/bindingChooser.jsp | 3 -
juddi-gui/src/main/webapp/bindingEditor.jsp | 14 ++-
juddi-gui/src/main/webapp/businessBrowse.jsp | 9 +-
juddi-gui/src/main/webapp/businessEditor2.jsp | 4 +-
juddi-gui/src/main/webapp/editSubscription.jsp | 4 +-
juddi-gui/src/main/webapp/home.jsp | 4 +-
juddi-gui/src/main/webapp/importFromWadl.jsp | 4 +-
juddi-gui/src/main/webapp/importFromWsdl.jsp | 4 +-
juddi-gui/src/main/webapp/js/bindingeditor.js | 1 -
juddi-gui/src/main/webapp/js/businesssearch.js | 13 ++-
juddi-gui/src/main/webapp/js/serviceBrowse.js | 14 ++-
juddi-gui/src/main/webapp/js/serviceEditor.js | 8 +-
juddi-gui/src/main/webapp/js/tmodelChooser.js | 16 ++-
juddi-gui/src/main/webapp/js/tmodelsearch.js | 99 ++++++++++---------
juddi-gui/src/main/webapp/reginfo.jsp | 4 +-
juddi-gui/src/main/webapp/search.jsp | 4 +-
juddi-gui/src/main/webapp/serviceBrowse.jsp | 94 +++++++++---------
juddi-gui/src/main/webapp/serviceEditor.jsp | 4 +-
juddi-gui/src/main/webapp/settings.jsp | 4 +-
juddi-gui/src/main/webapp/signer.jsp | 4 +-
juddi-gui/src/main/webapp/subscriptionFeed.jsp | 4 +-
juddi-gui/src/main/webapp/tmodelBrowse.jsp | 109 +++++++++++----------
juddi-gui/src/main/webapp/tmodelChooser.jsp | 4 +-
juddi-gui/src/main/webapp/tmodelEditor.jsp | 4 +-
juddi-gui/src/main/webapp/tmodelPartitions.jsp | 4 +-
juddi-gui/src/main/webapp/transfer.jsp | 4 +-
juddi-gui/src/main/webapp/viewSubscriptions.jsp | 4 +-
pom.xml | 2 +-
45 files changed, 301 insertions(+), 226 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[juddi] 01/02: Merge branch 'master' into bug/JUDDI-1015
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a commit to branch bug/JUDDI-1015
in repository https://gitbox.apache.org/repos/asf/juddi.git
commit 7a26bedd92cff633d641118d19b5237ac8474105
Merge: 28dd720 1c7db5d
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Wed Jul 22 18:16:54 2020 -0400
Merge branch 'master' into bug/JUDDI-1015
.../apache/juddi/webconsole/PostBackConstants.java | 1 +
.../org/apache/juddi/webconsole/hub/UddiHub.java | 24 ++++-
.../juddi/webconsole/hub/builders/Printers.java | 6 +-
.../juddi/webconsole/resources/web.properties | 2 +
.../juddi/webconsole/resources/web_es.properties | 2 +
juddi-gui/src/main/webapp/about.jsp | 4 +-
juddi-gui/src/main/webapp/advanced.jsp | 4 +-
juddi-gui/src/main/webapp/ajax/businesssearch.jsp | 8 +-
juddi-gui/src/main/webapp/ajax/servicesearch.jsp | 2 +-
juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp | 6 +-
juddi-gui/src/main/webapp/assertions.jsp | 4 +-
juddi-gui/src/main/webapp/bindingChooser.jsp | 3 -
juddi-gui/src/main/webapp/bindingEditor.jsp | 14 ++-
juddi-gui/src/main/webapp/businessBrowse.jsp | 9 +-
juddi-gui/src/main/webapp/businessEditor2.jsp | 4 +-
juddi-gui/src/main/webapp/editSubscription.jsp | 4 +-
juddi-gui/src/main/webapp/home.jsp | 4 +-
juddi-gui/src/main/webapp/importFromWadl.jsp | 4 +-
juddi-gui/src/main/webapp/importFromWsdl.jsp | 4 +-
juddi-gui/src/main/webapp/js/bindingeditor.js | 1 -
juddi-gui/src/main/webapp/js/businesssearch.js | 13 ++-
juddi-gui/src/main/webapp/js/serviceBrowse.js | 14 ++-
juddi-gui/src/main/webapp/js/serviceEditor.js | 8 +-
juddi-gui/src/main/webapp/js/tmodelChooser.js | 16 ++-
juddi-gui/src/main/webapp/js/tmodelsearch.js | 99 ++++++++++---------
juddi-gui/src/main/webapp/reginfo.jsp | 4 +-
juddi-gui/src/main/webapp/search.jsp | 4 +-
juddi-gui/src/main/webapp/serviceBrowse.jsp | 94 +++++++++---------
juddi-gui/src/main/webapp/serviceEditor.jsp | 4 +-
juddi-gui/src/main/webapp/settings.jsp | 4 +-
juddi-gui/src/main/webapp/signer.jsp | 4 +-
juddi-gui/src/main/webapp/subscriptionFeed.jsp | 4 +-
juddi-gui/src/main/webapp/tmodelBrowse.jsp | 109 +++++++++++----------
juddi-gui/src/main/webapp/tmodelChooser.jsp | 4 +-
juddi-gui/src/main/webapp/tmodelEditor.jsp | 4 +-
juddi-gui/src/main/webapp/tmodelPartitions.jsp | 4 +-
juddi-gui/src/main/webapp/transfer.jsp | 4 +-
juddi-gui/src/main/webapp/viewSubscriptions.jsp | 4 +-
pom.xml | 2 +-
39 files changed, 291 insertions(+), 218 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[juddi] 02/02: JUDDI-1015 reduces sql identifiers for better
support for both mssql and for oracledb. JUDDI-1101 related. also resolves
sql query issues for discoery url due to varchar to clob change
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a commit to branch bug/JUDDI-1015
in repository https://gitbox.apache.org/repos/asf/juddi.git
commit 4d7bc5a3bf37e7d5341286432c129f8fb1a4b203
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Wed Aug 12 20:39:39 2020 -0400
JUDDI-1015 reduces sql identifiers for better support for both mssql and for oracledb.
JUDDI-1101 related. also resolves sql query issues for discoery url due to varchar to clob change
---
.../src/main/java/org/apache/juddi/model/PublisherAssertion.java | 2 +-
.../main/java/org/apache/juddi/model/ReplicationConfiguration.java | 7 +++++--
.../java/org/apache/juddi/model/ReplicationConfigurationNode.java | 2 +-
juddi-core/src/main/java/org/apache/juddi/model/Signature.java | 2 +-
.../org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java | 4 ++--
.../src/main/java/org/apache/juddi/ddl/generator/App.java | 1 -
6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java b/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
index 2d5ec2f..d2dac96 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
@@ -37,7 +37,7 @@ import javax.persistence.TemporalType;
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
*/
@Entity
-@Table(name = "j3_publisher_assertion")
+@Table(name = "j3_pubassrt")
public class PublisherAssertion implements java.io.Serializable {
private static final long serialVersionUID = -5285434317957104272L;
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
index 93d0f73..1e3de5c 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
@@ -73,7 +73,7 @@ public class ReplicationConfiguration implements Serializable {
* Gets the value of the serialNumber property.
*
*/
- @Column(name = "serialnumb")
+ @Column(name = "serno")
@OrderBy(value = "SerialNumber DESC")
@Id
public Long getSerialNumber() {
@@ -206,7 +206,10 @@ public class ReplicationConfiguration implements Serializable {
}
// @OneToMany( fetch = FetchType.LAZY,targetEntity = Edge.class, mappedBy = "Edge")
- @OneToMany(targetEntity = Edge.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ @OneToMany(targetEntity = Edge.class,
+ fetch = FetchType.LAZY, cascade = CascadeType.ALL
+ //mappedBy = "j3_edge"
+ )
public List<Edge> getEdge() {
return this.edge;
}
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfigurationNode.java b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfigurationNode.java
index e146375..7b03ffc 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfigurationNode.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfigurationNode.java
@@ -37,7 +37,7 @@ public class ReplicationConfigurationNode implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private ReplicationConfiguration parent;
- String rx;
+ private String rx;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Signature.java b/juddi-core/src/main/java/org/apache/juddi/model/Signature.java
index 856014a..886092d 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Signature.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Signature.java
@@ -33,7 +33,7 @@ import javax.persistence.Table;
*
*/
@Entity
-@Table(name = "j3_signature")
+@Table(name = "j3_sig")
public class Signature implements java.io.Serializable {
private static final long serialVersionUID = -3233157941119408718L;
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
index b606ad4..ac85264 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
@@ -91,10 +91,10 @@ public class FindBusinessByDiscoveryURLQuery extends BusinessEntityQuery {
String urlValue = discURL.getValue();
if (discURL.getUseType() == null || discURL.getUseType().length() == 0 ) {
- qry.appendGroupedAnd(new DynamicQuery.Parameter(urlTerm, urlValue, DynamicQuery.PREDICATE_EQUALS));
+ qry.appendGroupedAnd(new DynamicQuery.Parameter(urlTerm, urlValue, DynamicQuery.PREDICATE_LIKE));
}
else {
- qry.appendGroupedAnd(new DynamicQuery.Parameter(urlTerm, urlValue, DynamicQuery.PREDICATE_EQUALS),
+ qry.appendGroupedAnd(new DynamicQuery.Parameter(urlTerm, urlValue, DynamicQuery.PREDICATE_LIKE),
new DynamicQuery.Parameter(entityAliasChild + ".useType", discURL.getUseType(), DynamicQuery.PREDICATE_EQUALS));
}
diff --git a/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java b/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java
index d226c30..4f5a7f6 100644
--- a/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java
+++ b/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java
@@ -255,7 +255,6 @@ public class App {
*/
private static enum Dialect {
- ORACLE("org.hibernate.dialect.Oracle10gDialect"),
MYSQL("org.hibernate.dialect.MySQLDialect"),
HSQL("org.hibernate.dialect.HSQLDialect"),
POSTGRES("org.hibernate.dialect.PostgreSQLDialect"),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org