Tidy up

Remove some debug comments
Made a change the Vadim had made in master : DE73486
Deleted duplicate templates from the eclipse pluigin
diff --git a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/api/impl/TigerstripePhantomProjectHandle.java b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/api/impl/TigerstripePhantomProjectHandle.java
index 8abb212..f803548 100644
--- a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/api/impl/TigerstripePhantomProjectHandle.java
+++ b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/api/impl/TigerstripePhantomProjectHandle.java
@@ -59,7 +59,6 @@
     public TigerstripePhantomProjectHandle(NewTigerstripeRuntime runtime) throws TigerstripeException {
         super(runtime, runtime.getPhantomTigerstripeProjectMgr().getPhantomURI());
         this.runtime = runtime;
-        System.out.println("CREATNG PHANTOM  HANDLE ");
     }
 
     public Collection<IPrimitiveTypeArtifact> getReservedPrimitiveTypes()
@@ -329,7 +328,6 @@
         ZipFilePackager zipper = null;
         File[] binFiles = null;
         try {
-            System.out.println("CREATNG PHANTOM  - ZIPPING");
             File libDir = new File(getPhantomURI().getPath() + "/lib/");
             if (!libDir.exists()) {
                 libDir.mkdirs();
diff --git a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/NewTigerstripeRuntime.java b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/NewTigerstripeRuntime.java
index 108c91b..09ab181 100644
--- a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/NewTigerstripeRuntime.java
+++ b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/NewTigerstripeRuntime.java
@@ -5,6 +5,7 @@
 import java.net.URL;

 import java.security.CodeSource;

 import java.text.SimpleDateFormat;

+import java.time.Year;

 import java.util.GregorianCalendar;

 import java.util.Map;

 import java.util.TimeZone;

@@ -38,6 +39,8 @@
     // Version of the currently active tigerstripe feature

     public static final String TIGERSTRIPE_FEATURE_VERSION = "tigerstripe.feature.version";

 

+    public static final String CURRENT_YEAR = "tigerstripe.runtime.year";

+

     /** Signaling we're running as a generic Eclipse Run */

     public static final int ECLIPSE_GUI_RUN = 1;

 

@@ -60,7 +63,7 @@
     private int runType = ECLIPSE_GUI_RUN;

 

     private Logger tigerstripeLogger;

-    

+

     private String loggingDir = null;

 

     private RollingFileAppender appender;

@@ -83,38 +86,38 @@
 

     public static final String PRODUCT_NAME = "product.name";

 

-   

+

     private TigerstripePhantomProjectHandle phantomHandle = null;

-   

+

     private PhantomTigerstripeProjectMgr tsProjectManager;

-    

+

     private PluginManager pluginManager = null;

-    

+

     private IClasspathModuleManager classpathModuleManager = null;

-    

+

     protected IWorkbenchProfileBaseSession workbenchProfileSession;

-    

+

     private String ts_home ;

-    

+

     private volatile boolean initialized = false;

 

-    

+

     // This can be called if you dpn;t need any specific instance data - 

     // eg in the ArtifactPersister, it is used to get the 

     // version. Don;t use for anything that needs phantom etc.

-    

+

     // THIS is used by the eclipse plugins, as there should only be one runtime instance there!

     private static NewTigerstripeRuntime defaultInstance = new NewTigerstripeRuntime();

-    

+

     // BIT OF A HACK REALLY!

     public static NewTigerstripeRuntime getDefaultInstance() {

         return defaultInstance;

     }

-    

+

     public NewTigerstripeRuntime() {

         tsProjectManager = new PhantomTigerstripeProjectMgr(this);

     }

-    

+

     public int getRuntype() {

         return runType;

     }

@@ -130,12 +133,12 @@
         this.runType = runType;

     }

 

-    

+

     public  void setLoggingDir(String logging_Dir) {

-       loggingDir = logging_Dir;

+        loggingDir = logging_Dir;

     }

-    

-    

+

+

     public String getLoggingDir() {

         String runtimeRoot = getTigerstripeRuntimeRoot();

         if (loggingDir == null) {

@@ -143,7 +146,7 @@
         }

         return loggingDir;

     }

-    

+

     /**

      * Initialize any Tigerstripe Logging related logic

      * 

@@ -275,210 +278,213 @@
     public String getProperty(String property) {

         if (TIGERSTRIPE_FEATURE_VERSION.equalsIgnoreCase(property)) {

             return findWorkbenchFeatureVersion();

+

+        } else if (CURRENT_YEAR.equalsIgnoreCase(property)) {

+            int year = Year.now().getValue();

+            return String.valueOf(year);

         }

+        

         return null;

     }

 

-    public String getLogPath() {

-        return appender.getFile();

-    }

+        public String getLogPath() {

+            return appender.getFile();

+        }

 

-    protected static String findWorkbenchFeatureVersion() {

-        //TODO - The version of the TS jar ?

-        //      return TigerstripeCore.getRuntimeDetails().getBaseBundleValue(Constants.BUNDLE_VERSION);

-        CodeSource src = NewTigerstripeRuntime.class.getProtectionDomain().getCodeSource();

-        if (src != null) {

-            try {

-                URL path = src.getLocation();

-                JarFile jarFile = new JarFile(path.getPath());

-                Manifest mf = jarFile.getManifest();

-                Attributes attrs = mf.getMainAttributes();

-                String value =  attrs.getValue("Bundle-Name");

-                if (StringUtils.isNotEmpty(value)){

-                    return value;

+        protected static String findWorkbenchFeatureVersion() {

+            CodeSource src = NewTigerstripeRuntime.class.getProtectionDomain().getCodeSource();

+            if (src != null) {

+                try {

+                    URL path = src.getLocation();

+                    JarFile jarFile = new JarFile(path.getPath());

+                    Manifest mf = jarFile.getManifest();

+                    Attributes attrs = mf.getMainAttributes();

+                    String value =  attrs.getValue("Bundle-Version");

+                    if (StringUtils.isNotEmpty(value)){

+                        return value;

+                    }

+                } catch (Exception e) {

+                    // ignore - just drop out

                 }

-            } catch (Exception e) {

-                // ignore - just drop out

             }

+            return "Not yet set";

         }

-        return "Not yet set";

-    }

 

 

-    public String getTigerstripeRuntimeRoot() {

-        if (tigerstripeRuntimeRoot == null) {

-            try {

-                File runtimeRoot = getOrCreateTigerstripeRuntimeDir();

-                tigerstripeRuntimeRoot = runtimeRoot.getAbsolutePath();

-            } catch (TigerstripeException e) {

-                System.err.println("Please define TIGERSTRIPE_HOME.");

-                System.exit(-1);

+        public String getTigerstripeRuntimeRoot() {

+            if (tigerstripeRuntimeRoot == null) {

+                try {

+                    File runtimeRoot = getOrCreateTigerstripeRuntimeDir();

+                    tigerstripeRuntimeRoot = runtimeRoot.getAbsolutePath();

+                } catch (TigerstripeException e) {

+                    System.err.println("Please define TIGERSTRIPE_HOME.");

+                    System.exit(-1);

+                }

             }

+            return tigerstripeRuntimeRoot;

         }

-        return tigerstripeRuntimeRoot;

-    }

 

-    public void setTigerstripeRuntime(String tigerstripeRuntime) {

-        tigerstripeRuntimeRoot = tigerstripeRuntime;

-    }

+        public void setTigerstripeRuntime(String tigerstripeRuntime) {

+            tigerstripeRuntimeRoot = tigerstripeRuntime;

+        }

 

 

-    public PhantomTigerstripeProjectMgr getPhantomTigerstripeProjectMgr() {

-        return tsProjectManager;

-    }

+        public PhantomTigerstripeProjectMgr getPhantomTigerstripeProjectMgr() {

+            return tsProjectManager;

+        }

 

 

-    public IPhantomTigerstripeProject getPhantomProject()

-            throws TigerstripeException {

-        synchronized (getPhantomTigerstripeProjectMgr()) {

-            if (phantomHandle == null) {

-                phantomHandle = new TigerstripePhantomProjectHandle(this);

-                phantomHandle.init();

+        public IPhantomTigerstripeProject getPhantomProject()

+                throws TigerstripeException {

+            synchronized (getPhantomTigerstripeProjectMgr()) {

+                if (phantomHandle == null) {

+                    phantomHandle = new TigerstripePhantomProjectHandle(this);

+                    phantomHandle.init();

+                }

+            }

+

+            return phantomHandle;

+        }

+

+        public void resetPhantomProject() {

+            synchronized (getPhantomTigerstripeProjectMgr()) {

+                if (phantomHandle != null) {

+                    phantomHandle.dispose();

+                    phantomHandle = null;

+                }

             }

         }

 

-        return phantomHandle;

-    }

 

-    public void resetPhantomProject() {

-        synchronized (getPhantomTigerstripeProjectMgr()) {

-            if (phantomHandle != null) {

-                phantomHandle.dispose();

-                phantomHandle = null;

+        public String getGeneratorDeployLocation() {

+            if (getTigerstripeRuntimeRoot() != null) {

+                File dir = new File(new File(getTigerstripeRuntimeRoot()), "plugins");

+                if (!dir.exists()) {

+                    dir.mkdirs();

+                }

+                return dir.getAbsolutePath();

+            }

+            return getTigerstripeRuntimeRoot();

+        }

+

+

+        public synchronized void init(String ts_home) {

+            if (!initialized) {

+                try {

+                    setTs_home(ts_home);

+                    File tigerstripeRuntimeRoot = getOrCreateTigerstripeRuntimeDir();

+                    setTigerstripeRuntime(tigerstripeRuntimeRoot.getAbsolutePath());

+                    getOrCreateTigerstripePluginDir();

+                    getOrCreateTigerstripeModulesDir();

+                    initLogger();

+

+                    classpathModuleManager = new ClasspathModuleManager(this);

+                    //                classpathModuleManager.init();    

+

+

+                    initialized = true;

+                } catch (TigerstripeException e) {

+                    logErrorMessage(

+                            "Tigerstripe has encountered a critical error during post-startup initialization", e);

+                }

+

             }

         }

-    }

 

-

-    public String getGeneratorDeployLocation() {

-        if (getTigerstripeRuntimeRoot() != null) {

-            File dir = new File(new File(getTigerstripeRuntimeRoot()), "plugins");

-            if (!dir.exists()) {

-                dir.mkdirs();

-            }

-            return dir.getAbsolutePath();

+        public void reinitClassPath() {

+            classpathModuleManager.init();

         }

-        return getTigerstripeRuntimeRoot();

-    }

+

+        public String getTs_home() {

+            return ts_home;

+        }

+

+        public void setTs_home(String ts_home) {

+            this.ts_home = ts_home;

+        }

+

+        // The default here is for standalone

+        public File getOrCreateTigerstripeRuntimeDir() throws TigerstripeException {

+

+            if ( getRuntype() != NewTigerstripeRuntime.STANDALONE_RUN) {

+                Location location = Platform.getInstallLocation();

+                if (location != null && StringUtils.isNotEmpty(location.getURL().getPath())) {

+                    File tsRuntimeDir = new File(new File(location.getURL().getPath()),

+                            NewTigerstripeRuntime.TIGERSTRIPE_HOME_DIR);

+                    if (!tsRuntimeDir.exists()) {

+                        if (!tsRuntimeDir.mkdirs())

+                            throw new TigerstripeException(

+                                    "Failed to create Tigerstripe Runtime Directory at " + tsRuntimeDir.getAbsolutePath());

+                    }

+                    return tsRuntimeDir;

+                } 

+            }

+

+            // This only happens in Standalone,

+            if (getTs_home() == null || getTs_home().length() == 0) {

+                // Let's get this from the env

+                setTs_home(System.getenv("TIGERSTRIPE_HOME"));

+            }

+            if (StringUtils.isEmpty(getTs_home())) {

+                throw new TigerstripeException(

+                        "When running in headless mode TIGERSTRIPE_HOME environment variable must be set.");

+            }

+            return new File(ts_home);

+        }

 

 

-    public synchronized void init(String ts_home) {

-        if (!initialized) {

-            try {

-                setTs_home(ts_home);

-                File tigerstripeRuntimeRoot = getOrCreateTigerstripeRuntimeDir();

-                setTigerstripeRuntime(tigerstripeRuntimeRoot.getAbsolutePath());

-                getOrCreateTigerstripePluginDir();

-                getOrCreateTigerstripeModulesDir();

-                initLogger();

-                

+        private File getOrCreateTigerstripePluginDir() throws TigerstripeException {

+            if ( getRuntype() != NewTigerstripeRuntime.STANDALONE_RUN) {

+                File pluginsDir = new File(getOrCreateTigerstripeRuntimeDir(), NewTigerstripeRuntime.TIGERSTRIPE_PLUGINS_DIR);

+                if (!pluginsDir.exists())

+                    if (!pluginsDir.mkdir())

+                        throw new TigerstripeException("Failed to create Tigerstripe Runtime Directory for plugins at "

+                                + pluginsDir.toURI().toString());

+                return pluginsDir;

+            }

+

+            // In standalone, there is no "plugins" dir.

+            return null;

+        }

+

+        private File getOrCreateTigerstripeModulesDir() throws TigerstripeException {

+            if ( getRuntype() != NewTigerstripeRuntime.STANDALONE_RUN) {

+                File modulesDir = new File(getOrCreateTigerstripeRuntimeDir(), NewTigerstripeRuntime.TIGERSTRIPE_MODULES_DIR);

+                if (!modulesDir.exists())

+                    if (!modulesDir.mkdirs())

+                        throw new TigerstripeException("Failed to create Tigerstripe Runtime Directory for modules at "

+                                + modulesDir.toURI().toString());

+                return modulesDir;

+            }

+

+            // In standalone, there is no "modules" dir.

+            return null;

+        }

+

+

+

+        public IPluginManager getPluginManager() {

+            if (pluginManager == null) {

+                pluginManager = new PluginManager(this);

+            }

+            return pluginManager;

+        }

+

+        public IInstalledModule getModule(String moduleId) {

+            if (classpathModuleManager == null) {

                 classpathModuleManager = new ClasspathModuleManager(this);

-//                classpathModuleManager.init();    

-                

-                

-                initialized = true;

-            } catch (TigerstripeException e) {

-                logErrorMessage(

-                        "Tigerstripe has encountered a critical error during post-startup initialization", e);

+            }

+            return classpathModuleManager.getModule(moduleId);

+        }

+

+

+        public IWorkbenchProfileBaseSession getWorkbenchProfileSession() {

+            if (workbenchProfileSession == null) {

+                workbenchProfileSession = new NewWorkbenchProfileSession(this);

+                workbenchProfileSession.reloadActiveProfile();

             }

 

-        }

-    }

-    

-    public void reinitClassPath() {

-        classpathModuleManager.init();

-    }

-

-    public String getTs_home() {

-        return ts_home;

-    }

-

-    public void setTs_home(String ts_home) {

-        this.ts_home = ts_home;

-    }

-

-    // The default here is for standalone

-    public File getOrCreateTigerstripeRuntimeDir() throws TigerstripeException {

-

-        if ( getRuntype() != NewTigerstripeRuntime.STANDALONE_RUN) {

-            Location location = Platform.getInstallLocation();

-            if (location != null && StringUtils.isNotEmpty(location.getURL().getPath())) {

-                File tsRuntimeDir = new File(new File(location.getURL().getPath()),

-                        NewTigerstripeRuntime.TIGERSTRIPE_HOME_DIR);

-                if (!tsRuntimeDir.exists()) {

-                    if (!tsRuntimeDir.mkdirs())

-                        throw new TigerstripeException(

-                                "Failed to create Tigerstripe Runtime Directory at " + tsRuntimeDir.getAbsolutePath());

-                }

-                return tsRuntimeDir;

-            } 

+            return workbenchProfileSession;

         }

 

-        // This only happens in Standalone,

-        if (getTs_home() == null || getTs_home().length() == 0) {

-            // Let's get this from the env

-            setTs_home(System.getenv("TIGERSTRIPE_HOME"));

-        }

-        if (StringUtils.isEmpty(getTs_home())) {

-            throw new TigerstripeException(

-                    "When running in headless mode TIGERSTRIPE_HOME environment variable must be set.");

-        }

-        return new File(ts_home);

     }

-

-

-    private File getOrCreateTigerstripePluginDir() throws TigerstripeException {

-        if ( getRuntype() != NewTigerstripeRuntime.STANDALONE_RUN) {

-            File pluginsDir = new File(getOrCreateTigerstripeRuntimeDir(), NewTigerstripeRuntime.TIGERSTRIPE_PLUGINS_DIR);

-            if (!pluginsDir.exists())

-                if (!pluginsDir.mkdir())

-                    throw new TigerstripeException("Failed to create Tigerstripe Runtime Directory for plugins at "

-                            + pluginsDir.toURI().toString());

-            return pluginsDir;

-        }

-

-        // In standalone, there is no "plugins" dir.

-        return null;

-    }

-

-    private File getOrCreateTigerstripeModulesDir() throws TigerstripeException {

-        if ( getRuntype() != NewTigerstripeRuntime.STANDALONE_RUN) {

-            File modulesDir = new File(getOrCreateTigerstripeRuntimeDir(), NewTigerstripeRuntime.TIGERSTRIPE_MODULES_DIR);

-            if (!modulesDir.exists())

-                if (!modulesDir.mkdirs())

-                    throw new TigerstripeException("Failed to create Tigerstripe Runtime Directory for modules at "

-                            + modulesDir.toURI().toString());

-            return modulesDir;

-        }

-

-        // In standalone, there is no "modules" dir.

-        return null;

-    }

-    

-   

-    

-    public IPluginManager getPluginManager() {

-        if (pluginManager == null) {

-            pluginManager = new PluginManager(this);

-        }

-        return pluginManager;

-    }

-

-    public IInstalledModule getModule(String moduleId) {

-        if (classpathModuleManager == null) {

-            classpathModuleManager = new ClasspathModuleManager(this);

-        }

-        return classpathModuleManager.getModule(moduleId);

-    }

-    

-    

-    public IWorkbenchProfileBaseSession getWorkbenchProfileSession() {

-        if (workbenchProfileSession == null) {

-            workbenchProfileSession = new NewWorkbenchProfileSession(this);

-            workbenchProfileSession.reloadActiveProfile();

-        }

-

-        return workbenchProfileSession;

-    }

-    

-}

diff --git a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/profile/PhantomTigerstripeProject.java b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/profile/PhantomTigerstripeProject.java
index 3fc48d3..eab99df 100644
--- a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/profile/PhantomTigerstripeProject.java
+++ b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/profile/PhantomTigerstripeProject.java
@@ -93,7 +93,6 @@
         try {
             writer = new FileWriter(descriptor);
             write(writer);
-            System.out.println("CREATNG PHANTOM  - CREATNG DESCRIPTOR");
             reload(true); // not sure this is necessary
         } catch (IOException e) {
             runtime.logErrorMessage("IOException detected", e);
diff --git a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/profile/PhantomTigerstripeProjectMgr.java b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/profile/PhantomTigerstripeProjectMgr.java
index cf6d891..086a915 100644
--- a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/profile/PhantomTigerstripeProjectMgr.java
+++ b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/profile/PhantomTigerstripeProjectMgr.java
@@ -56,12 +56,10 @@
 	 */
 	protected void createPhantomProject() throws TigerstripeException {
 
-	    System.out.println("CREATNG PHANTOM  ");
 		URI phantomURI = getPhantomURI();
 		// first remove any existing stuff
 		File phantomDir = new File(phantomURI);
 		if (phantomDir.exists()) {
-		    System.out.println("CREATNG PHANTOM  - DELETING ");
 			FileUtils.deleteDir(phantomDir);
 		}
 		phantomDir.mkdirs();
diff --git a/core/org.eclipse.tigerstripe.core/src/main/resources/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm b/core/org.eclipse.tigerstripe.core/src/main/resources/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm
index 5bf5c2b..e891ab2 100644
--- a/core/org.eclipse.tigerstripe.core/src/main/resources/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm
+++ b/core/org.eclipse.tigerstripe.core/src/main/resources/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Created with Tigerstripe(tm) Workbench v.$runtime.getProperty("tigerstripe.feature.version")
- * Copyright (c) 2007 Cisco Systems, Inc.
+ * Copyright (c)  $runtime.getProperty("tigerstripe.runtime.year") Cisco Systems, Inc.
  * 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
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base.test/src/org/eclipse/tigerstripe/workbench/base/test/startup/TestStartup.java b/plugins/org.eclipse.tigerstripe.workbench.base.test/src/org/eclipse/tigerstripe/workbench/base/test/startup/TestStartup.java
index 81bfe54..f0d8f7e 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.base.test/src/org/eclipse/tigerstripe/workbench/base/test/startup/TestStartup.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.base.test/src/org/eclipse/tigerstripe/workbench/base/test/startup/TestStartup.java
@@ -18,7 +18,6 @@
 import org.eclipse.tigerstripe.workbench.TigerstripeCore;
 import org.eclipse.tigerstripe.workbench.internal.BasePlugin;
 import org.eclipse.tigerstripe.workbench.internal.core.TigerstripeRuntime;
-import org.eclipse.tigerstripe.workbench.internal.startup.BasePostInstallActions;
 
 import junit.framework.TestCase;
 
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/lib/tigerstripe-api-0.10.0-SNAPSHOT.jar b/plugins/org.eclipse.tigerstripe.workbench.base/lib/tigerstripe-api-0.10.0-SNAPSHOT.jar
index cce1743..8f0b8ea 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.base/lib/tigerstripe-api-0.10.0-SNAPSHOT.jar
+++ b/plugins/org.eclipse.tigerstripe.workbench.base/lib/tigerstripe-api-0.10.0-SNAPSHOT.jar
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/lib/tigerstripe-core-0.10.0-SNAPSHOT.jar b/plugins/org.eclipse.tigerstripe.workbench.base/lib/tigerstripe-core-0.10.0-SNAPSHOT.jar
index b958526..e5f739f 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.base/lib/tigerstripe-core-0.10.0-SNAPSHOT.jar
+++ b/plugins/org.eclipse.tigerstripe.workbench.base/lib/tigerstripe-core-0.10.0-SNAPSHOT.jar
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/BasePlugin.java b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/BasePlugin.java
index a5fa314..3214d05 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/BasePlugin.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/BasePlugin.java
@@ -26,7 +26,6 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.tigerstripe.workbench.TigerstripeCore;
 import org.eclipse.tigerstripe.workbench.TigerstripeException;
-import org.eclipse.tigerstripe.workbench.internal.api.ITigerstripeRuntime;
 import org.eclipse.tigerstripe.workbench.internal.api.rendering.IDiagramRenderer;
 import org.eclipse.tigerstripe.workbench.internal.api.rendering.IDiagramRenderingSession;
 import org.eclipse.tigerstripe.workbench.internal.builder.ProjectInfo;
@@ -34,7 +33,6 @@
 import org.eclipse.tigerstripe.workbench.internal.builder.natures.TigerstripeProjectNature;
 import org.eclipse.tigerstripe.workbench.internal.core.NewTigerstripeRuntime;
 import org.eclipse.tigerstripe.workbench.internal.core.TigerstripeRuntime;
-import org.eclipse.tigerstripe.workbench.internal.startup.BasePostInstallActions;
 import org.eclipse.tigerstripe.workbench.project.IAbstractTigerstripeProject;
 import org.eclipse.tigerstripe.workbench.project.ITigerstripeModelProject;
 import org.osgi.framework.Bundle;
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm
deleted file mode 100644
index 1ea9c19..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm
+++ /dev/null
@@ -1,27 +0,0 @@
-#foreach( $stereotype in $artifact.getStereotypeInstances() )
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
- * @tigerstripe.stereotype st.name = "$stereotype.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes())
-#if ( $stAttr.isArray() )
- *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
- *    $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
-## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
- *    $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/association.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/association.vm
deleted file mode 100644
index b5feb78..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/association.vm
+++ /dev/null
@@ -1,103 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.association
- *		isAbstract = "$artifact.isAbstract()"
- *
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#if($artifact.AEnd)
-	/**
- * $!artifact.AEnd.Comment
-	 *	@tigerstripe.association-aEnd
-	 *    aggregation = "$artifact.AEnd.Aggregation.Label"
-	 *    changeable = "$artifact.AEnd.Changeable.Label"
-	 *    multiplicity = "$artifact.AEnd.Multiplicity.Label"
-	 *    isOrdered = "$artifact.AEnd.isOrdered()"
-	 *    isUnique = "$artifact.AEnd.isUnique()"
-	 *    isNavigable = "$artifact.AEnd.isNavigable()"
-	 *
- *
-## Take care of the stereotypes
-#foreach( $stereotype in $artifact.AEnd.getStereotypeInstances() )
- * @tigerstripe.stereotype st.name = "$stereotype.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes() ) 
-#if ( $stAttr.isArray() )
- *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
- *     $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
- ## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
- *     $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
-     * 
-	 */	
-	$utils.getVisibilityAsString( $artifact.AEnd ) $artifact.AEnd.Type.FullyQualifiedName $artifact.AEnd.Name = null;
-#end
-
-#if ($artifact.ZEnd)	
-	/**
- * $!artifact.ZEnd.Comment
-	 *	@tigerstripe.association-zEnd
-	 *    aggregation = "$artifact.ZEnd.Aggregation.Label"
-	 *    changeable = "$artifact.ZEnd.Changeable.Label"
-	 *    multiplicity = "$artifact.ZEnd.Multiplicity.Label"
-	 *    isOrdered = "$artifact.ZEnd.isOrdered()"
-	 *    isUnique = "$artifact.ZEnd.isUnique()"
-	 *    isNavigable = "$artifact.ZEnd.isNavigable()"
-	 *
- *
-## Take care of the stereotypes
-#foreach( $stereotype in $artifact.ZEnd.getStereotypeInstances() )
- * @tigerstripe.stereotype st.name = "$stereotype.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes() ) 
-#if ( $stAttr.isArray() )
- *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
- *     $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
- ## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
- *     $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
- * 
-	 */	
-	$utils.getVisibilityAsString( $artifact.ZEnd ) $artifact.ZEnd.Type.FullyQualifiedName $artifact.ZEnd.Name = null;
-	
-#end
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/associationClass.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/associationClass.vm
deleted file mode 100644
index 62f2226..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/associationClass.vm
+++ /dev/null
@@ -1,109 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.associationClass
- *		isAbstract = "$artifact.isAbstract()"
- *		implements = "$artifact.getImplementedArtifactsAsStr()"
- *
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-
-#if ($artifact.AEnd)
-	/**
- * $!artifact.AEnd.Comment
-	 *	@tigerstripe.association-aEnd
-	 *    aggregation = "$artifact.AEnd.Aggregation.Label"
-	 *    changeable = "$artifact.AEnd.Changeable.Label"
-	 *    multiplicity = "$artifact.AEnd.Multiplicity.Label"
-	 *    isOrdered = "$artifact.AEnd.isOrdered()"
-	 *    isUnique = "$artifact.AEnd.isUnique()"
-	 *    isNavigable = "$artifact.AEnd.isNavigable()"
-	 *
-	## Take care of the stereotypes
-#foreach( $stereotype in $artifact.AEnd.getStereotypeInstances() )
-  * @tigerstripe.stereotype st.name = "$stereotype.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes() ) 
-#if ( $stAttr.isArray() )
- *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
- *     $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
- ## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
- *     $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
- * 
-	 */	
-	$utils.getVisibilityAsString( $artifact.AEnd ) $artifact.AEnd.Type.FullyQualifiedName $artifact.AEnd.Name = null;
-
-#end
-
-#if($artifact.ZEnd)
-	
-	/**
- * $!artifact.ZEnd.Comment
-	 *	@tigerstripe.association-zEnd
-	 *    aggregation = "$artifact.ZEnd.Aggregation.Label"
-	 *    changeable = "$artifact.ZEnd.Changeable.Label"
-	 *    multiplicity = "$artifact.ZEnd.Multiplicity.Label"
-	 *    isOrdered = "$artifact.ZEnd.isOrdered()"
-	 *    isUnique = "$artifact.ZEnd.isUnique()"
-	 *    isNavigable = "$artifact.ZEnd.isNavigable()"
-	 *
- *
-## Take care of the stereotypes
-#foreach( $stereotype in $artifact.ZEnd.getStereotypeInstances() )
-  * @tigerstripe.stereotype st.name = "$stereotype.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes() ) 
-#if ( $stAttr.isArray() )
- *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
- *     $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
- ## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
- *     $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
- * 
-	 */	
-	$utils.getVisibilityAsString( $artifact.ZEnd ) $artifact.ZEnd.Type.FullyQualifiedName $artifact.ZEnd.Name = null;
-
-#end
-	
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm")
-	
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/method.vm")
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/datatype.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/datatype.vm
deleted file mode 100644
index fbd3335..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/datatype.vm
+++ /dev/null
@@ -1,43 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.datatype
- *		isAbstract = "$artifact.isAbstract()"
- *		implements = "$artifact.getImplementedArtifactsAsStr()"
-#if($includeOssj)
- *      isSingleExtensionType="$artifact.IStandardSpecifics.isSingleExtensionType()"
- *      isSessionFactoryMethods="$artifact.IStandardSpecifics.isSessionFactoryMethods()"
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- #end
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/method.vm")
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/dependency.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/dependency.vm
deleted file mode 100644
index 22de1c2..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/dependency.vm
+++ /dev/null
@@ -1,45 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.dependency
- *		isAbstract = "$artifact.isAbstract()"
- *
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-	/**
-	 *	@tigerstripe.dependency-aEnd
-     *    type = "$artifact.AEndType.FullyQualifiedName"
-	 */	
-	public String _aEnd = null;
-	
-	/**
-	 *	@tigerstripe.dependency-zEnd
-     *    type = "$artifact.ZEndType.FullyQualifiedName"
-	 */	
-	public String _zEnd = null;
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/enum.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/enum.vm
deleted file mode 100644
index 4b206e3..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/enum.vm
+++ /dev/null
@@ -1,38 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.enum
- *		isAbstract = "$artifact.isAbstract()"
- *      base-type="$artifact.IStandardSpecifics.BaseIType.FullyQualifiedName"
-#if($includeOssj)
- *      extensible="$artifact.IStandardSpecifics.Extensible"
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
-#end
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm")
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/exception.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/exception.vm
deleted file mode 100644
index 30a30c3..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/exception.vm
+++ /dev/null
@@ -1,44 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.exception
- *		isAbstract = "$artifact.isAbstract()"
- *		implements = "$artifact.getImplementedArtifactsAsStr()"
-#if($includeOssj)
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
-#end
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#else
-  extends java.lang.Exception
-#end {
-	
-	// not important since this class will never be serialized.
-	private static final long serialVersionUID = -1L;
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm")
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/managedEntity.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/managedEntity.vm
deleted file mode 100644
index 077b0c1..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/managedEntity.vm
+++ /dev/null
@@ -1,79 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.managedEntity 
- *		isAbstract = "$artifact.isAbstract()"
- *		implements = "$artifact.getImplementedArtifactsAsStr()"
-#if($includeOssj)
- *      primary-key="$artifact.IStandardSpecifics.PrimaryKey"
- *      extensibilityType="$artifact.IStandardSpecifics.ExtensibilityType"
- *      isSessionFactoryMethods="$artifact.IStandardSpecifics.isSessionFactoryMethods()"
- * @tigerstripe.key-interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * @tigerstripe.value package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.create"
-#foreach( $key in $artifact.getCreateProperties().keySet())
- *   $key = "$artifact.getCreateProperties().getProperty($key)"
-#end
- *
- * @tigerstripe.property ts.id="ossj.entity.get"
-#foreach( $key in $artifact.getGetProperties().keySet())
- *   $key = "$artifact.getGetProperties().getProperty($key)"
-#end
- *
- * @tigerstripe.property ts.id="ossj.entity.set"
-#foreach( $key in $artifact.getSetProperties().keySet())
- *   $key = "$artifact.getSetProperties().getProperty($key)"
-#end
- *
- * @tigerstripe.property ts.id="ossj.entity.remove"
-#foreach( $key in $artifact.getRemoveProperties().keySet())
- *   $key = "$artifact.getRemoveProperties().getProperty($key)"
-#end
- *
-#end
-## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-#foreach($labelRef in $wizard.get("constantList"))
-    /**
-     * @tigerstripe.label
-     *  value = '$labelRef.Value'
-     *  
-     * @uml.property name="$labelRef.Name" multiplicity="(0 1)"
-     * 
-     */
-    public final static $labelRef.getLabelClass() $labelRef.Name = $labelRef.Value;
-
-#end
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/method.vm")
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/notification.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/notification.vm
deleted file mode 100644
index 4e76d8e..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/notification.vm
+++ /dev/null
@@ -1,48 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.event
- *		isAbstract = "$artifact.isAbstract()"
- *		implements = "$artifact.getImplementedArtifactsAsStr()"
- *
-#if($includeOssj)
- *      isSingleExtensionType="$artifact.IStandardSpecifics.isSingleExtensionType()"
-#foreach( $evDesc in $artifact.IStandardSpecifics.EventDescriptorEntries )
- * @tigerstripe.event-descriptor label = "$evDesc.Label" type = "$evDesc.PrimitiveType"
-#end
-#foreach( $evDesc in $artifact.IStandardSpecifics.CustomEventDescriptorEntries )
- * @tigerstripe.customEvent-descriptor label = "$evDesc.Label" type = "$evDesc.PrimitiveType"
-#end
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
-#end
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm")
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/package.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/package.vm
deleted file mode 100644
index 7d515e7..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/package.vm
+++ /dev/null
@@ -1,38 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.package
- *		isAbstract = "$artifact.isAbstract()"
- *		implements = "$artifact.getImplementedArtifactsAsStr()"
-#if($includeOssj)
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
-#end
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-	
-	// not important since this class will never be serialized.
-	private static final long serialVersionUID = -1L;
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/primitive.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/primitive.vm
deleted file mode 100644
index ec027b8..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/primitive.vm
+++ /dev/null
@@ -1,33 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.primitive
- *		isAbstract = "$artifact.isAbstract()"
- *
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/query.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/query.vm
deleted file mode 100644
index c834f28..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/query.vm
+++ /dev/null
@@ -1,44 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.query
- *		return = "$!artifact.ReturnedEntityType.FullyQualifiedName"
- *		isAbstract = "$artifact.isAbstract()"
- *		implements = "$artifact.getImplementedArtifactsAsStr()"
-#if($includeOssj)
- *      isSingleExtensionType="$artifact.IStandardSpecifics.isSingleExtensionType()"
- *      isSessionFactoryMethods="$artifact.IStandardSpecifics.isSessionFactoryMethods()"
- *
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
-#end
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm")
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/session.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/session.vm
deleted file mode 100644
index 28e17d3..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/session.vm
+++ /dev/null
@@ -1,66 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.sessionFacade
- *		isAbstract = "$artifact.isAbstract()"
- *		implements = "$artifact.getImplementedArtifactsAsStr()"
-#if($includeOssj)
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
-#end
- *
-#foreach($entity in $artifact.ManagedEntityDetails)
- *	@tigerstripe.managed-entity
- *		managedEntity = "$entity.FullyQualifiedName"
- *		include-descendants = "true"
- *
- *  $entity.Overide.toPojo()
-#end
- *
-#foreach($query in $artifact.NamedQueries)
- *	@tigerstripe.named-query
- *		query = "$query.FullyQualifiedName"
- *
-#end
- *
-#foreach($proc in $artifact.ExposedUpdateProcedures)
- *	@tigerstripe.exposed-updateProcedure
- *		procedure = "$proc.FullyQualifiedName"
- *
-#end
- *
-#foreach($event in $artifact.EmittedEvents)
- *	@tigerstripe.emitted-event
- *		event = "$event.FullyQualifiedName"
- *
-#end
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public abstract class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/method.vm")
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/updateProcedure.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/updateProcedure.vm
deleted file mode 100644
index c7a32b0..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/updateProcedure.vm
+++ /dev/null
@@ -1,42 +0,0 @@
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm")
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-/**
- * $xmlEncode.encode($artifact.Comment)
- *
- * @tigerstripe.updateProcedure
- *		isAbstract = "$artifact.isAbstract()"
- *		implements = "$artifact.getImplementedArtifactsAsStr()"
-#if($includeOssj)
- *      isSingleExtensionType="$artifact.IStandardSpecifics.isSingleExtensionType()"
- *      isSessionFactoryMethods="$artifact.IStandardSpecifics.isSessionFactoryMethods()"
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
-#end
- *## Take care of the stereotypes
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/artifacts/artifactLevelStereotype.vm")
- * 
-#foreach( $tag in $artifact.NonTigerstripeTags )
- * $tag
-#end
- */
-public class $artifact.Name
-#if( $artifact.hasExtends() )
-  extends $artifact.Extends.FullyQualifiedName
-#end {
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm")
-
-#parse("org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm")
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm
deleted file mode 100644
index c616e69..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/constant.vm
+++ /dev/null
@@ -1,43 +0,0 @@
-#foreach($literal in $artifact.Literals)
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-    /**
-     * $xmlEncode.encode($literal.Comment)
-     * @tigerstripe.label
-     *  value = '$literal.Value'
-     *  
-     *
-## Take care of the stereotypes
-#foreach( $stereotype in $literal.getStereotypeInstances() )
-     * @tigerstripe.stereotype st.name = "$stereotype.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes() ) 
-#if ( $stAttr.isArray() )
-     *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
-     *     $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
-## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
-     *     $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
-     * 
-#foreach( $tag in $literal.NonTigerstripeTags )
-     * $tag
-#end
-     */
-    $utils.getVisibilityAsString( $literal ) final static $literal.Type.FullyQualifiedName $literal.Name = $literal.Value;
-
-#end
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm
deleted file mode 100644
index afd7a2e..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/field.vm
+++ /dev/null
@@ -1,55 +0,0 @@
-#foreach($field in $artifact.Fields)
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-    /**
-     * $xmlEncode.encode($field.Comment)
-     * @tigerstripe.field 
-     *  isOptional = "$field.isOptional()"
-     *  isReadOnly = "$field.isReadOnly()"
-     *  isOrdered = "$field.isOrdered()"
-     *  isUnique = "$field.isUnique()"
-     *  typeMultiplicity = "$field.Type.TypeMultiplicity.Label"
-#if ($field.hasDefaultValue() )     *  defaultValue = "$xmlEncode.encode($field.DefaultValue)" 
-#end
-#if( $field.RefBy != -1)     *   ref-by = "$field.RefByString"
-#end
-     *
-     *
-## Take care of the stereotypes
-#foreach( $stereotype in $field.getStereotypeInstances() )
-     * @tigerstripe.stereotype st.name = "$stereotype.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes() ) 
-#if ( $stAttr.isArray() )
-     *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
-     *     $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
-## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
-     *     $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
-     * 
-#foreach( $tag in $field.NonTigerstripeTags )
-     * $tag
-#end
-     */
-#set ($dimensions = "")
-#if ($field.Type.TypeMultiplicity.isArray())
-#set ($dimensions = "[]")
-#end
-	$utils.getVisibilityAsString( $field ) $field.Type.FullyQualifiedName$dimensions $field.Name;
-
-#end
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm
deleted file mode 100644
index 5bf5c2b..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/header.vm
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.$runtime.getProperty("tigerstripe.feature.version")
- * Copyright (c) 2007 Cisco Systems, Inc.
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-#if ($artifact.Package != "")
-package $artifact.Package;
-#end
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/method.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/method.vm
deleted file mode 100644
index ec76a05..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/method.vm
+++ /dev/null
@@ -1,130 +0,0 @@
-#foreach($method in $artifact.Methods)
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-    /**
-     * $xmlEncode.encode($method.Comment)
-     * @tigerstripe.method 
-     *  iteratorReturn = "$method.isIteratorReturn()"
-     *  isOptional = "$method.isOptional()"
-	 *  isAbstract = "$method.isAbstract()"
-     *  isOrdered = "$method.isOrdered()"
-     *  isUnique = "$method.isUnique()"
-     *  typeMultiplicity = "$method.ReturnType.TypeMultiplicity.Label"
-     *  returnName = "$method.ReturnName"
-     *  visibility = "$utils.getVisibilityAsString( $method )"
-#if ($method.hasDefaultReturnValue())     *  defaultReturnValue = "$xmlEncode.encode($method.DefaultReturnValue)" 
-#end
-#foreach( $argument in $method.Arguments )
-     *   @tigerstripe.method-arg 
-	 *     name="$argument.Name" 
-     *     isOrdered = "$argument.isOrdered()"
-     *     isUnique = "$argument.isUnique()"
-     *     typeMultiplicity = "$argument.Type.TypeMultiplicity.Label"
-## Added Direction
-     *     direction = "$argument.Direction.Label"
-#if ($argument.hasDefaultValue())     *       defaultValue = "$xmlEncode.encode($argument.DefaultValue)" 
-#end
-	 *     ref-by = "$argument.RefByString" 
-#if ($argument.RefCommentId != "")	 *   refComment="$argument.RefCommentId" 
-#end
-## Take care of the argument stereotypes (since 2.2.1)
-#foreach( $stereotype in $argument.getStereotypeInstances() )
-     *   @tigerstripe.arg-stereotype st.name = "$stereotype.Name" st.arg.name = "$argument.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes() ) 
-#if ( $stAttr.isArray() )
-     *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
-     *     $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
-## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
-     *     $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
-     
-#end
-     *
-## Take care of the stereotypes
-#foreach( $stereotype in $method.getStereotypeInstances() )
-     * @tigerstripe.stereotype st.name = "$stereotype.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes() ) 
-#if ( $stAttr.isArray() )
-     *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
-     *     $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
-## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
-     *     $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
-## Take care of the stereotypes on the return (since 2.2.1)
-#foreach( $stereotype in $method.getReturnStereotypeInstances() )
-     * @tigerstripe.ret-stereotype st.name = "$stereotype.Name"
-#if ($stereotype.getCharacterizingStereotype())
-#foreach( $stAttr in $stereotype.getCharacterizingStereotype().getAttributes() ) 
-#if ( $stAttr.isArray() )
-     *	   $stAttr.Name = "$stereotype.getStringifiedAttributeValues($stAttr)"	
-	#else
-     *     $stAttr.Name = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#else
-## This is an Unresolved stereotype - so just use what we found
-#foreach( $stAttr in $stereotype.Attributes )
-     *     $stAttr = "$xmlEncode.encode($stereotype.getAttributeValue($stAttr))"
-#end
-#end
-#end
-#if($includeOssj)
-     * 
-     * @tigerstripe.property ts.id = "ossj.method"
-#foreach( $key in $method.getOssjMethodProperties().keySet() )
-     *   $key = "$method.getOssjMethodProperties().getProperty( $key )"
-#end
-#end
-     *
-#foreach( $tag in $method.NonTigerstripeTags )
-     * $tag
-#end
-     */
-	public abstract $utils.getReturnType($method) ${method.Name}(
-	#set( $firstPass = "true" )
-	#foreach( $argument in $method.Arguments)
-		#if ( $firstPass == "false" )
-		, 
-		#end
-		$argument.getSignature()
-		
-		#set( $firstPass = "false" )
-	#end
-	)
-	#if ( $method.hasExceptions() )
-	  throws 
-	  #set( $firstException = "true" )
-	  #foreach( $exception in $method.Exceptions )
-	    #if ( $firstException == "false" )
-	    ,
-	    #end
-	    $exception.FullyQualifiedName
-	    #set( $firstException = "false" )
-	  #end
-	#end
-	;
-#end
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm b/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm
deleted file mode 100644
index 5c591c5..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.base/src/java/org/eclipse/tigerstripe/workbench/internal/core/model/persist/resources/refComments.vm
+++ /dev/null
@@ -1,21 +0,0 @@
-#foreach($refComment in $artifact.RefComments)
-#*
-  Copyright (c) 2007 Cisco Systems, Inc.
-  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:
-      E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-*#
-
-#if ( $refComment.Label != "" )
- /**
- * $xmlEncode.encode($refComment.Content)
- * @tigerstripe.refComment
- *  
-	 */
-	 public static String $refComment.Label = "$refComment.Label";
-#end
-#end