Index: plugins/net.refractions.udig.plugins/META-INF/MANIFEST.MF
===================================================================
--- plugins/net.refractions.udig.plugins/META-INF/MANIFEST.MF	(revision 0)
+++ plugins/net.refractions.udig.plugins/META-INF/MANIFEST.MF	(revision 0)
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Eclipse Plug-in
+Bundle-SymbolicName: net.refractions.udig.plugins;singleton:=true
+Bundle-Version: 1.0.0
+Bundle-Activator: net.refractions.udig.internal.ui.Activator
+Bundle-Vendor: IAI
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ net.refractions.udig.ui
+Eclipse-LazyStart: true
Index: plugins/net.refractions.udig.plugins/.classpath
===================================================================
--- plugins/net.refractions.udig.plugins/.classpath	(revision 0)
+++ plugins/net.refractions.udig.plugins/.classpath	(revision 0)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: plugins/net.refractions.udig.plugins/.project
===================================================================
--- plugins/net.refractions.udig.plugins/.project	(revision 0)
+++ plugins/net.refractions.udig.plugins/.project	(revision 0)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>net.refractions.udig.plugins</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
Index: plugins/net.refractions.udig.plugins/src/net/refractions/udig/internal/ui/uDigStartup.java
===================================================================
--- plugins/net.refractions.udig.plugins/src/net/refractions/udig/internal/ui/uDigStartup.java	(revision 0)
+++ plugins/net.refractions.udig.plugins/src/net/refractions/udig/internal/ui/uDigStartup.java	(revision 0)
@@ -0,0 +1,38 @@
+/**
+ * 
+ */
+package net.refractions.udig.internal.ui;
+
+import net.refractions.udig.internal.ui.UDIGApplication;
+import net.refractions.udig.ui.ShutdownTaskList;
+
+import org.eclipse.ui.IStartup;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * This class provides calls the methods that need to be called 
+ * when uDig starts up.  But are not called when uDig is not
+ * run as a set of plugins.
+ * @author hbullen
+ *
+ */
+public class uDigStartup implements IStartup {
+
+	/** 
+	 * Dose uDig startup things like checking for JAI and creating the
+	 * ShutdownTaskList
+	 * @see org.eclipse.ui.IStartup#earlyStartup()
+	 */
+	@Override
+	public void earlyStartup() {
+		System.out.println("Starting up uDig");
+
+        if (!UDIGApplication.init() ) {
+            // we could not meet our requirements; please exit!
+            System.exit(1);
+        }
+
+		PlatformUI.getWorkbench().addWorkbenchListener(ShutdownTaskList.instance());
+	}
+
+}
Index: plugins/net.refractions.udig.plugins/src/net/refractions/udig/internal/ui/Activator.java
===================================================================
--- plugins/net.refractions.udig.plugins/src/net/refractions/udig/internal/ui/Activator.java	(revision 0)
+++ plugins/net.refractions.udig.plugins/src/net/refractions/udig/internal/ui/Activator.java	(revision 0)
@@ -0,0 +1,50 @@
+package net.refractions.udig.internal.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "com.iai.udig.eclipse";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
Index: plugins/net.refractions.udig.plugins/build.properties
===================================================================
--- plugins/net.refractions.udig.plugins/build.properties	(revision 0)
+++ plugins/net.refractions.udig.plugins/build.properties	(revision 0)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
Index: plugins/net.refractions.udig.plugins/plugin.xml
===================================================================
--- plugins/net.refractions.udig.plugins/plugin.xml	(revision 0)
+++ plugins/net.refractions.udig.plugins/plugin.xml	(revision 0)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.startup">
+      <startup
+            class="net.refractions.udig.internal.ui.uDigStartup">
+      </startup>
+   </extension>
+
+</plugin>
Index: plugins/net.refractions.udig.ui/src/net/refractions/udig/internal/ui/UDIGApplication.java
===================================================================
--- plugins/net.refractions.udig.ui/src/net/refractions/udig/internal/ui/UDIGApplication.java	(revision 30270)
+++ plugins/net.refractions.udig.ui/src/net/refractions/udig/internal/ui/UDIGApplication.java	(working copy)
@@ -158,7 +158,7 @@
      * @return <code>true </code> on successful startup; false to exit the application with an
      *         error.
      */
-    protected boolean init() {
+    static protected boolean init() {
         checkForJAI();
         boolean required = checkForGDI();
 
@@ -180,7 +180,7 @@
      * Forces the class loader to load several troublesome classes; mostly focused on FactorySPI
      * plugins used by the GeoTools library.
      */
-    private void loadCommonlyUsedObject() {
+    static protected void loadCommonlyUsedObject() {
         // potential fix for win32 (occasionally blocks in Drawing.feature(Point/etc) during first
         // render)
         new UID(); // seed the random number generator
@@ -203,7 +203,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    private void load( Set coordinateOperationAuthorityFactories ) {
+    static private void load( Set coordinateOperationAuthorityFactories ) {
         for( Iterator iter = coordinateOperationAuthorityFactories.iterator(); iter.hasNext(); ) {
             iter.next();
         }
@@ -267,7 +267,7 @@
      * 
      * @return true to indicate a successful login
      */
-    public boolean checkLogin() {
+    static public boolean checkLogin() {
         return true;
     }
 }
Index: plugins/net.refractions.udig.ui/plugin.properties
===================================================================
--- plugins/net.refractions.udig.ui/plugin.properties	(revision 30268)
+++ plugins/net.refractions.udig.ui/plugin.properties	(working copy)
@@ -19,7 +19,7 @@
 antialiasing.tip.name = Turning on Anti-Aliasing
 antialiasing.tip.tip  = You can turn on anti-aliasing(for better looking maps) in the Rendering Preferences.
 
-application.name = User-friendly Desktop Interget GIS
+application.name = User-friendly Desktop Internet GIS
 
 background.color.tip.name = Default Map Background Color
 background.color.tip.tip  = The background color of new maps can be set in Map Preferences.