[jboss-cvs] JBossAS SVN: r73042 - in projects/demos/osgi: bootstrap/src/org/jboss/system/classloader and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun May 4 18:03:43 EDT 2008


Author: alesj
Date: 2008-05-04 18:03:42 -0400 (Sun, 04 May 2008)
New Revision: 73042

Removed:
   projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java
Modified:
   projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java
   projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java
   projects/demos/osgi/osgi.iws
Log:
Remove unneccessary code.

Modified: projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java	2008-05-04 21:40:11 UTC (rev 73041)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java	2008-05-04 22:03:42 UTC (rev 73042)
@@ -28,20 +28,17 @@
 import java.security.Policy;
 import java.security.ProtectionDomain;
 import java.security.cert.Certificate;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.Manifest;
 
-import org.jboss.classloader.plugins.ClassLoaderUtils;
 import org.jboss.classloader.plugins.filter.PatternClassFilter;
 import org.jboss.classloader.spi.ClassLoaderPolicy;
 import org.jboss.classloader.spi.DelegateLoader;
 import org.jboss.classloader.spi.PackageInformation;
 import org.jboss.classloader.spi.filter.ClassFilter;
-import org.jboss.classloading.spi.metadata.ExportAll;
 import org.jboss.logging.Logger;
 import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.VirtualFile;
@@ -51,28 +48,34 @@
  */
 public class MockClassLoaderPolicy extends ClassLoaderPolicy
 {
-   /** The log */
+   /**
+    * The log
+    */
    private static Logger log = Logger.getLogger(MockClassLoaderPolicy.class);
 
-   /** Tag for no manifest */
+   /**
+    * Tag for no manifest
+    */
    private static final Manifest NO_MANIFEST = new Manifest();
 
-   /** The logical name of the policy */
+   /**
+    * The logical name of the policy
+    */
    private String name;
 
-   /** The delegates */
+   /**
+    * The delegates
+    */
    private List<? extends DelegateLoader> delegates;
 
-   /** The paths */
-   private String[] paths;
-
-   /** The exported package names */
-   private String[] packageNames;
-
-   /** Whether to import all */
+   /**
+    * Whether to import all
+    */
    private boolean importAll;
 
-   /** The non JDK classes filter */
+   /**
+    * The non JDK classes filter
+    */
    private ClassFilter nonJDKFilter;
 
    /**
@@ -80,7 +83,9 @@
     */
    private VirtualFile root;
 
-   /** Manifest cache */
+   /**
+    * Manifest cache
+    */
    private Map<URL, Manifest> manifestCache = new ConcurrentHashMap<URL, Manifest>();
 
    /**
@@ -99,18 +104,18 @@
     */
    public MockClassLoaderPolicy(String name)
    {
-      this(name, new String[] { "org\\.jboss\\..+" },
-                 new String[] { "org/jboss/.+" },
-                 new String[] { "org\\.jboss", "org\\.jboss\\..*" });
+      this(name, new String[]{"org\\.jboss\\..+"},
+            new String[]{"org/jboss/.+"},
+            new String[]{"org\\.jboss", "org\\.jboss\\..*"});
    }
 
    /**
     * Create a new MockClassLoaderPolicy filtering org.jboss.* classes
     *
-    * @param name the name
-    * @param classPatterns the class patterns
+    * @param name             the name
+    * @param classPatterns    the class patterns
     * @param resourcePatterns the resourcePatterns
-    * @param packagePatterns the packagePatterns
+    * @param packagePatterns  the packagePatterns
     */
    public MockClassLoaderPolicy(String name, String[] classPatterns, String[] resourcePatterns, String[] packagePatterns)
    {
@@ -120,7 +125,7 @@
    /**
     * Create a new MockClassLoaderPolicy filtering the given patterns
     *
-    * @param name the logical name of the policy
+    * @param name         the logical name of the policy
     * @param nonJDKFilter the filter for nonJDK classes
     * @throws IllegalArgumentException for a null filter
     */
@@ -160,118 +165,7 @@
       this.delegates = delegates;
    }
 
-   /**
-    * Get the paths to expose
-    *
-    * @return the paths
-    */
-   public String[] getPaths()
-   {
-      return paths;
-   }
-
-   /**
-    * Set the path to expose
-    *
-    * @param path the path
-    */
-   public void setPath(String path)
-   {
-      setPaths(path);
-   }
-
-   /**
-    * Set the paths to expose
-    *
-    * @param paths the paths to expose
-    */
-   public void setPaths(String... paths)
-   {
-      this.paths = paths;
-   }
-
-   /**
-    * Set the paths to expose
-    *
-    * @param classes the classes to reference to determine the package paths
-    */
-   public void setPaths(Class<?>... classes)
-   {
-      if (classes == null)
-      {
-         paths = null;
-         return;
-      }
-      paths = new String[classes.length];
-      for (int i = 0; i < classes.length; ++i)
-         paths[i] = ClassLoaderUtils.packageNameToPath(classes[i].getName());
-   }
-
    @Override
-   public String[] getPackageNames()
-   {
-      return packageNames;
-   }
-
-   /**
-    * Set the exported package names
-    *
-    * @param packageNames the exported packages
-    */
-   public void setPackageNames(String... packageNames)
-   {
-      this.packageNames = packageNames;
-   }
-
-   /**
-    * Set the exported package names
-    *
-    * @param classes the classes to reference to determine the package names
-    */
-   public void setPackageNames(Class<?>... classes)
-   {
-      if (classes == null)
-      {
-         packageNames = null;
-         return;
-      }
-      packageNames = new String[classes.length];
-      for (int i = 0; i < classes.length; ++i)
-         packageNames[i] = ClassLoaderUtils.getClassPackageName(classes[i].getName());
-   }
-
-   /**
-    * Set the paths and the exported package names
-    *
-    * @param classes the classes to reference
-    */
-   public void setPathsAndPackageNames(Class<?>... classes)
-   {
-      setPaths(classes);
-      setPackageNames(classes);
-   }
-
-   /**
-    * Set the paths and the exported package names
-    *
-    * @param packages the packages
-    */
-   public void setPathsAndPackageNames(String... packages)
-   {
-      if (packages == null)
-      {
-         paths = null;
-         packageNames = null;
-         return;
-      }
-      paths = new String[packages.length];
-      for (int i = 0; i < packages.length; ++i)
-         paths[i] = packages[i].replace('.', '/');
-
-      setPackageNames(packages);
-   }
-
-   @Override
    public boolean isImportAll()
    {
       return importAll;
@@ -347,18 +241,9 @@
    @Override
    public void getResources(String path, Set<URL> urls) throws IOException
    {
-      if (paths == null)
-         return;
-
-      for (int i = 0; i < paths.length; ++i)
-      {
-         if (path.startsWith(paths[i]))
-         {
-            URL url = findFileURL(path);
-            if (url != null)
-               urls.add(url);
-         }
-      }
+      URL url = findFileURL(path);
+      if (url != null)
+         urls.add(url);
    }
 
    @Override
@@ -389,7 +274,7 @@
          catch (Exception ignored)
          {
             if (log.isTraceEnabled())
-               log.trace("Unable to retrieve manifest for " + path + " url=" + rootURL + " error="  + ignored.getMessage());
+               log.trace("Unable to retrieve manifest for " + path + " url=" + rootURL + " error=" + ignored.getMessage());
          }
       }
       return new PackageInformation(packageName, manifest);
@@ -419,27 +304,6 @@
       }
    }
 
-   /**
-    * Determine all the packages
-    *
-    * @return the packages
-    * @throws IllegalArgumentException if there is no exportAll policy
-    */
-   protected Set<String> determineAllPackages()
-   {
-      PackageVisitor visitor = new PackageVisitor(ExportAll.NON_EMPTY);
-      try
-      {
-         visitor.setRoot(root);
-         root.visit(visitor);
-      }
-      catch (Exception e)
-      {
-         throw new Error("Error visiting " + root, e);
-      }
-      return visitor.getPackages();
-   }
-
    /*
     * Overridden to not expose classes in the nonJDKFilter
     * this is so we don't expose classes from the classpath
@@ -457,8 +321,7 @@
    public void toLongString(StringBuilder builder)
    {
       builder.append(" name=").append(name);
-      if (paths != null)
-         builder.append(" paths=").append(Arrays.asList(paths));
+      builder.append(" root=").append(root);
       super.toLongString(builder);
    }
 

Deleted: projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java	2008-05-04 21:40:11 UTC (rev 73041)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java	2008-05-04 22:03:42 UTC (rev 73042)
@@ -1,178 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.system.classloader;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.jboss.classloading.spi.metadata.ExportAll;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileVisitor;
-import org.jboss.virtual.VisitorAttributes;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-class PackageVisitor implements VirtualFileVisitor
-{
-   /** The packages */
-   private Set<String> packages = new HashSet<String>();
-
-   /** The root */
-   private String rootPath;
-
-   /** The root with slash*/
-   private String rootPathWithSlash;
-
-   /** The exportAll policy */
-   private ExportAll exportAll;
-
-   /** The excluded packages */
-   private Set<String> excludedPackages;
-
-   /**
-    * Create a new PackageVisitor.
-    *
-    * @param exportAll the export all policy
-    * @throws IllegalArgumentException for a null exportAll policy
-    */
-   public PackageVisitor(ExportAll exportAll)
-   {
-      this(exportAll, null);
-   }
-
-   /**
-    * Create a new PackageVisitor.
-    *
-    * @param exportAll the export all policy
-    * @param excludedPackages the excluded packages
-    * @throws IllegalArgumentException for a null exportAll policy
-    */
-   public PackageVisitor(ExportAll exportAll, Set<String> excludedPackages)
-   {
-      if (exportAll == null)
-         throw new IllegalArgumentException("Null exportAll policy");
-      this.exportAll = exportAll;
-      this.excludedPackages = excludedPackages;
-   }
-
-   /**
-    * Set the root
-    *
-    * @param root the root
-    * @throws IllegalArgumentException for a null root
-    */
-   public void setRoot(VirtualFile root)
-   {
-      if (root == null)
-         throw new IllegalArgumentException("Null root");
-      rootPath = root.getPathName();
-      rootPathWithSlash = rootPath + "/";
-   }
-
-   /**
-    * Get the packages.
-    *
-    * @return the packages.
-    */
-   public Set<String> getPackages()
-   {
-      return packages;
-   }
-
-   public VisitorAttributes getAttributes()
-   {
-      VisitorAttributes attributes = new VisitorAttributes();
-      attributes.setIncludeRoot(true);
-      attributes.setRecurseFilter(VisitorAttributes.RECURSE_ALL);
-      return attributes;
-   }
-
-   public void visit(VirtualFile file)
-   {
-      try
-      {
-         // We only want only directories
-         if (file.isLeaf() == false)
-         {
-            boolean empty = true;
-            // Include empty directories?
-            if (exportAll == ExportAll.ALL)
-               empty = false;
-            else
-            {
-               // Determine whether there is anything there
-               List<VirtualFile> children = file.getChildren();
-               if (children != null && children.isEmpty() == false)
-               {
-                  for (VirtualFile child : children)
-                  {
-                     // We must have a leaf to be non-empty
-                     if (child.isLeaf())
-                     {
-                        empty = false;
-                        break;
-                     }
-                  }
-               }
-            }
-            // This looks interesting
-            if (empty == false)
-            {
-               String path = file.getPathName();
-               if (path.equals(rootPath))
-                  path = "";
-               else if (path.startsWith(rootPathWithSlash))
-                  path = path.substring(rootPathWithSlash.length());
-               String pkg = path.replace('/', '.');
-               // Check for excluded package prefixes
-               if(excludedPackages != null)
-               {
-                  // Look at each package up to the root
-                  String prefix = pkg;
-                  while(prefix.length() >= 0)
-                  {
-                     if(excludedPackages.contains(prefix))
-                     {
-                        pkg = null;
-                        break;
-                     }
-                     int dot = prefix.lastIndexOf('.');
-                     if(dot > 0)
-                        prefix = prefix.substring(0, dot);
-                     else
-                        break;
-                  }
-               }
-               if(pkg != null)
-                  packages.add(pkg);
-            }
-         }
-      }
-      catch (IOException e)
-      {
-         throw new Error("Error visiting " + file, e);
-      }
-   }
-}
\ No newline at end of file

Modified: projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java	2008-05-04 21:40:11 UTC (rev 73041)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java	2008-05-04 22:03:42 UTC (rev 73042)
@@ -36,8 +36,8 @@
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.system.classloader.CapabilityFilter;
 import org.jboss.system.classloader.MockClassLoaderPolicy;
-import org.jboss.system.classloader.CapabilityFilter;
 
 /**
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -46,6 +46,9 @@
 {
    protected ClassLoaderPolicyModule createModule(final DeploymentUnit unit, ClassLoadingMetaData metaData) throws DeploymentException
    {
+      if (unit instanceof VFSDeploymentUnit == false)
+         throw new IllegalArgumentException("Can only take VFS deployments: " + unit);
+
       return new AbstractDeploymentClassLoaderPolicyModule(unit)
       {
          protected ClassLoaderPolicy determinePolicy()

Modified: projects/demos/osgi/osgi.iws
===================================================================
--- projects/demos/osgi/osgi.iws	2008-05-04 21:40:11 UTC (rev 73041)
+++ projects/demos/osgi/osgi.iws	2008-05-04 22:03:42 UTC (rev 73042)
@@ -48,21 +48,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/acme2/acme2.iml" afterPath="$PROJECT_DIR$/acme2/acme2.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/foo/src/META-INF/foo-clmd.properties" afterPath="$PROJECT_DIR$/foo/src/META-INF/foo-clmd.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java" />
-      <change type="DELETED" beforePath="C:\projects\demos\osgi\bootstrap\src\org\jboss\system\deployers\MockTopLevelClassLoaderSystemDeployer.java" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/foo/foo.iml" afterPath="$PROJECT_DIR$/foo/foo.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/bootstrap.iml" afterPath="$PROJECT_DIR$/bootstrap/bootstrap.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/resources/bootstrap-beans.xml" afterPath="$PROJECT_DIR$/bootstrap/resources/bootstrap-beans.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/osgi.ipr" afterPath="$PROJECT_DIR$/osgi.ipr" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/acme1/acme1.iml" afterPath="$PROJECT_DIR$/acme1/acme1.iml" />
-      <change type="MOVED" beforePath="C:\projects\demos\osgi\bootstrap\src\org\jboss\system\deployers\ClassloadingDeployer.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java" />
+      <change type="DELETED" beforePath="C:\projects\demos\osgi\bootstrap\src\org\jboss\system\classloader\PackageVisitor.java" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/osgi.iws" afterPath="$PROJECT_DIR$/osgi.iws" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/acme1/src/META-INF/acme-clmd.properties" afterPath="$PROJECT_DIR$/acme1/src/META-INF/acme-clmd.properties" />
     </list>
   </component>
   <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
@@ -183,7 +172,7 @@
       <file leaf-file-name="ClassloadingDescribeDeployer.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="67" column="99" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.76152307">
+            <state line="57" column="0" selection-start="2729" selection-end="2729" vertical-scroll-proportion="0.6132265">
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -191,6 +180,44 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="MockClassLoaderPolicy.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="326" column="0" selection-start="8421" selection-end="8421" vertical-scroll-proportion="4.3947897">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ClassLoaderPolicy.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/ClassLoaderPolicy.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="83" column="28" selection-start="2920" selection-end="2920" vertical-scroll-proportion="0.749499">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="VFSClassLoaderPolicy.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading-vfs/2.0.0.Beta12/jboss-classloading-vfs-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="311" column="19" selection-start="7685" selection-end="7685" vertical-scroll-proportion="0.33266532">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="LazyFilteredDelegateLoader.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/filter/LazyFilteredDelegateLoader.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="48" column="45" selection-start="1810" selection-end="1810" vertical-scroll-proportion="0.45991984">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="PropertyClassloaderMetaDataDeployer.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -1188,7 +1215,7 @@
     <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
     <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove unneccessary code." />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
@@ -1199,6 +1226,8 @@
     <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+    <MESSAGE value="Fixed demo, to work against current MC code." />
+    <MESSAGE value="Remove unneccessary code." />
   </component>
   <component name="VssConfiguration">
     <option name="CLIENT_PATH" value="" />
@@ -1253,118 +1282,113 @@
     <option name="myLastEditedConfigurable" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/ClassLoaderPolicy.java">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/Module.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="62" column="25" selection-start="2303" selection-end="2303" vertical-scroll-proportion="0.33266532">
+        <state line="206" column="22" selection-start="5539" selection-end="5539" vertical-scroll-proportion="0.33867735">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/helpers/ClassLoadingMetaDataModule.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="141" column="0" selection-start="4466" selection-end="4466" vertical-scroll-proportion="0.6983968">
+        <state line="44" column="21" selection-start="1767" selection-end="1767" vertical-scroll-proportion="0.28957915">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bootstrap/resources/bootstrap-beans.xml">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/metadata/ClassLoadingMetaData.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="156" column="90" selection-start="7680" selection-end="7680" vertical-scroll-proportion="0.52200615">
+        <state line="42" column="13" selection-start="1880" selection-end="1880" vertical-scroll-proportion="0.20440882">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/filter/FilteredDelegateLoader.java">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/metadata/Capability.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="42" column="0" selection-start="1569" selection-end="1569" vertical-scroll-proportion="0.017034069">
+        <state line="33" column="0" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.18737476">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/policy/ClassLoaderPolicyModule.java">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/filter/ClassFilter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="138" column="0" selection-start="5017" selection-end="5017" vertical-scroll-proportion="0.2254509">
+        <state line="34" column="17" selection-start="1472" selection-end="1472" vertical-scroll-proportion="0.18737476">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/Module.java">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/plugins/metadata/PackageCapability.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="206" column="22" selection-start="5539" selection-end="5539" vertical-scroll-proportion="0.33867735">
+        <state line="82" column="22" selection-start="2702" selection-end="2702" vertical-scroll-proportion="0.66032064">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-vfs/2.0.0.Beta15/jboss-deployers-vfs-2.0.0.Beta15-sources.jar!/org/jboss/deployers/vfs/plugins/classloader/VFSDeploymentClassLoaderPolicyModule.java">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/plugins/ClassLoaderUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="136" column="40" selection-start="4677" selection-end="4677" vertical-scroll-proportion="0.49398798">
+        <state line="127" column="30" selection-start="3967" selection-end="3967" vertical-scroll-proportion="0.33266532">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/helpers/ClassLoadingMetaDataModule.java">
+    <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="44" column="21" selection-start="1767" selection-end="1767" vertical-scroll-proportion="0.28957915">
-          <folding />
+        <state line="39" column="6" selection-start="1583" selection-end="1583" vertical-scroll-proportion="0.3236473">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/metadata/ClassLoadingMetaData.java">
+    <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="42" column="13" selection-start="1880" selection-end="1880" vertical-scroll-proportion="0.20440882">
-          <folding />
+        <state line="66" column="58" selection-start="2718" selection-end="2718" vertical-scroll-proportion="0.4308617">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/metadata/Capability.java">
+    <entry file="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-vfs/2.0.0.Beta15/jboss-deployers-vfs-2.0.0.Beta15-sources.jar!/org/jboss/deployers/vfs/plugins/classloader/VFSDeploymentClassLoaderPolicyModule.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="0" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.18737476">
+        <state line="136" column="40" selection-start="4677" selection-end="4677" vertical-scroll-proportion="0.49398798">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/filter/ClassFilter.java">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading-vfs/2.0.0.Beta12/jboss-classloading-vfs-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="34" column="17" selection-start="1472" selection-end="1472" vertical-scroll-proportion="0.18737476">
+        <state line="311" column="19" selection-start="7685" selection-end="7685" vertical-scroll-proportion="0.33266532">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/plugins/metadata/PackageCapability.java">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/filter/LazyFilteredDelegateLoader.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="82" column="22" selection-start="2702" selection-end="2702" vertical-scroll-proportion="0.66032064">
+        <state line="48" column="45" selection-start="1810" selection-end="1810" vertical-scroll-proportion="0.45991984">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/plugins/ClassLoaderUtils.java">
+    <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/ClassLoaderPolicy.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="127" column="30" selection-start="3967" selection-end="3967" vertical-scroll-proportion="0.33266532">
+        <state line="83" column="28" selection-start="2920" selection-end="2920" vertical-scroll-proportion="0.749499">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java">
+    <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="39" column="6" selection-start="1583" selection-end="1583" vertical-scroll-proportion="0.3236473">
+        <state line="326" column="0" selection-start="8421" selection-end="8421" vertical-scroll-proportion="4.3947897">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="66" column="58" selection-start="2718" selection-end="2718" vertical-scroll-proportion="0.4308617">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="67" column="99" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.76152307">
+        <state line="57" column="0" selection-start="2729" selection-end="2729" vertical-scroll-proportion="0.6132265">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>




More information about the jboss-cvs-commits mailing list