cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java
markt 2004/07/25 15:03:04
Modified:catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
Fix bug 13097. Incorrect form of address used in Embedded.
- Patch suggested by David S. Johnson
- I don't have a test case but after reviewing the change history this looks OK.
Also took opportunity to fix some Eclipse warnings.
Revision ChangesPath
1.17 +7 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Embedded.java 9 Jun 2002 02:19:44 - 1.16
+++ Embedded.java 25 Jul 2004 22:03:03 - 1.17
@@ -68,8 +68,6 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.net.InetAddress;
-import java.util.Enumeration;
-import java.util.Properties;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -79,7 +77,6 @@
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
@@ -522,7 +519,8 @@
if (address != null) {
IntrospectionUtils.setProperty(connector, address,
-+ address);
++ address.getHostAddress());
+
}
IntrospectionUtils.setProperty(connector, port, + port);
IntrospectionUtils.setProperty(connector, useURIValidationHack,
@@ -691,7 +689,7 @@
*/
public String getInfo() {
-return (this.info);
+return (Embedded.info);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java
remm2002/06/05 23:29:17
Modified:catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
- Embedded will now use Coyote.
- Add support for AJP (using a new createConnector method).
Revision ChangesPath
1.15 +58 -39
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Embedded.java 9 Nov 2001 19:40:44 - 1.14
+++ Embedded.java 6 Jun 2002 06:29:17 - 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.14 2001/11/09 19:40:44 remm Exp $
- * $Revision: 1.14 $
- * $Date: 2001/11/09 19:40:44 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.15 2002/06/06 06:29:17 remm Exp $
+ * $Revision: 1.15 $
+ * $Date: 2002/06/06 06:29:17 $
*
*
*
@@ -70,6 +70,9 @@
import java.net.InetAddress;
import java.util.Enumeration;
import java.util.Properties;
+
+import org.apache.tomcat.util.IntrospectionUtils;
+
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
@@ -82,7 +85,6 @@
import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
import org.apache.catalina.Realm;
-import org.apache.catalina.connector.http.HttpConnector;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.core.StandardHost;
@@ -149,7 +151,7 @@
* /pre
*
* @author Craig R. McClanahan
- * @version $Revision: 1.14 $ $Date: 2001/11/09 19:40:44 $
+ * @version $Revision: 1.15 $ $Date: 2002/06/06 06:29:17 $
*/
public class Embedded implements Lifecycle {
@@ -406,14 +408,7 @@
public synchronized void addConnector(Connector connector) {
if (debug = 1) {
-if (connector instanceof HttpConnector) {
-HttpConnector hc = (HttpConnector) connector;
-logger.log(Adding connector for address ' +
- ((hc.getAddress() == null) ? ALL : hc.getAddress())
- + ' port=' + hc.getPort() + ');
-} else {
-logger.log(Adding connector ( + connector.getInfo() + ));
-}
+logger.log(Adding connector ( + connector.getInfo() + ));
}
// Make sure we have a Container to send requests to
@@ -504,27 +499,58 @@
((address == null) ? ALL : address.getHostAddress()) +
' port=' + port + ' secure=' + secure + ');
-HttpConnector connector = new HttpConnector();
-
-if (address != null)
-connector.setAddress(address.getHostAddress());
-connector.setDebug(debug);
-connector.setPort(port);
+String protocol = http;
if (secure) {
-connector.setScheme(https);
-connector.setSecure(true);
-try {
-Class serverSocketFactoryClass = Class.forName
-(org.apache.catalina.net.SSLServerSocketFactory);
-ServerSocketFactory factory =
-(ServerSocketFactory)
-serverSocketFactoryClass.newInstance();
-connector.setFactory(factory);
-} catch (Exception e) {
-logger.log(Couldn't load SSL server socket factory.);
-}
+protocol = https;
}
+return createConnector(address, port, protocol);
+
+}
+
+
+public Connector createConnector(InetAddress address, int port,
+ String protocol) {
+
+Connector connector = null;
+
+try {
+
+Class clazz =
+Class.forName(org.apache.coyote.tomcat4.CoyoteConnector);
+connector = (Connector) clazz.newInstance();
+
+if (address != null) {
+IntrospectionUtils.setProperty(connector, address,
++ address);
+}
+IntrospectionUtils.setProperty(connector, port, + port);
+IntrospectionUtils.setProperty(connector, useURIValidationHack,
++ false);
+
+if (protocol.equals(ajp)) {
+IntrospectionUtils.setProperty
+(connector,
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java
remm01/09/19 16:53:02
Modified:catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
- Use reflection to load the SSLServerSocketFactory, which removes the last
compilation problem when trying to build with JDK 1.3 + servlet.jar + regexp.jar.
- Hopefully, everyone's happy with the build process now :)
Revision ChangesPath
1.12 +15 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Embedded.java 2001/09/11 20:28:41 1.11
+++ Embedded.java 2001/09/19 23:53:02 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.11 2001/09/11 20:28:41 craigmcc Exp $
- * $Revision: 1.11 $
- * $Date: 2001/09/11 20:28:41 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.12 2001/09/19 23:53:02 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/09/19 23:53:02 $
*
*
*
@@ -89,7 +89,7 @@
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.logger.SystemOutLogger;
-import org.apache.catalina.net.SSLServerSocketFactory;
+import org.apache.catalina.net.ServerSocketFactory;
import org.apache.catalina.realm.MemoryRealm;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -148,7 +148,7 @@
* /pre
*
* @author Craig R. McClanahan
- * @version $Revision: 1.11 $ $Date: 2001/09/11 20:28:41 $
+ * @version $Revision: 1.12 $ $Date: 2001/09/19 23:53:02 $
*/
public class Embedded implements Lifecycle {
@@ -512,7 +512,16 @@
if (secure) {
connector.setScheme(https);
connector.setSecure(true);
-connector.setFactory(new SSLServerSocketFactory());
+try {
+Class serverSocketFactoryClass = Class.forName
+(org.apache.catalina.net.SSLServerSocketFactory);
+ServerSocketFactory factory =
+(ServerSocketFactory)
+serverSocketFactoryClass.newInstance();
+connector.setFactory(factory);
+} catch (Exception e) {
+logger.log(Couldn't load SSL server socket factory.);
+}
}
return (connector);
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java
craigmcc01/09/11 13:28:41
Modified:catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
Modify the org.apache.catalina.startup.Embedded class to *require* that
the catalina.home system property be set in order to function. Many
internal Catalina operations depend on this.
Modify the org.apache.catalina.startup.Embedded class to copy the value of
the catalina.home system property to the catalina.base system property
if the latter is not set. Many internal Catalina operations depend on
this.
Add a backwards-compatibility patch so that the most recent Tomcat 4.0
code will still run with the J2EE 1.3 Reference Implementation.
Revision ChangesPath
1.11 +29 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Embedded.java 2001/07/24 22:48:31 1.10
+++ Embedded.java 2001/09/11 20:28:41 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.10 2001/07/24 22:48:31 pier Exp $
- * $Revision: 1.10 $
- * $Date: 2001/07/24 22:48:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.11 2001/09/11 20:28:41 craigmcc Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/09/11 20:28:41 $
*
*
*
@@ -148,7 +148,7 @@
* /pre
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/07/24 22:48:31 $
+ * @version $Revision: 1.11 $ $Date: 2001/09/11 20:28:41 $
*/
public class Embedded implements Lifecycle {
@@ -911,6 +911,22 @@
if (debug = 1)
logger.log(Starting embedded server);
+// Validate the setup of our required system properties
+if (System.getProperty(catalina.home) == null) {
+// Backwards compatibility patch for J2EE RI 1.3
+String j2eeHome = System.getProperty(com.sun.enterprise.home);
+if (j2eeHome != null)
+System.setProperty
+(catalina.home,
+ System.getProperty(com.sun.enterprise.home));
+else
+throw new LifecycleException
+(Must set 'catalina.home' system property);
+}
+if (System.getProperty(catalina.base) == null)
+System.setProperty(catalina.base,
+ System.getProperty(catalina.home));
+
// Validate and update our current component state
if (started)
throw new LifecycleException
@@ -1009,6 +1025,15 @@
embedded.setDebug(5);
embedded.setLogger(new SystemOutLogger());
String home = System.getProperty(catalina.home);
+if (home == null) {
+System.err.println(You must set the 'catalina.home' system property);
+System.exit(1);
+}
+String base = System.getProperty(catalina.base);
+if (base == null) {
+base = home;
+System.setProperty(catalina.base, base);
+}
// Start up this embedded server (to prove we can dynamically
// add and remove containers and connectors later)
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java
pier01/07/24 15:48:32
Modified:catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
Updated the Embedded server to pick up the changes in the modifications
we made during the weekend.
Now also Embedded calls initialize() in the Connector interface at the
right times, and binds appropriately to the configured port.
Revision ChangesPath
1.10 +10 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Embedded.java 2001/07/22 20:25:13 1.9
+++ Embedded.java 2001/07/24 22:48:31 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.9 2001/07/22 20:25:13 pier Exp $
- * $Revision: 1.9 $
- * $Date: 2001/07/22 20:25:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.10 2001/07/24 22:48:31 pier Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/07/24 22:48:31 $
*
*
*
@@ -148,7 +148,7 @@
* /pre
*
* @author Craig R. McClanahan
- * @version $Revision: 1.9 $ $Date: 2001/07/22 20:25:13 $
+ * @version $Revision: 1.10 $ $Date: 2001/07/24 22:48:31 $
*/
public class Embedded implements Lifecycle {
@@ -431,9 +431,12 @@
connectors = results;
// Start this Connector if necessary
-if (started (connector instanceof Lifecycle)) {
+if (started) {
try {
-((Lifecycle) connector).start();
+connector.initialize();
+if (connector instanceof Lifecycle) {
+((Lifecycle) connector).start();
+}
} catch (LifecycleException e) {
logger.log(Connector.start, e);
}
@@ -939,6 +942,7 @@
// Start our defined Connectors second
for (int i = 0; i connectors.length; i++) {
+connectors[i].initialize();
if (connectors[i] instanceof Lifecycle)
((Lifecycle) connectors[i]).start();
}
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java
remm01/06/21 19:03:44
Modified:catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
- Embedded createLoader method will now create instances of
WebappLoader, instead of StandardLoader.
Revision ChangesPath
1.8 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Embedded.java 2000/12/19 03:23:12 1.7
+++ Embedded.java 2001/06/22 02:03:43 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.7 2000/12/19 03:23:12 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2000/12/19 03:23:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.8 2001/06/22 02:03:43 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/06/22 02:03:43 $
*
*
*
@@ -86,7 +86,7 @@
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.loader.StandardLoader;
+import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.logger.SystemOutLogger;
import org.apache.catalina.net.SSLServerSocketFactory;
@@ -148,7 +148,7 @@
* /pre
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2000/12/19 03:23:12 $
+ * @version $Revision: 1.8 $ $Date: 2001/06/22 02:03:43 $
*/
public class Embedded implements Lifecycle {
@@ -639,7 +639,7 @@
logger.log(Creating Loader with parent class loader ' +
parent + ');
-StandardLoader loader = new StandardLoader(parent);
+WebappLoader loader = new WebappLoader(parent);
return (loader);
}
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java
craigmcc00/12/18 19:23:12
Modified:catalina/src/share/org/apache/catalina Engine.java
catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
Enhance the example main() method in the Embedded class so that it will
actually run. The "/examples" webapp does not work without a Realm defined.
Add get/setDefaultHost() to the Engine interface, not just the StandardEngine
implementation class.
Revision ChangesPath
1.2 +21 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java
Index: Engine.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Engine.java 2000/08/11 05:24:06 1.1
+++ Engine.java 2000/12/19 03:23:11 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v 1.1
2000/08/11 05:24:06 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 05:24:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Engine.java,v 1.2
2000/12/19 03:23:11 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/12/19 03:23:11 $
*
*
*
@@ -88,10 +88,27 @@
* should throw codeIllegalArgumentException/code.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/11 05:24:06 $
+ * @version $Revision: 1.2 $ $Date: 2000/12/19 03:23:11 $
*/
public interface Engine extends Container {
+
+
+// - Properties
+
+
+/**
+ * Return the default hostname for this Engine.
+ */
+public String getDefaultHost();
+
+
+/**
+ * Set the default hostname for this Engine.
+ *
+ * @param defaultHost The new default host
+ */
+public void setDefaultHost(String defaultHost);
// - Public Methods
1.7 +8 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Embedded.java 2000/12/14 22:32:19 1.6
+++ Embedded.java 2000/12/19 03:23:12 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.6 2000/12/14 22:32:19 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2000/12/14 22:32:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.7 2000/12/19 03:23:12 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/12/19 03:23:12 $
*
*
*
@@ -90,6 +90,7 @@
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.logger.SystemOutLogger;
import org.apache.catalina.net.SSLServerSocketFactory;
+import org.apache.catalina.realm.MemoryRealm;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -147,7 +148,7 @@
* /pre
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2000/12/14 22:32:19 $
+ * @version $Revision: 1.7 $ $Date: 2000/12/19 03:23:12 $
*/
public class Embedded implements Lifecycle {
@@ -999,7 +1000,8 @@
*/
public static void main(String args[]) {
- Embedded embedded = new Embedded();
+ Embedded embedded = new Embedded(new SystemOutLogger(),
+ new MemoryRealm());
embedded.setDebug(5);
embedded.setLogger(new SystemOutLogger());
String home = System.getProperty("catalina.home");
@@ -1017,6 +1019,7 @@
// that simulates a portion of the one configured in server.xml
// by default
Engine engine = embedded.createEngine();
+ engine.setDefaultHost("localhost");
Host host = embedded.createHost("localhost", home + "/webapps");
engine.addChild(host);
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java
craigmcc00/12/13 09:10:41
Modified:catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
Correct the log output generated by addConnector() if debugging is on.
Submitted by: Christian Mallwitz [EMAIL PROTECTED]
Revision ChangesPath
1.5 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Embedded.java 2000/11/02 06:14:11 1.4
+++ Embedded.java 2000/12/13 17:10:39 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.4 2000/11/02 06:14:11 remm Exp $
- * $Revision: 1.4 $
- * $Date: 2000/11/02 06:14:11 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
1.5 2000/12/13 17:10:39 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/12/13 17:10:39 $
*
*
*
@@ -145,7 +145,7 @@
* /pre
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2000/11/02 06:14:11 $
+ * @version $Revision: 1.5 $ $Date: 2000/12/13 17:10:39 $
*/
public class Embedded implements Lifecycle {
@@ -405,7 +405,7 @@
if (connector instanceof HttpConnector) {
HttpConnector hc = (HttpConnector) connector;
logger.log("Adding connector for address '" +
- ((hc.getAddress() != null) ? "ALL" : hc.getAddress())
+ ((hc.getAddress() == null) ? "ALL" : hc.getAddress())
+ "' port='" + hc.getPort() + "'");
} else {
logger.log("Adding connector (" + connector.getInfo() + ")");
