Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-03-11 00:24:42 -0500
committerslewis2007-03-11 00:24:42 -0500
commitb02e8ba9d5bec406776b685ddc9dc66017aad21b (patch)
tree078dddec22fdb937a36391d1f3d84ed97deee2d7 /server-side/bundles
parentcdaf9242eb5dff51ac3cc956aadaf26a57f79e4c (diff)
downloadorg.eclipse.ecf-b02e8ba9d5bec406776b685ddc9dc66017aad21b.tar.gz
org.eclipse.ecf-b02e8ba9d5bec406776b685ddc9dc66017aad21b.tar.xz
org.eclipse.ecf-b02e8ba9d5bec406776b685ddc9dc66017aad21b.zip
externalized strings. created internal package for activator
Diffstat (limited to 'server-side/bundles')
-rw-r--r--server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF7
-rw-r--r--server-side/bundles/org.eclipse.ecf.server/plugin.properties13
-rw-r--r--server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java (renamed from server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/Activator.java)4
-rw-r--r--server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/ECFTCPServerStartup.java3
4 files changed, 21 insertions, 6 deletions
diff --git a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
index 8819a3bc4..1cbe1ad80 100644
--- a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
+++ b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
@@ -1,13 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: ECF Server Plug-in
+Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.server
Bundle-Version: 1.0.0.v20070215
-Bundle-Activator: org.eclipse.ecf.server.Activator
-Bundle-Vendor: Eclipse.org
+Bundle-Activator: org.eclipse.ecf.internal.server.Activator
+Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Eclipse-LazyStart: true
-Eclipse-AutoStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
CDC-1.1/Foundation-1.1
Require-Bundle: org.eclipse.ecf,
diff --git a/server-side/bundles/org.eclipse.ecf.server/plugin.properties b/server-side/bundles/org.eclipse.ecf.server/plugin.properties
new file mode 100644
index 000000000..ea41c6b6f
--- /dev/null
+++ b/server-side/bundles/org.eclipse.ecf.server/plugin.properties
@@ -0,0 +1,13 @@
+/****************************************************************************
+* Copyright (c) 2004 Composent, Inc. and others.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Composent, Inc. - initial API and implementation
+*****************************************************************************/
+plugin.name=ECF Server API
+plugin.provider=Eclipse.org
+
diff --git a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/Activator.java b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java
index 167222026..9948b6aca 100644
--- a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/Activator.java
+++ b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java
@@ -9,12 +9,14 @@
* Composent, Inc. - initial API and implementation
*****************************************************************************/
-package org.eclipse.ecf.server;
+package org.eclipse.ecf.internal.server;
import java.net.URL;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
+import org.eclipse.ecf.server.Config;
+import org.eclipse.ecf.server.ECFTCPServerStartup;
import org.osgi.framework.BundleContext;
/**
diff --git a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/ECFTCPServerStartup.java b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/ECFTCPServerStartup.java
index 7666f1f38..7371252e5 100644
--- a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/ECFTCPServerStartup.java
+++ b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/ECFTCPServerStartup.java
@@ -18,6 +18,7 @@ import java.util.List;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.core.identity.IDCreateException;
+import org.eclipse.ecf.internal.server.Activator;
import org.eclipse.ecf.provider.app.Connector;
import org.eclipse.ecf.provider.app.NamedGroup;
import org.eclipse.ecf.provider.app.ServerConfigParser;
@@ -42,7 +43,7 @@ public class ECFTCPServerStartup {
protected boolean isActive() {
return (servers.size() > 0);
}
- protected synchronized void destroyServers() {
+ public synchronized void destroyServers() {
for (Iterator i = servers.iterator(); i.hasNext();) {
TCPServerSOContainer s = (TCPServerSOContainer) i.next();
if (s != null) {

Back to the top