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/05/23 06:11:30 UTC
cvs commit: ws-juddi/src/junit/org/apache/juddi/datastore/jdbc TestAddressTable.java TestEmailTable.java TestFindBusinessByDiscoveryURLQuery.java TestFindBindingByTModelKeyQuery.java TestInstanceDetailsDocDescTable.java TestFindTModelByCategoryQuery.java TestBusinessNameTable.java TestFindBusinessByCategoryQuery.java TestTModelInstanceInfoTable.java TestBusinessCategoryTable.java TestFindServiceByNameQuery.java TestFindServiceByBusinessKeyQuery.java TestAuthTokenTable.java TestFindTModelByNameQuery.java TestTModelDescTable.java TestContactTable.java TestTModelCategoryTable.java TestBusinessEntityTable.java TestServiceNameTable.java TestFindBindingByCategoryQuery.java TestFindTModelByIdentifierQuery.java TestFindServiceByTModelKeyQuery.java TestTModelDocDescTable.java TestFindBusinessByTModelKeyQuery.java TestFindBusinessByNameQuery.java TestTModelIdentifierTable.java TestServiceDescTable.java TestBusinessServiceTable.java TestBusinessDescTable.java TestTModelInstanceInfoDescTable.java TestPublisherTable.java TestFindServiceByCategoryQuery.java TestFindPublisherByNameQuery.java TestContactDescTable.java TestBindingDescTable.java TestPhoneTable.java TestInstanceDetailsDescTable.java TestFindBindingByServiceKeyQuery.java TestBusinessIdentifierTable.java TestServiceCategoryTable.java TestBindingTemplateTable.java TestAddressLineTable.java TestDiscoveryURLTable.java TestFindBusinessByIdentifierQuery.java TestTModelTable.java TestFindRelatedBusinessQuery.java TestBindingCategoryTable.java TestPublisherAssertionTable.java
sviens 2005/05/22 21:11:30
Modified: src/junit/org/apache/juddi/datastore/jdbc
TestAddressTable.java TestEmailTable.java
TestFindBusinessByDiscoveryURLQuery.java
TestFindBindingByTModelKeyQuery.java
TestInstanceDetailsDocDescTable.java
TestFindTModelByCategoryQuery.java
TestBusinessNameTable.java
TestFindBusinessByCategoryQuery.java
TestTModelInstanceInfoTable.java
TestBusinessCategoryTable.java
TestFindServiceByNameQuery.java
TestFindServiceByBusinessKeyQuery.java
TestAuthTokenTable.java
TestFindTModelByNameQuery.java
TestTModelDescTable.java TestContactTable.java
TestTModelCategoryTable.java
TestBusinessEntityTable.java
TestServiceNameTable.java
TestFindBindingByCategoryQuery.java
TestFindTModelByIdentifierQuery.java
TestFindServiceByTModelKeyQuery.java
TestTModelDocDescTable.java
TestFindBusinessByTModelKeyQuery.java
TestFindBusinessByNameQuery.java
TestTModelIdentifierTable.java
TestServiceDescTable.java
TestBusinessServiceTable.java
TestBusinessDescTable.java
TestTModelInstanceInfoDescTable.java
TestPublisherTable.java
TestFindServiceByCategoryQuery.java
TestFindPublisherByNameQuery.java
TestContactDescTable.java TestBindingDescTable.java
TestPhoneTable.java
TestInstanceDetailsDescTable.java
TestFindBindingByServiceKeyQuery.java
TestBusinessIdentifierTable.java
TestServiceCategoryTable.java
TestBindingTemplateTable.java
TestAddressLineTable.java
TestDiscoveryURLTable.java
TestFindBusinessByIdentifierQuery.java
TestTModelTable.java
TestFindRelatedBusinessQuery.java
TestBindingCategoryTable.java
TestPublisherAssertionTable.java
Log:
Removed dependency on org.apache.juddi.util.jdbc.ConnectionManager (and DBCP)
Revision Changes Path
1.2 +5 -6 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestAddressTable.java
Index: TestAddressTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestAddressTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestAddressTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestAddressTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.business.Contact;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
@@ -133,7 +132,7 @@
catch (java.sql.SQLException sqlex) {
sqlex.printStackTrace();
}
-
+
throw ex;
}
}
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestEmailTable.java
Index: TestEmailTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestEmailTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestEmailTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestEmailTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.business.Contact;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByDiscoveryURLQuery.java
Index: TestFindBusinessByDiscoveryURLQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByDiscoveryURLQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindBusinessByDiscoveryURLQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindBusinessByDiscoveryURLQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.DiscoveryURL;
import org.apache.juddi.datatype.DiscoveryURLs;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBindingByTModelKeyQuery.java
Index: TestFindBindingByTModelKeyQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBindingByTModelKeyQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindBindingByTModelKeyQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindBindingByTModelKeyQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,6 @@
import org.apache.juddi.datatype.TModelBag;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -37,7 +36,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestInstanceDetailsDocDescTable.java
Index: TestInstanceDetailsDocDescTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestInstanceDetailsDocDescTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestInstanceDetailsDocDescTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestInstanceDetailsDocDescTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -45,7 +44,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindTModelByCategoryQuery.java
Index: TestFindTModelByCategoryQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindTModelByCategoryQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindTModelByCategoryQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindTModelByCategoryQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.CategoryBag;
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessNameTable.java
Index: TestBusinessNameTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessNameTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBusinessNameTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestBusinessNameTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.Name;
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -40,7 +39,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByCategoryQuery.java
Index: TestFindBusinessByCategoryQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByCategoryQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindBusinessByCategoryQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindBusinessByCategoryQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.CategoryBag;
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelInstanceInfoTable.java
Index: TestTModelInstanceInfoTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelInstanceInfoTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTModelInstanceInfoTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestTModelInstanceInfoTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -43,7 +42,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessCategoryTable.java
Index: TestBusinessCategoryTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessCategoryTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBusinessCategoryTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestBusinessCategoryTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -40,7 +39,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindServiceByNameQuery.java
Index: TestFindServiceByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindServiceByNameQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindServiceByNameQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindServiceByNameQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,6 @@
import org.apache.juddi.datatype.Name;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -37,7 +36,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindServiceByBusinessKeyQuery.java
Index: TestFindServiceByBusinessKeyQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindServiceByBusinessKeyQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindServiceByBusinessKeyQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindServiceByBusinessKeyQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,6 @@
import java.util.Vector;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -36,7 +35,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestAuthTokenTable.java
Index: TestAuthTokenTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestAuthTokenTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestAuthTokenTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestAuthTokenTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,6 @@
import org.apache.juddi.datatype.publisher.Publisher;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindTModelByNameQuery.java
Index: TestFindTModelByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindTModelByNameQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindTModelByNameQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindTModelByNameQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,6 @@
import java.util.Vector;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -36,7 +35,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelDescTable.java
Index: TestTModelDescTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelDescTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTModelDescTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestTModelDescTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.OverviewDoc;
import org.apache.juddi.datatype.tmodel.TModel;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestContactTable.java
Index: TestContactTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestContactTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestContactTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestContactTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.business.Contact;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -40,7 +39,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelCategoryTable.java
Index: TestTModelCategoryTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelCategoryTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTModelCategoryTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestTModelCategoryTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.OverviewDoc;
import org.apache.juddi.datatype.tmodel.TModel;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessEntityTable.java
Index: TestBusinessEntityTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessEntityTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBusinessEntityTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestBusinessEntityTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestServiceNameTable.java
Index: TestServiceNameTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestServiceNameTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestServiceNameTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestServiceNameTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +6 -7 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBindingByCategoryQuery.java
Index: TestFindBindingByCategoryQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBindingByCategoryQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindBindingByCategoryQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindBindingByCategoryQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.CategoryBag;
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
@@ -80,10 +79,10 @@
txn.begin(connection);
Vector keys = null;
-
+
keys = FindBindingByCategoryQuery.select(serviceKey,categoryBag,keysIn,null,connection);
System.out.println(keys.size());
-
+
keys = FindBindingByCategoryQuery.select(serviceKey,(KeyedReference)keyedRefVector.elementAt(0),null,null,connection);
System.out.println(keys.size());
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindTModelByIdentifierQuery.java
Index: TestFindTModelByIdentifierQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindTModelByIdentifierQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindTModelByIdentifierQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindTModelByIdentifierQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.IdentifierBag;
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +13 -14 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindServiceByTModelKeyQuery.java
Index: TestFindServiceByTModelKeyQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindServiceByTModelKeyQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindServiceByTModelKeyQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindServiceByTModelKeyQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,20 +21,19 @@
import org.apache.juddi.datatype.TModelBag;
import org.apache.juddi.datatype.TModelKey;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
- * tModelBag: This is a list of tModel uuid_key values that represent the
- * technical fingerprint of a bindingTemplate structure to find. All
- * bindingTemplate structures within any businessService associated with the
- * businessEntity specified by the businessKey argument will be searched.
- *
- * If more than one tModel key is specified in this structure, only
- * businessService structures that contain bindingTemplate structures with
- * fingerprint information that matches all of the tModel keys specified will
+ * tModelBag: This is a list of tModel uuid_key values that represent the
+ * technical fingerprint of a bindingTemplate structure to find. All
+ * bindingTemplate structures within any businessService associated with the
+ * businessEntity specified by the businessKey argument will be searched.
+ *
+ * If more than one tModel key is specified in this structure, only
+ * businessService structures that contain bindingTemplate structures with
+ * fingerprint information that matches all of the tModel keys specified will
* be returned (logical AND only).
- *
+ *
* @author Steve Viens (sviens@apache.org)
*/
class TestFindServiceByTModelKeyQuery
@@ -48,7 +47,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelDocDescTable.java
Index: TestTModelDocDescTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelDocDescTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTModelDocDescTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestTModelDocDescTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,6 @@
import java.sql.Connection;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -35,7 +34,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByTModelKeyQuery.java
Index: TestFindBusinessByTModelKeyQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByTModelKeyQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindBusinessByTModelKeyQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindBusinessByTModelKeyQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.TModelBag;
import org.apache.juddi.datatype.TModelKey;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByNameQuery.java
Index: TestFindBusinessByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByNameQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindBusinessByNameQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindBusinessByNameQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,6 @@
import org.apache.juddi.datatype.Name;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -37,7 +36,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelIdentifierTable.java
Index: TestTModelIdentifierTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelIdentifierTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTModelIdentifierTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestTModelIdentifierTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.OverviewDoc;
import org.apache.juddi.datatype.tmodel.TModel;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestServiceDescTable.java
Index: TestServiceDescTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestServiceDescTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestServiceDescTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestServiceDescTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessServiceTable.java
Index: TestBusinessServiceTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessServiceTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBusinessServiceTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestBusinessServiceTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -39,7 +38,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessDescTable.java
Index: TestBusinessDescTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessDescTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBusinessDescTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestBusinessDescTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.Description;
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -40,7 +39,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelInstanceInfoDescTable.java
Index: TestTModelInstanceInfoDescTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelInstanceInfoDescTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTModelInstanceInfoDescTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestTModelInstanceInfoDescTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -44,7 +43,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestPublisherTable.java
Index: TestPublisherTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestPublisherTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestPublisherTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestPublisherTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,6 @@
import org.apache.juddi.datatype.publisher.Publisher;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -36,7 +35,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +6 -7 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindServiceByCategoryQuery.java
Index: TestFindServiceByCategoryQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindServiceByCategoryQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindServiceByCategoryQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindServiceByCategoryQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.CategoryBag;
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
@@ -80,12 +79,12 @@
txn.begin(connection);
keysIn = FindServiceByCategoryQuery.select(businessKey,categoryBag,keysIn,null,connection);
-
+
for (int i=0; i< keyedRefVector.size(); i++)
{
KeyedReference keyedRef = (KeyedReference)keyedRefVector.elementAt(i);
keysIn = FindServiceByCategoryQuery.select(businessKey,keyedRef,null,null,connection);
- }
+ }
// commit the transaction
txn.commit();
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindPublisherByNameQuery.java
Index: TestFindPublisherByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindPublisherByNameQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindPublisherByNameQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindPublisherByNameQuery.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,6 @@
import org.apache.juddi.datatype.request.FindQualifiers;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -37,7 +36,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestContactDescTable.java
Index: TestContactDescTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestContactDescTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestContactDescTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestContactDescTable.java 23 May 2005 04:11:29 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,6 @@
import org.apache.juddi.datatype.business.Contact;
import org.apache.juddi.datatype.business.Contacts;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -42,7 +41,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBindingDescTable.java
Index: TestBindingDescTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBindingDescTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBindingDescTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestBindingDescTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -43,7 +42,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestPhoneTable.java
Index: TestPhoneTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestPhoneTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestPhoneTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestPhoneTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.business.Contact;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestInstanceDetailsDescTable.java
Index: TestInstanceDetailsDescTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestInstanceDetailsDescTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestInstanceDetailsDescTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestInstanceDetailsDescTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -44,7 +43,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +6 -7 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBindingByServiceKeyQuery.java
Index: TestFindBindingByServiceKeyQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBindingByServiceKeyQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindBindingByServiceKeyQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindBindingByServiceKeyQuery.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,6 @@
import java.util.Vector;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -36,7 +35,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
@@ -70,10 +69,10 @@
txn.begin(connection);
Vector keys = null;
-
+
keys = FindBindingByServiceKeyQuery.select(serviceKey,keysIn,null,connection);
System.out.println(keys.size());
-
+
keys = FindBindingByServiceKeyQuery.select(serviceKey,null,null,connection);
System.out.println(keys.size());
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessIdentifierTable.java
Index: TestBusinessIdentifierTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBusinessIdentifierTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBusinessIdentifierTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestBusinessIdentifierTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -40,7 +39,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestServiceCategoryTable.java
Index: TestServiceCategoryTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestServiceCategoryTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestServiceCategoryTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestServiceCategoryTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBindingTemplateTable.java
Index: TestBindingTemplateTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBindingTemplateTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBindingTemplateTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestBindingTemplateTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -41,7 +40,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestAddressLineTable.java
Index: TestAddressLineTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestAddressLineTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestAddressLineTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestAddressLineTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.business.Contact;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -42,7 +41,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestDiscoveryURLTable.java
Index: TestDiscoveryURLTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestDiscoveryURLTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestDiscoveryURLTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestDiscoveryURLTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.DiscoveryURL;
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -40,7 +39,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByIdentifierQuery.java
Index: TestFindBusinessByIdentifierQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindBusinessByIdentifierQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindBusinessByIdentifierQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindBusinessByIdentifierQuery.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,6 @@
import org.apache.juddi.datatype.IdentifierBag;
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -38,7 +37,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelTable.java
Index: TestTModelTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestTModelTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTModelTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestTModelTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,6 @@
import org.apache.juddi.datatype.OverviewDoc;
import org.apache.juddi.datatype.tmodel.TModel;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -39,7 +38,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindRelatedBusinessQuery.java
Index: TestFindRelatedBusinessQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestFindRelatedBusinessQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFindRelatedBusinessQuery.java 23 May 2005 03:22:08 -0000 1.1
+++ TestFindRelatedBusinessQuery.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,6 @@
import org.apache.juddi.datatype.KeyedReference;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -36,7 +35,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBindingCategoryTable.java
Index: TestBindingCategoryTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestBindingCategoryTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBindingCategoryTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestBindingCategoryTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,6 @@
import org.apache.juddi.datatype.business.BusinessEntity;
import org.apache.juddi.datatype.service.BusinessService;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -43,7 +42,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
1.2 +4 -5 ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestPublisherAssertionTable.java
Index: TestPublisherAssertionTable.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/junit/org/apache/juddi/datastore/jdbc/TestPublisherAssertionTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestPublisherAssertionTable.java 23 May 2005 03:22:08 -0000 1.1
+++ TestPublisherAssertionTable.java 23 May 2005 04:11:30 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,6 @@
import java.sql.Connection;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
/**
@@ -35,7 +34,7 @@
Connection conn = null;
try {
- conn = ConnectionManager.aquireConnection();
+ conn = Database.aquireConnection();
test(conn);
}
finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org