diff options
| author | Brent Eagles <brent@zeroc.com> | 2007-06-19 11:20:49 -0230 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2007-06-19 11:20:49 -0230 |
| commit | 1074eb3b852646474c46b56db01b87e1d8c020ce (patch) | |
| tree | 2c0ab4c6190c5e8e7924a8dff4703d647be64f3f /cpp/src | |
| parent | Added support for SIGKILL/SIGTERM on Windows (bug 2258) (diff) | |
| parent | Removing unnecessary attribute. (diff) | |
| download | ice-1074eb3b852646474c46b56db01b87e1d8c020ce.tar.bz2 ice-1074eb3b852646474c46b56db01b87e1d8c020ce.tar.xz ice-1074eb3b852646474c46b56db01b87e1d8c020ce.zip | |
Merge branch 'property_names_enh'
Conflicts:
cpp/config/PropertyNames.xml
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
cs/src/Ice/PropertyNames.cs
java/src/IceInternal/PropertyNames.java
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 26 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index a612d04748a..a692893523a 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Jun 18 10:35:47 2007 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jun 19 11:18:43 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -31,7 +31,7 @@ const IceInternal::Property IcePropsData[] = IceInternal::Property("Ice.Default.Locator.LocatorCacheTimeout", false, 0), IceInternal::Property("Ice.Default.Locator.Locator", false, 0), IceInternal::Property("Ice.Default.Locator.Router", false, 0), - IceInternal::Property("Ice.Default.Locator.CollocationOptimization", false, 0), + IceInternal::Property("Ice.Default.Locator.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("Ice.Default.Locator.CollocationOptimized", false, 0), IceInternal::Property("Ice.Default.Locator.ThreadPerConnection", false, 0), IceInternal::Property("Ice.Default.Locator", false, 0), @@ -45,7 +45,7 @@ const IceInternal::Property IcePropsData[] = IceInternal::Property("Ice.Default.Router.LocatorCacheTimeout", false, 0), IceInternal::Property("Ice.Default.Router.Locator", false, 0), IceInternal::Property("Ice.Default.Router.Router", false, 0), - IceInternal::Property("Ice.Default.Router.CollocationOptimization", false, 0), + IceInternal::Property("Ice.Default.Router.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("Ice.Default.Router.CollocationOptimized", false, 0), IceInternal::Property("Ice.Default.Router.ThreadPerConnection", false, 0), IceInternal::Property("Ice.Default.Router", false, 0), @@ -184,7 +184,7 @@ const IceInternal::Property IceGridPropsData[] = IceInternal::Property("IceGrid.Node.UserAccountMapper.LocatorCacheTimeout", false, 0), IceInternal::Property("IceGrid.Node.UserAccountMapper.Locator", false, 0), IceInternal::Property("IceGrid.Node.UserAccountMapper.Router", false, 0), - IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimization", false, 0), + IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimized", false, 0), IceInternal::Property("IceGrid.Node.UserAccountMapper.ThreadPerConnection", false, 0), IceInternal::Property("IceGrid.Node.UserAccountMapper", false, 0), @@ -196,7 +196,7 @@ const IceInternal::Property IceGridPropsData[] = IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.LocatorCacheTimeout", false, 0), IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Locator", false, 0), IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Router", false, 0), - IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimization", false, 0), + IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimized", false, 0), IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.ThreadPerConnection", false, 0), IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier", false, 0), @@ -206,7 +206,7 @@ const IceInternal::Property IceGridPropsData[] = IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.LocatorCacheTimeout", false, 0), IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Locator", false, 0), IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Router", false, 0), - IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimization", false, 0), + IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimized", false, 0), IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.ThreadPerConnection", false, 0), IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier", false, 0), @@ -245,7 +245,7 @@ const IceInternal::Property IceGridPropsData[] = IceInternal::Property("IceGrid.Registry.PermissionsVerifier.LocatorCacheTimeout", false, 0), IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Locator", false, 0), IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Router", false, 0), - IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimization", false, 0), + IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimized", false, 0), IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ThreadPerConnection", false, 0), IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0), @@ -282,7 +282,7 @@ const IceInternal::Property IceGridPropsData[] = IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0), IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Locator", false, 0), IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Router", false, 0), - IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimization", false, 0), + IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized", false, 0), IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.ThreadPerConnection", false, 0), IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier", false, 0), @@ -422,7 +422,7 @@ const IceInternal::Property IceStormPropsData[] = IceInternal::Property("IceStorm.TopicManager.Proxy.LocatorCacheTimeout", false, 0), IceInternal::Property("IceStorm.TopicManager.Proxy.Locator", false, 0), IceInternal::Property("IceStorm.TopicManager.Proxy.Router", false, 0), - IceInternal::Property("IceStorm.TopicManager.Proxy.CollocationOptimization", false, 0), + IceInternal::Property("IceStorm.TopicManager.Proxy.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("IceStorm.TopicManager.Proxy.CollocationOptimized", false, 0), IceInternal::Property("IceStorm.TopicManager.Proxy.ThreadPerConnection", false, 0), IceInternal::Property("IceStorm.TopicManager.Proxy", false, 0), @@ -476,7 +476,7 @@ const IceInternal::Property Glacier2PropsData[] = IceInternal::Property("Glacier2.PermissionsVerifier.LocatorCacheTimeout", false, 0), IceInternal::Property("Glacier2.PermissionsVerifier.Locator", false, 0), IceInternal::Property("Glacier2.PermissionsVerifier.Router", false, 0), - IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimization", false, 0), + IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimized", false, 0), IceInternal::Property("Glacier2.PermissionsVerifier.ThreadPerConnection", false, 0), IceInternal::Property("Glacier2.PermissionsVerifier", false, 0), @@ -487,7 +487,7 @@ const IceInternal::Property Glacier2PropsData[] = IceInternal::Property("Glacier2.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0), IceInternal::Property("Glacier2.SSLPermissionsVerifier.Locator", false, 0), IceInternal::Property("Glacier2.SSLPermissionsVerifier.Router", false, 0), - IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimization", false, 0), + IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimized", false, 0), IceInternal::Property("Glacier2.SSLPermissionsVerifier.ThreadPerConnection", false, 0), IceInternal::Property("Glacier2.SSLPermissionsVerifier", false, 0), @@ -507,7 +507,7 @@ const IceInternal::Property Glacier2PropsData[] = IceInternal::Property("Glacier2.SessionManager.LocatorCacheTimeout", false, 0), IceInternal::Property("Glacier2.SessionManager.Locator", false, 0), IceInternal::Property("Glacier2.SessionManager.Router", false, 0), - IceInternal::Property("Glacier2.SessionManager.CollocationOptimization", false, 0), + IceInternal::Property("Glacier2.SessionManager.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("Glacier2.SessionManager.CollocationOptimized", false, 0), IceInternal::Property("Glacier2.SessionManager.ThreadPerConnection", false, 0), IceInternal::Property("Glacier2.SessionManager", false, 0), @@ -517,7 +517,7 @@ const IceInternal::Property Glacier2PropsData[] = IceInternal::Property("Glacier2.SSLSessionManager.LocatorCacheTimeout", false, 0), IceInternal::Property("Glacier2.SSLSessionManager.Locator", false, 0), IceInternal::Property("Glacier2.SSLSessionManager.Router", false, 0), - IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimization", false, 0), + IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimization", true, "CollocationOptimized"), IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimized", false, 0), IceInternal::Property("Glacier2.SSLSessionManager.ThreadPerConnection", false, 0), IceInternal::Property("Glacier2.SSLSessionManager", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 5fc15442d17..7da67f342d1 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -7,7 +7,7 @@ // // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Jun 18 10:35:47 2007 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jun 19 11:18:43 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! |