You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2005/03/02 03:52:29 UTC
cvs commit: ws-juddi/sql/postgresql insert_publishers.sql create_database.sql
sviens 2005/03/01 18:52:29
Modified: src/java/org/apache/juddi/datatype/publisher Publisher.java
sql/db2 insert_publishers.sql create_database.sql
sql/jdatastore insert_publishers.sql create_database.sql
sql/totalxml create_database.sql insert_publishers.sql
sql/sybase create_database.sql insert_publishers.sql
src/java/org/apache/juddi/handler
PublisherDetailHandler.java PublisherHandler.java
SavePublisherHandler.java
sql/mysql create_database.sql insert_publishers.sql
src/java/org/apache/juddi/function SaveBusinessFunction.java
sql/hsqldb create_database.sql insert_publishers.sql
src/java/org/apache/juddi/datastore/jdbc PublisherTable.java
sql/oracle create_database.sql insert_publishers.sql
sql/firebird create_database.sql
sql/postgresql insert_publishers.sql create_database.sql
Log:
Eliminated the unused LAST_NAME, FIRST_NAME, MIDDLE_INIT, WORK_PHONE, MOBILE_PHONE and PAGER columns. Also, renamed ADMIN and ENABLED columns of the PUBLISHER table to IS_ADMIN and IS_ENABLED respectively to get around a reserved word issue for 'ADMIN' in Firebird SQL.
Revision Changes Path
1.3 +0 -102 ws-juddi/src/java/org/apache/juddi/datatype/publisher/Publisher.java
Index: Publisher.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datatype/publisher/Publisher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Publisher.java 11 Mar 2004 18:06:11 -0000 1.2
+++ Publisher.java 2 Mar 2005 02:52:28 -0000 1.3
@@ -25,12 +25,6 @@
{
private String publisherID;
private String nameValue;
- private String firstName;
- private String lastName;
- private String middleInit;
- private String workPhone;
- private String mobilePhone;
- private String pager;
private String emailAddress;
private boolean admin;
private boolean enabled;
@@ -112,102 +106,6 @@
/**
*
*/
- public void setFirstName(String name)
- {
- this.firstName = name;
- }
-
- /**
- *
- */
- public String getFirstName()
- {
- return this.firstName;
- }
-
- /**
- *
- */
- public void setLastName(String name)
- {
- this.lastName = name;
- }
-
- /**
- *
- */
- public String getLastName()
- {
- return this.lastName;
- }
-
- /**
- *
- */
- public void setMiddleInit(String init)
- {
- this.middleInit = init;
- }
-
- /**
- *
- */
- public String getMiddleInit()
- {
- return this.middleInit;
- }
-
- /**
- *
- */
- public void setWorkPhone(String phone)
- {
- this.workPhone = phone;
- }
-
- /**
- *
- */
- public String getWorkPhone()
- {
- return this.workPhone;
- }
-
- /**
- *
- */
- public void setMobilePhone(String phone)
- {
- this.mobilePhone = phone;
- }
-
- /**
- *
- */
- public String getMobilePhone()
- {
- return this.mobilePhone;
- }
-
- /**
- *
- */
- public void setPager(String pager)
- {
- this.pager = pager;
- }
-
- /**
- *
- */
- public String getPager()
- {
- return this.pager;
- }
-
- /**
- *
- */
public void setEmailAddress(String email)
{
this.emailAddress = email;
1.3 +1 -1 ws-juddi/sql/db2/insert_publishers.sql
Index: insert_publishers.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/db2/insert_publishers.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- insert_publishers.sql 30 May 2004 17:04:21 -0000 1.2
+++ insert_publishers.sql 2 Mar 2005 02:52:28 -0000 1.3
@@ -1,5 +1,5 @@
USE juddi;
-- *** SAMPLE PUBLISHER ***
--- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,ENABLED,ADMIN)
+-- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN)
-- VALUES ('jdoe','John Doe','john.doe@apache.org','true','true');
1.2 +2 -8 ws-juddi/sql/db2/create_database.sql
Index: create_database.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/db2/create_database.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create_database.sql 30 May 2004 17:04:21 -0000 1.1
+++ create_database.sql 2 Mar 2005 02:52:28 -0000 1.2
@@ -379,15 +379,9 @@
(
PUBLISHER_ID VARCHAR(20) NOT NULL,
PUBLISHER_NAME VARCHAR(255) NOT NULL,
- LAST_NAME VARCHAR(150),
- FIRST_NAME VARCHAR(100),
- MIDDLE_INIT VARCHAR(5),
- WORK_PHONE VARCHAR(50),
- MOBILE_PHONE VARCHAR(50),
- PAGER VARCHAR(50),
EMAIL_ADDRESS VARCHAR(255),
- ADMIN VARCHAR(5),
- ENABLED VARCHAR(5),
+ IS_ADMIN VARCHAR(5),
+ IS_ENABLED VARCHAR(5),
PRIMARY KEY (PUBLISHER_ID)
);
1.3 +1 -1 ws-juddi/sql/jdatastore/insert_publishers.sql
Index: insert_publishers.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/jdatastore/insert_publishers.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- insert_publishers.sql 31 May 2004 00:37:32 -0000 1.2
+++ insert_publishers.sql 2 Mar 2005 02:52:28 -0000 1.3
@@ -1,3 +1,3 @@
-- *** SAMPLE PUBLISHER ***
--- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,ENABLED,ADMIN)
+-- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN)
-- VALUES ('jdoe','John Doe','john.doe@apache.org','true','true');
1.3 +2 -8 ws-juddi/sql/jdatastore/create_database.sql
Index: create_database.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/jdatastore/create_database.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- create_database.sql 8 Jul 2004 19:23:10 -0000 1.2
+++ create_database.sql 2 Mar 2005 02:52:28 -0000 1.3
@@ -380,15 +380,9 @@
(
PUBLISHER_ID VARCHAR(20) NOT NULL,
PUBLISHER_NAME VARCHAR(255) NOT NULL,
-LAST_NAME VARCHAR(150) NULL,
-FIRST_NAME VARCHAR(100) NULL,
-MIDDLE_INIT VARCHAR(5) NULL,
-WORK_PHONE VARCHAR(50) NULL,
-MOBILE_PHONE VARCHAR(50) NULL,
-PAGER VARCHAR(50) NULL,
EMAIL_ADDRESS VARCHAR(255) NULL,
-ADMIN VARCHAR(5) NULL,
-ENABLED VARCHAR(5) NULL,
+IS_ADMIN VARCHAR(5) NULL,
+IS_ENABLED VARCHAR(5) NULL,
PRIMARY KEY (PUBLISHER_ID)
);
1.2 +2 -10 ws-juddi/sql/totalxml/create_database.sql
Index: create_database.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/totalxml/create_database.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create_database.sql 31 May 2004 00:33:50 -0000 1.1
+++ create_database.sql 2 Mar 2005 02:52:28 -0000 1.2
@@ -378,15 +378,9 @@
(
PUBLISHER_ID VARCHAR(20) NOT NULL,
PUBLISHER_NAME VARCHAR(255) NOT NULL,
- LAST_NAME VARCHAR(150) NULL,
- FIRST_NAME VARCHAR(100) NULL,
- MIDDLE_INIT VARCHAR(5) NULL,
- WORK_PHONE VARCHAR(50) NULL,
- MOBILE_PHONE VARCHAR(50) NULL,
- PAGER VARCHAR(50) NULL,
EMAIL_ADDRESS VARCHAR(255) NULL,
- ADMIN VARCHAR(5) NULL,
- ENABLED VARCHAR(5) NULL,
+ IS_ADMIN VARCHAR(5) NULL,
+ IS_ENABLED VARCHAR(5) NULL,
PRIMARY KEY (PUBLISHER_ID)
);
@@ -578,7 +572,5 @@
INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
VALUES ('uuid:B1B1BAF5-2329-43E6-AE13-BA8E97195039',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','identifier');
-insert into PUBLISHER values('snayak','Subrahmanya Nayak', 'nayak', 'subrahmanya', 'B', '2510701', '9818088966', '222222', 'subrahmanya@noida.hcltech.com', 'admin','yes');
-insert into AUTH_TOKEN values('authtokensnayak','snayak','Subrahmanya Nayak',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,4,0);
commit;
1.3 +1 -1 ws-juddi/sql/totalxml/insert_publishers.sql
Index: insert_publishers.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/totalxml/insert_publishers.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- insert_publishers.sql 31 May 2004 00:33:50 -0000 1.2
+++ insert_publishers.sql 2 Mar 2005 02:52:28 -0000 1.3
@@ -1,3 +1,3 @@
-- *** SAMPLE PUBLISHER ***
--- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,ENABLED,ADMIN)
+-- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN)
-- VALUES ('jdoe','John Doe','john.doe@apache.org','true','true');
1.2 +2 -8 ws-juddi/sql/sybase/create_database.sql
Index: create_database.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/sybase/create_database.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create_database.sql 30 May 2004 23:50:03 -0000 1.1
+++ create_database.sql 2 Mar 2005 02:52:28 -0000 1.2
@@ -378,15 +378,9 @@
(
PUBLISHER_ID VARCHAR(20) NOT NULL,
PUBLISHER_NAME VARCHAR(255) NOT NULL,
- LAST_NAME VARCHAR(150) NULL,
- FIRST_NAME VARCHAR(100) NULL,
- MIDDLE_INIT VARCHAR(5) NULL,
- WORK_PHONE VARCHAR(50) NULL,
- MOBILE_PHONE VARCHAR(50) NULL,
- PAGER VARCHAR(50) NULL,
EMAIL_ADDRESS VARCHAR(255) NULL,
- ADMIN VARCHAR(5) NULL,
- ENABLED VARCHAR(5) NULL,
+ IS_ADMIN VARCHAR(5) NULL,
+ IS_ENABLED VARCHAR(5) NULL,
PRIMARY KEY (PUBLISHER_ID)
)
1.2 +1 -1 ws-juddi/sql/sybase/insert_publishers.sql
Index: insert_publishers.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/sybase/insert_publishers.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- insert_publishers.sql 30 May 2004 23:50:03 -0000 1.1
+++ insert_publishers.sql 2 Mar 2005 02:52:28 -0000 1.2
@@ -1,6 +1,6 @@
USE juddi;
-- *** SAMPLE PUBLISHER ***
--- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,ENABLED,ADMIN)
+-- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN)
-- VALUES ('jdoe','John Doe','john.doe@apache.org','true','true');
1.7 +0 -5 ws-juddi/src/java/org/apache/juddi/handler/PublisherDetailHandler.java
Index: PublisherDetailHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/PublisherDetailHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PublisherDetailHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ PublisherDetailHandler.java 2 Mar 2005 02:52:28 -0000 1.7
@@ -131,11 +131,6 @@
Publisher publisher = new Publisher();
publisher.setPublisherID("bcrosby");
publisher.setName("Bing Crosby");
- publisher.setLastName("Crosby");
- publisher.setFirstName("Bing");
- publisher.setWorkPhone("978.123-4567");
- publisher.setMobilePhone("617-765-9876");
- publisher.setPager("800-123-4655 ID: 501");
publisher.setEmailAddress("bcrosby@juddi.org");
publisher.setAdmin(true);
1.4 +0 -55 ws-juddi/src/java/org/apache/juddi/handler/PublisherHandler.java
Index: PublisherHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/PublisherHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PublisherHandler.java 6 Feb 2005 02:52:07 -0000 1.3
+++ PublisherHandler.java 2 Mar 2005 02:52:28 -0000 1.4
@@ -61,31 +61,6 @@
else
obj.setAdmin(false);
- // Attributes (optional)
- String firstName = element.getAttribute("firstName");
- if ((firstName != null) && (firstName.length() > 0))
- obj.setFirstName(firstName);
-
- String lastName = element.getAttribute("lastName");
- if ((lastName != null) && (lastName.length() > 0))
- obj.setLastName(lastName);
-
- String middleInit = element.getAttribute("middleInit");
- if ((middleInit != null) && (middleInit.length() > 0))
- obj.setMiddleInit(middleInit);
-
- String workPhone = element.getAttribute("workPhone");
- if ((workPhone != null) && (workPhone.length() > 0))
- obj.setWorkPhone(workPhone);
-
- String mobilePhone = element.getAttribute("mobilePhone");
- if ((mobilePhone != null) && (mobilePhone.length() > 0))
- obj.setMobilePhone(mobilePhone);
-
- String pager = element.getAttribute("pager");
- if ((pager != null) && (pager.length() > 0))
- obj.setPager(pager);
-
String emailAddress = element.getAttribute("emailAddress");
if ((emailAddress != null) && (emailAddress.length() > 0))
obj.setEmailAddress(emailAddress);
@@ -121,31 +96,6 @@
element.setAttribute("admin",String.valueOf(publisher.isAdmin()));
element.setAttribute("enabled",String.valueOf(publisher.isEnabled()));
- // Attributes (optional)
- String firstName = publisher.getFirstName();
- if ((firstName != null) && (firstName.length() > 0))
- element.setAttribute("firstName",firstName);
-
- String lastName = publisher.getLastName();
- if ((lastName != null) && (lastName.length() > 0))
- element.setAttribute("lastName",lastName);
-
- String middleInit = publisher.getMiddleInit();
- if ((middleInit != null) && (middleInit.length() > 0))
- element.setAttribute("middleInit",middleInit);
-
- String workPhone = publisher.getWorkPhone();
- if ((workPhone != null) && (workPhone.length() > 0))
- element.setAttribute("workPhone",workPhone);
-
- String mobilePhone = publisher.getMobilePhone();
- if ((mobilePhone != null) && (mobilePhone.length() > 0))
- element.setAttribute("mobilePhone",mobilePhone);
-
- String pager = publisher.getPager();
- if ((pager != null) && (pager.length() > 0))
- element.setAttribute("pager",pager);
-
String emailAddress = publisher.getEmailAddress();
if ((emailAddress != null) && (emailAddress.length() > 0))
element.setAttribute("emailAddress",emailAddress);
@@ -176,11 +126,6 @@
Publisher publisher = new Publisher();
publisher.setPublisherID("bcrosby");
publisher.setName("Bing Crosby");
- publisher.setLastName("Crosby");
- publisher.setFirstName("Bing");
- publisher.setWorkPhone("978.123-4567");
- publisher.setMobilePhone("617-765-9876");
- publisher.setPager("800-123-4655 ID: 501");
publisher.setEmailAddress("bcrosby@juddi.org");
publisher.setAdmin(true);
publisher.setEnabled(true);
1.4 +0 -5 ws-juddi/src/java/org/apache/juddi/handler/SavePublisherHandler.java
Index: SavePublisherHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/SavePublisherHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SavePublisherHandler.java 6 Feb 2005 02:52:07 -0000 1.3
+++ SavePublisherHandler.java 2 Mar 2005 02:52:28 -0000 1.4
@@ -119,11 +119,6 @@
Publisher publisher = new Publisher();
publisher.setPublisherID("bcrosby");
publisher.setName("Bing Crosby");
- publisher.setLastName("Crosby");
- publisher.setFirstName("Bing");
- publisher.setWorkPhone("978.123-4567");
- publisher.setMobilePhone("617-765-9876");
- publisher.setPager("800-123-4655 ID: 501");
publisher.setEmailAddress("bcrosby@juddi.org");
publisher.setAdmin(true);
1.5 +2 -8 ws-juddi/sql/mysql/create_database.sql
Index: create_database.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/mysql/create_database.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- create_database.sql 3 Jun 2004 02:29:08 -0000 1.4
+++ create_database.sql 2 Mar 2005 02:52:28 -0000 1.5
@@ -352,15 +352,9 @@
(
PUBLISHER_ID VARCHAR(20) NOT NULL,
PUBLISHER_NAME VARCHAR(255) NOT NULL,
- LAST_NAME VARCHAR(150) NULL,
- FIRST_NAME VARCHAR(100) NULL,
- MIDDLE_INIT VARCHAR(5) NULL,
- WORK_PHONE VARCHAR(50) NULL,
- MOBILE_PHONE VARCHAR(50) NULL,
- PAGER VARCHAR(50) NULL,
EMAIL_ADDRESS VARCHAR(255) NULL,
- ADMIN VARCHAR(5) NULL,
- ENABLED VARCHAR(5) NULL,
+ IS_ADMIN VARCHAR(5) NULL,
+ IS_ENABLED VARCHAR(5) NULL,
PRIMARY KEY (PUBLISHER_ID)
);
1.3 +1 -1 ws-juddi/sql/mysql/insert_publishers.sql
Index: insert_publishers.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/mysql/insert_publishers.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- insert_publishers.sql 29 May 2004 01:07:19 -0000 1.2
+++ insert_publishers.sql 2 Mar 2005 02:52:28 -0000 1.3
@@ -1,6 +1,6 @@
USE juddi;
-- *** SAMPLE PUBLISHER ***
--- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,ENABLED,ADMIN)
+-- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN)
-- VALUES ('jdoe','John Doe','john.doe@apache.org','true','true');
1.9 +0 -13 ws-juddi/src/java/org/apache/juddi/function/SaveBusinessFunction.java
Index: SaveBusinessFunction.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/SaveBusinessFunction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SaveBusinessFunction.java 2 Jul 2004 12:44:40 -0000 1.8
+++ SaveBusinessFunction.java 2 Mar 2005 02:52:28 -0000 1.9
@@ -28,7 +28,6 @@
import org.apache.juddi.datatype.Email;
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.datatype.Name;
-import org.apache.juddi.datatype.Phone;
import org.apache.juddi.datatype.RegistryObject;
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.business.Contact;
@@ -195,18 +194,6 @@
contact.setPersonNameValue(publisher.getName());
contact.setUseType("publisher");
- String workPhone = publisher.getWorkPhone();
- if (workPhone != null)
- contact.addPhone(new Phone(workPhone,"business"));
-
- String mobile = publisher.getMobilePhone();
- if (mobile != null)
- contact.addPhone(new Phone(mobile,"mobile"));
-
- String pager = publisher.getPager();
- if (pager != null)
- contact.addPhone(new Phone(pager,"pager"));
-
String email = publisher.getEmailAddress();
if (email != null)
contact.addEmail(new Email(email,"email"));
1.2 +2 -8 ws-juddi/sql/hsqldb/create_database.sql
Index: create_database.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/hsqldb/create_database.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create_database.sql 30 May 2004 17:08:18 -0000 1.1
+++ create_database.sql 2 Mar 2005 02:52:29 -0000 1.2
@@ -378,15 +378,9 @@
(
PUBLISHER_ID VARCHAR(20) NOT NULL,
PUBLISHER_NAME VARCHAR(255) NOT NULL,
- LAST_NAME VARCHAR(150) NULL,
- FIRST_NAME VARCHAR(100) NULL,
- MIDDLE_INIT VARCHAR(5) NULL,
- WORK_PHONE VARCHAR(50) NULL,
- MOBILE_PHONE VARCHAR(50) NULL,
- PAGER VARCHAR(50) NULL,
EMAIL_ADDRESS VARCHAR(255) NULL,
- ADMIN VARCHAR(5) NULL,
- ENABLED VARCHAR(5) NULL,
+ IS_ADMIN VARCHAR(5) NULL,
+ IS_ENABLED VARCHAR(5) NULL,
PRIMARY KEY (PUBLISHER_ID)
);
1.3 +1 -3 ws-juddi/sql/hsqldb/insert_publishers.sql
Index: insert_publishers.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/hsqldb/insert_publishers.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- insert_publishers.sql 30 May 2004 17:08:18 -0000 1.2
+++ insert_publishers.sql 2 Mar 2005 02:52:29 -0000 1.3
@@ -1,5 +1,3 @@
-USE juddi;
-
-- *** SAMPLE PUBLISHER ***
--- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,ENABLED,ADMIN)
+-- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN)
-- VALUES ('jdoe','John Doe','john.doe@apache.org','true','true');
1.3 +21 -75 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/PublisherTable.java
Index: PublisherTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/PublisherTable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PublisherTable.java 11 Mar 2004 18:06:09 -0000 1.2
+++ PublisherTable.java 2 Mar 2005 02:52:29 -0000 1.3
@@ -51,31 +51,19 @@
sql.append("INSERT INTO PUBLISHER (");
sql.append("PUBLISHER_ID,");
sql.append("PUBLISHER_NAME,");
- sql.append("LAST_NAME,");
- sql.append("FIRST_NAME,");
- sql.append("MIDDLE_INIT,");
- sql.append("WORK_PHONE,");
- sql.append("MOBILE_PHONE,");
- sql.append("PAGER,");
sql.append("EMAIL_ADDRESS,");
- sql.append("ADMIN, ");
- sql.append("ENABLED) ");
- sql.append("VALUES (?,?,?,?,?,?,?,?,?,?,?)");
+ sql.append("IS_ADMIN, ");
+ sql.append("IS_ENABLED) ");
+ sql.append("VALUES (?,?,?,?,?)");
insertSQL = sql.toString();
// build selectSQL
sql = new StringBuffer(200);
sql.append("SELECT ");
sql.append("PUBLISHER_NAME,");
- sql.append("LAST_NAME,");
- sql.append("FIRST_NAME,");
- sql.append("MIDDLE_INIT,");
- sql.append("WORK_PHONE,");
- sql.append("MOBILE_PHONE,");
- sql.append("PAGER,");
sql.append("EMAIL_ADDRESS,");
- sql.append("ADMIN,");
- sql.append("ENABLED ");
+ sql.append("IS_ADMIN,");
+ sql.append("IS_ENABLED ");
sql.append("FROM PUBLISHER ");
sql.append("WHERE PUBLISHER_ID=?");
selectSQL = sql.toString();
@@ -90,15 +78,9 @@
sql = new StringBuffer(200);
sql.append("UPDATE PUBLISHER ");
sql.append("SET PUBLISHER_NAME=?,");
- sql.append("LAST_NAME=?,");
- sql.append("FIRST_NAME=?,");
- sql.append("MIDDLE_INIT=?,");
- sql.append("WORK_PHONE=?,");
- sql.append("MOBILE_PHONE=?,");
- sql.append("PAGER=?,");
sql.append("EMAIL_ADDRESS=?,");
- sql.append("ADMIN=?,");
- sql.append("ENABLED=? ");
+ sql.append("IS_ADMIN=?,");
+ sql.append("IS_ENABLED=? ");
sql.append("WHERE PUBLISHER_ID=?");
updateSQL = sql.toString();
}
@@ -123,28 +105,16 @@
statement = connection.prepareStatement(insertSQL);
statement.setString(1,publisher.getPublisherID());
statement.setString(2,publisher.getName());
- statement.setString(3,publisher.getFirstName());
- statement.setString(4,publisher.getLastName());
- statement.setString(5,publisher.getMiddleInit());
- statement.setString(6,publisher.getWorkPhone());
- statement.setString(7,publisher.getMobilePhone());
- statement.setString(8,publisher.getPager());
- statement.setString(9,publisher.getEmailAddress());
- statement.setString(10,String.valueOf(publisher.isAdmin()));
- statement.setString(11,String.valueOf(publisher.isEnabled()));
+ statement.setString(3,publisher.getEmailAddress());
+ statement.setString(4,String.valueOf(publisher.isAdmin()));
+ statement.setString(5,String.valueOf(publisher.isEnabled()));
log.debug("insert into PUBLISHER table:\n\n\t" + insertSQL +
"\n\t PUBLISHER_ID=" + publisher.getPublisherID() +
"\n\t PUBLISHER_NAME=" + publisher.getName() +
- "\n\t FIRST_NAME=" + publisher.getFirstName() +
- "\n\t LAST_NAME=" + publisher.getLastName() +
- "\n\t MIDDLE_INIT=" + publisher.getMiddleInit() +
- "\n\t WORK_PHONE=" + publisher.getWorkPhone() +
- "\n\t MOBILE_PHONE=" + publisher.getMobilePhone() +
- "\n\t PAGER=" + publisher.getPager() +
"\n\t EMAIL_ADDRESS=" + publisher.getEmailAddress() +
- "\n\t ADMIN=" + publisher.isAdmin() +
- "\n\t ENABLED=" + publisher.isEnabled() + "\n");
+ "\n\t IS_ADMIN=" + publisher.isAdmin() +
+ "\n\t IS_ENABLED=" + publisher.isEnabled() + "\n");
// insert
statement.executeUpdate();
@@ -193,15 +163,9 @@
publisher = new Publisher();
publisher.setPublisherID(publisherID);
publisher.setName(resultSet.getString(1));//("PUBLISHER_NAME"));
- publisher.setLastName(resultSet.getString(2));//("LAST_NAME"));
- publisher.setFirstName(resultSet.getString(3));//("FIRST_NAME"));
- publisher.setMiddleInit(resultSet.getString(4));//("MIDDLE_INIT"));
- publisher.setWorkPhone(resultSet.getString(5));//("WORK_PHONE"));
- publisher.setMobilePhone(resultSet.getString(6));//("MOBILE_PHONE"));
- publisher.setPager(resultSet.getString(7));//("PAGER"));
- publisher.setEmailAddress(resultSet.getString(8));//("EMAIL_ADDRESS"));
- publisher.setAdminValue(resultSet.getString(9));//("ADMIN"));
- publisher.setEnabledValue(resultSet.getString(10));//("ENABLED"));
+ publisher.setEmailAddress(resultSet.getString(2));//("EMAIL_ADDRESS"));
+ publisher.setAdminValue(resultSet.getString(3));//("IS_ADMIN"));
+ publisher.setEnabledValue(resultSet.getString(4));//("IS_ENABLED"));
}
return publisher;
@@ -270,28 +234,16 @@
// prepare
statement = connection.prepareStatement(updateSQL);
statement.setString(1,publisher.getName());
- statement.setString(2,publisher.getFirstName());
- statement.setString(3,publisher.getLastName());
- statement.setString(4,publisher.getMiddleInit());
- statement.setString(5,publisher.getWorkPhone());
- statement.setString(6,publisher.getMobilePhone());
- statement.setString(7,publisher.getPager());
- statement.setString(8,publisher.getEmailAddress());
- statement.setString(9,String.valueOf(publisher.isAdmin()));
- statement.setString(10,String.valueOf(publisher.isEnabled()));
- statement.setString(11,publisher.getPublisherID());
+ statement.setString(2,publisher.getEmailAddress());
+ statement.setString(3,String.valueOf(publisher.isAdmin()));
+ statement.setString(4,String.valueOf(publisher.isEnabled()));
+ statement.setString(5,publisher.getPublisherID());
log.debug("update PUBLISHER table:\n\n\t" + updateSQL +
"\n\t PUBLISHER_NAME=" + publisher.getName() +
- "\n\t FIRST_NAME=" + publisher.getFirstName() +
- "\n\t LAST_NAME=" + publisher.getLastName() +
- "\n\t MIDDLE_INIT=" + publisher.getMiddleInit() +
- "\n\t WORK_PHONE=" + publisher.getWorkPhone() +
- "\n\t MOBILE_PHONE=" + publisher.getMobilePhone() +
- "\n\t PAGER=" + publisher.getPager() +
"\n\t EMAIL_ADDRESS=" + publisher.getEmailAddress() +
- "\n\t ADMIN=" + publisher.isAdmin() +
- "\n\t ENABLED=" + publisher.isEnabled() +
+ "\n\t IS_ADMIN=" + publisher.isAdmin() +
+ "\n\t IS_ENABLED=" + publisher.isEnabled() +
"\n\t PUBLISHER_ID=" + publisher.getPublisherID() + "\n");
// execute
@@ -348,11 +300,6 @@
Publisher publisher = new Publisher();
publisher.setPublisherID("bcrosby");
publisher.setName("Bing Crosby");
- publisher.setLastName("Crosby");
- publisher.setFirstName("Bing");
- publisher.setWorkPhone("978.123-4567");
- publisher.setMobilePhone("617-765-9876");
- publisher.setPager("800-123-4655 ID: 501");
publisher.setEmailAddress("bcrosby@juddi.org");
publisher.setAdmin(false);
publisher.setEnabled(false);
@@ -361,7 +308,6 @@
// select each inserted publisher
System.out.println(PublisherTable.select("bcrosby",connection));
- publisher.setFirstName("Bart");
publisher.setName("Barthalomue Crosby");
publisher.setEnabled(true);
PublisherTable.update(publisher,connection);
1.3 +2 -8 ws-juddi/sql/oracle/create_database.sql
Index: create_database.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/oracle/create_database.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- create_database.sql 30 May 2004 23:55:37 -0000 1.2
+++ create_database.sql 2 Mar 2005 02:52:29 -0000 1.3
@@ -361,15 +361,9 @@
(
PUBLISHER_ID VARCHAR2(20) NOT NULL,
PUBLISHER_NAME VARCHAR2(255) NOT NULL,
- LAST_NAME VARCHAR2(150) NULL,
- FIRST_NAME VARCHAR2(100) NULL,
- MIDDLE_INIT VARCHAR2(5) NULL,
- WORK_PHONE VARCHAR2(50) NULL,
- MOBILE_PHONE VARCHAR2(50) NULL,
- PAGER VARCHAR2(50) NULL,
EMAIL_ADDRESS VARCHAR2(255) NULL,
- ADMIN VARCHAR2(5) NULL,
- ENABLED VARCHAR2(5) NULL
+ IS_ADMIN VARCHAR2(5) NULL,
+ IS_ENABLED VARCHAR2(5) NULL
);
ALTER TABLE PUBLISHER ADD ( PRIMARY KEY (PUBLISHER_ID) );
1.3 +1 -1 ws-juddi/sql/oracle/insert_publishers.sql
Index: insert_publishers.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/oracle/insert_publishers.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- insert_publishers.sql 30 May 2004 23:53:26 -0000 1.2
+++ insert_publishers.sql 2 Mar 2005 02:52:29 -0000 1.3
@@ -1,4 +1,4 @@
-- *** SAMPLE PUBLISHER ***
--- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,ENABLED,ADMIN)
+-- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN)
-- VALUES ('jdoe','John Doe','john.doe@apache.org','true','true');
1.2 +0 -6 ws-juddi/sql/firebird/create_database.sql
Index: create_database.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/firebird/create_database.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create_database.sql 2 Mar 2005 02:15:41 -0000 1.1
+++ create_database.sql 2 Mar 2005 02:52:29 -0000 1.2
@@ -190,12 +190,6 @@
CREATE TABLE PUBLISHER (
PUBLISHER_ID VARCHAR(20) NOT NULL,
PUBLISHER_NAME VARCHAR(255) NOT NULL,
- LAST_NAME VARCHAR(150),
- FIRST_NAME VARCHAR(100),
- MIDDLE_INIT VARCHAR(5),
- WORK_PHONE VARCHAR(50),
- MOBILE_PHONE VARCHAR(50),
- PAGER VARCHAR(50),
EMAIL_ADDRESS VARCHAR(255),
IS_ADMIN VARCHAR(5),
IS_ENABLED VARCHAR(5)
1.3 +1 -1 ws-juddi/sql/postgresql/insert_publishers.sql
Index: insert_publishers.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/postgresql/insert_publishers.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- insert_publishers.sql 30 May 2004 23:57:08 -0000 1.2
+++ insert_publishers.sql 2 Mar 2005 02:52:29 -0000 1.3
@@ -1,4 +1,4 @@
-- *** SAMPLE PUBLISHER ***
--- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,ENABLED,ADMIN)
+-- INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN)
-- VALUES ('jdoe','John Doe','john.doe@apache.org','true','true');
1.3 +2 -8 ws-juddi/sql/postgresql/create_database.sql
Index: create_database.sql
===================================================================
RCS file: /home/cvs/ws-juddi/sql/postgresql/create_database.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- create_database.sql 25 Aug 2004 14:02:25 -0000 1.2
+++ create_database.sql 2 Mar 2005 02:52:29 -0000 1.3
@@ -406,15 +406,9 @@
(
PUBLISHER_ID VARCHAR(20) NOT NULL,
PUBLISHER_NAME VARCHAR(255) NOT NULL,
- LAST_NAME VARCHAR(150) NULL,
- FIRST_NAME VARCHAR(100) NULL,
- MIDDLE_INIT VARCHAR(5) NULL,
- WORK_PHONE VARCHAR(50) NULL,
- MOBILE_PHONE VARCHAR(50) NULL,
- PAGER VARCHAR(50) NULL,
EMAIL_ADDRESS VARCHAR(255) NULL,
- ADMIN VARCHAR(5) NULL,
- ENABLED VARCHAR(5) NULL,
+ IS_ADMIN VARCHAR(5) NULL,
+ IS_ENABLED VARCHAR(5) NULL,
CONSTRAINT PK_PUBLISHER PRIMARY KEY (PUBLISHER_ID)
);