11:43 a.m.
Author: rmeggins
Update of /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway
In directory
cvs-int.fedora.redhat.com:/tmp/cvs-serv22524/dsmlgw/src/com/netscape/dsml/gateway
Modified Files:
BatchProcessor.java Configuration.java Constants.java
GenericOperation.java IConnMgrFactoryFunctor.java
IConnectionManager.java LDAPAuthenticator.java
OperationAdd.java OperationAuth.java OperationCompare.java
OperationDelete.java OperationExtended.java
OperationModify.java OperationModifyDN.java
OperationSearch.java ParseControl.java ParseFilter.java
ParseValue.java ProxyConnMgrFactory.java
ProxyConnectionManager.java gatewayContext.java
gatewayException.java gatewayHandler.java gatewayService.java
Log Message:
initial commit of dsmlgw - updated license to plain old GPLv2 - updated to use axis1.4
Index: BatchProcessor.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- BatchProcessor.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ BatchProcessor.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: Configuration.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Configuration.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ Configuration.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
@@ -37,14 +18,16 @@
package com.netscape.dsml.gateway;
import java.io.*;
+import java.net.URLClassLoader;
import java.util.Properties;
-import java.util.logging.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
public class Configuration {
private static Logger logger =
Logger.getLogger("com.netscape.dsml.gateway.Configuration");
-
+ private static final String DSMLGWCFG = "dsmlgw.cfg";
+ private static final String DSMLGW_CONFIG_DIR = "DSMLGW_CONFIG_DIR";
private static String propertiesFilename;
- private final static String header = "properties file for the Netscape
DSMLGW";
private final static String[][] defaults = new String[][]
{ { "MinPool", "5" },
{ "MaxPool", "10" },
@@ -61,12 +44,77 @@
private static Object lock = new Object();
private static Properties properties = null;
- /** Creates a new instance of Config */
+ /** Gets the file DSMLGWCFG from the
+ * classpath (using the class loader findResource/getResource)
+ * Returns the absolute path if found, or null if not found
+ */
+ private String getCfgFromClassPath() {
+ String filename = null;
+ ClassLoader cl = this.getClass().getClassLoader();
+ if (cl instanceof URLClassLoader) {
+ if (((URLClassLoader) cl).findResource(DSMLGWCFG) != null) {
+ filename = ((URLClassLoader) cl).findResource(DSMLGWCFG).getPath();
+ } else {
+ logger.log( Level.FINE, "Configuration.getCfgFromClassPath: " +
+ "could not find the file " + DSMLGWCFG +
+ " in the class path");
+ }
+ } else {
+ logger.log(Level.FINE, "Configuration.getCfgFromClassPath: " +
+ "the classloader for this class is not a url class loader");
+ }
+
+ return filename;
+ }
+
+ /** Creates a new instance of Config
+ * First, look for the config file in the user's home directory
+ * Next, look for the config file in the DSMLGW_CONFIG_DIR env. var.
+ * Finally, look in the classpath */
private Configuration() {
- propertiesFilename = System.getProperty("user.home","") +
System.getProperty("file.separator") + "dsmlgw.cfg";
- logger.log( Level.CONFIG, "using properties filename " +
propertiesFilename);
- load();
+ propertiesFilename = System.getProperty("user.home","") +
+ System.getProperty("file.separator") + DSMLGWCFG;
+ logger.log( Level.CONFIG, "trying properties filename " +
propertiesFilename);
+ try {
+ load();
+ } catch (FileNotFoundException fnfe) {
+ propertiesFilename = null;
+ }
+ if ((propertiesFilename == null) &&
+ (System.getenv(DSMLGW_CONFIG_DIR) != null)) {
+ propertiesFilename = System.getenv(DSMLGW_CONFIG_DIR) +
+ System.getProperty("file.separator") + DSMLGWCFG;
+ logger.log( Level.CONFIG, "trying properties filename " +
propertiesFilename);
+ try {
+ load();
+ } catch (FileNotFoundException fnfe2) {
+ logger.log( Level.CONFIG, "no config file " + propertiesFilename);
+ propertiesFilename = null;
+ }
+ }
+ if (propertiesFilename == null) {
+ propertiesFilename = getCfgFromClassPath();
+ if (propertiesFilename != null) {
+ logger.log( Level.CONFIG, "trying properties filename " +
propertiesFilename);
+ try {
+ load();
+ } catch (FileNotFoundException fnfe2) {
+ logger.log( Level.CONFIG, "no config file " + DSMLGWCFG +
+ " found, using defaults");
+ propertiesFilename = null;
+ }
+ } else {
+ logger.log( Level.CONFIG, "Could not find properties file " +
+ DSMLGWCFG + " in classpath" );
+ }
+ }
+ if (propertiesFilename == null) {
+ logger.log( Level.INFO, "config file " + DSMLGWCFG +
+ " not found, using defaults");
+ } else {
+ logger.log( Level.INFO, "using config file " + propertiesFilename);
+ }
}
public static Configuration getInstance() {
@@ -81,7 +129,7 @@
}
- private void load() {
+ private void load() throws FileNotFoundException {
try {
properties = new Properties();
@@ -96,12 +144,12 @@
} catch (java.io.FileNotFoundException e) {
- System.err.println("Can't find properties file: " +
propertiesFilename + ". " +
- "Using defaults.");
+ logger.log(Level.WARNING, "Can't find properties file: " +
propertiesFilename);
+ throw e;
} catch (java.io.IOException e) {
- System.err.println("Can't read properties file: " +
propertiesFilename + ". " +
+ logger.log(Level.SEVERE, "Can't read properties file: " +
propertiesFilename + ". " +
"Using defaults.");
}
Index: Constants.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/Constants.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Constants.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ Constants.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: GenericOperation.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- GenericOperation.java 26 Apr 2007 22:28:56 -0000 1.1.1.1
+++ GenericOperation.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: IConnMgrFactoryFunctor.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- IConnMgrFactoryFunctor.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ IConnMgrFactoryFunctor.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: IConnectionManager.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- IConnectionManager.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ IConnectionManager.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: LDAPAuthenticator.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LDAPAuthenticator.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ LDAPAuthenticator.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: OperationAdd.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- OperationAdd.java 26 Apr 2007 22:28:56 -0000 1.1.1.1
+++ OperationAdd.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: OperationAuth.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- OperationAuth.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ OperationAuth.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: OperationCompare.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- OperationCompare.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ OperationCompare.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: OperationDelete.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- OperationDelete.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ OperationDelete.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: OperationExtended.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- OperationExtended.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ OperationExtended.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: OperationModify.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- OperationModify.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ OperationModify.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: OperationModifyDN.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- OperationModifyDN.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ OperationModifyDN.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: OperationSearch.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- OperationSearch.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ OperationSearch.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,41 +11,20 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import netscape.ldap.*;
import org.w3c.dom.*;
-import java.util.logging.*;
-import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.traversal.DocumentTraversal;
-import org.w3c.dom.traversal.TreeWalker;
import org.w3c.dom.traversal.NodeFilter;
class OperationSearch extends GenericOperation {
@@ -55,7 +34,7 @@
javax.xml.soap.MessageFactory messageFactory = null ;
javax.xml.soap.SOAPFactory sef = null;
private static Logger logger =
- Logger.getLogger("com.netscape.dsml.service.ProxyConnectionManager");
+ Logger.getLogger("com.netscape.dsml.gateway.OperationSearch");
OperationSearch(){
try {
@@ -77,7 +56,6 @@
public javax.xml.soap.SOAPElement getResponse(gatewayContext ctx) {
-
root = ctx.getRootNode();
@@ -240,10 +218,18 @@
ldapConn = ctx.getLdapConnection();
- if (ctx.getConstraints() != null)
- results = ldapConn.search(dn, scope, filterString, attributeList, false,
ctx.getConstraints() );
- else
- results = ldapConn.search( dn, scope, filterString, attributeList,
false);
+ if (ctx.getLdapConnection() == null) {
+ logger.log(Level.WARNING, "no LDAP connection");
+ results = null;
+ // either we could not connect for some reason (e.g. network problems)
+ // or the LDAP server is down
+ resultCode = netscape.ldap.client.opers.JDAPResult.CONNECT_ERROR;
+ } else if (ctx.getConstraints() != null) {
+ results = ldapConn.search(dn, scope, filterString, attributeList, false,
+ ctx.getConstraints());
+ } else {
+ results = ldapConn.search(dn, scope, filterString, attributeList,
false);
+ }
} catch (LDAPException E) {
resultCode = E.getLDAPResultCode();
Index: ParseControl.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ParseControl.java 26 Apr 2007 22:28:56 -0000 1.1.1.1
+++ ParseControl.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ParseFilter.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ParseFilter.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ ParseFilter.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ParseValue.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ParseValue.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ ParseValue.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ProxyConnMgrFactory.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ProxyConnMgrFactory.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ ProxyConnMgrFactory.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: ProxyConnectionManager.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ProxyConnectionManager.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ ProxyConnectionManager.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
@@ -38,7 +19,9 @@
import java.lang.Exception ;
import java.util.*;
-import java.util.logging.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import netscape.ldap.LDAPConnection;
import netscape.ldap.util.ConnectionPool;
import netscape.ldap.LDAPConstraints;
@@ -65,7 +48,7 @@
private static Logger logger =
- Logger.getLogger("com.netscape.dsml.service.ProxyConnectionManager");
+ Logger.getLogger("com.netscape.dsml.gateway.ProxyConnectionManager");
static private ConnectionPool _ldapPool = null;
static private ConnectionPool _ldapLoginPool = null;
static private LDAPConnection _trialConn = null;
Index: gatewayContext.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gatewayContext.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ gatewayContext.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: gatewayException.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gatewayException.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ gatewayException.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
Index: gatewayHandler.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gatewayHandler.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ gatewayHandler.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
@@ -37,34 +18,22 @@
package com.netscape.dsml.gateway;
-import java.io.*;
-import java.util.Iterator;
import javax.xml.namespace.QName;
-import javax.xml.parsers.*;
-import javax.xml.rpc.handler.Handler;
import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.Name;
+import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Document;
-import org.xml.sax.*;
-import org.w3c.dom.*;
-import javax.xml.soap.*;
import org.apache.axis.AxisFault;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.handlers.BasicHandler;
import org.apache.commons.codec.binary.Base64;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
public class gatewayHandler extends BasicHandler {
+ private static Logger logger =
Logger.getLogger("com.netscape.dsml.gateway.gatewayHandler");
private HandlerInfo handlerInfo;
static private javax.xml.soap.MessageFactory messageFactory ;
static private javax.xml.soap.SOAPFactory sef ;
@@ -72,18 +41,27 @@
public gatewayHandler() {
super();
+ System.err.println("gatewayHandler.gatewayHandler: logger class " +
+ "is " + logger.getClass().getCanonicalName() +
+ " logger name is " + logger.getName() +
+ " parent class is " +
logger.getParent().getClass().getCanonicalName() +
+ " parent name is " + logger.getParent().getName());
+ logger.entering("gatewayHandler", "gatewayHandler");
try {
messageFactory = javax.xml.soap.MessageFactory.newInstance();
sef = javax.xml.soap.SOAPFactory.newInstance();
} catch (Exception e) { }
+ logger.exiting("gatewayHandler", "gatewayHandler");
}
public void invoke(MessageContext context) throws AxisFault {
+ logger.entering("gatewayHandler", "invoke");
if (context.getPastPivot() == false) {
handleRequest(context);
}
+ logger.exiting("gatewayHandler", "invoke");
}
public void cleanup() {
Index: gatewayService.java
===================================================================
RCS file: /cvs/dirsec/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gatewayService.java 26 Apr 2007 22:28:55 -0000 1.1.1.1
+++ gatewayService.java 18 Apr 2008 16:43:39 -0000 1.2
@@ -11,25 +11,6 @@
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked
combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception.
- *
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.