Merge branch 'refs/heads/master' of ssh://git.eclipse.org/gitroot/ecf/org.eclipse.ecf.git into HEAD
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF
index cd6fbf3..a078057 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.server.generic;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 5.0.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.server.generic.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/IGenericServerContainerGroup.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/IGenericServerContainerGroup.java
index ce96119..afa0b58 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/IGenericServerContainerGroup.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/IGenericServerContainerGroup.java
@@ -47,6 +47,33 @@
public ISharedObjectContainer createContainer(String path, int keepAlive, Map properties) throws ContainerCreateException;
/**
+ * Create a shared object container within this container group, given a path, a keepAlive value, and a Map of properties
+ * that will be provided to the created container.
+ *
+ * @param path the uri path suffix for defining the container's identity. For example, if {@link #getGroupEndpoint()}
+ * returns 'ecftcp://localhost:3282', and a path of '/server' is used to create a new container, then the container's id
+ * will be 'ecftcp://localhost:3282/server'. Must not be <code>null</code>.
+ * @param keepAlive a value (in milliseconds) that defines the keepAlive for the resulting container.
+ * @return shared object container. Will not be <code>null</code>.
+ * @throws ContainerCreateException if container with given path, keepAlive, and properties could not be created.
+ * @since 5.0
+ */
+ public ISharedObjectContainer createContainer(String path, int keepAlive) throws ContainerCreateException;
+
+ /**
+ * Create a shared object container within this container group, given a path, a keepAlive value, and a Map of properties
+ * that will be provided to the created container.
+ *
+ * @param path the uri path suffix for defining the container's identity. For example, if {@link #getGroupEndpoint()}
+ * returns 'ecftcp://localhost:3282', and a path of '/server' is used to create a new container, then the container's id
+ * will be 'ecftcp://localhost:3282/server'. Must not be <code>null</code>.
+ * @return shared object container. Will not be <code>null</code>.
+ * @throws ContainerCreateException if container with given path, keepAlive, and properties could not be created.
+ * @since 5.0
+ */
+ public ISharedObjectContainer createContainer(String path) throws ContainerCreateException;
+
+ /**
* Get the container instance associated with the given path.
*
* @param path of the container to return. Must not be <code>null</code>.
