geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r809078 [9/12] - in /geronimo/sandbox/djencks/osgi/framework: ./ assemblies/ assemblies/geronimo-framework/ buildsupport/ buildsupport/buildsupport-maven-plugin/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org...
Date Sat, 29 Aug 2009 00:51:37 GMT
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MultiParentClassLoaderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MultiParentClassLoaderTest.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MultiParentClassLoaderTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MultiParentClassLoaderTest.java Sat Aug 29 00:51:12 2009
@@ -63,12 +63,12 @@
         for (int i = 0; i < files.length; i++) {
             File file = files[i];
             JarFile jarFile = new JarFile(files[i]);
-            String urlString = "jar:" + file.toURL() + "!/" + ENTRY_NAME;
-            URL url = new URL(files[i].toURL(), urlString);
+            String urlString = "jar:" + file.toURI().toURL() + "!/" + ENTRY_NAME;
+            URL url = new URL(files[i].toURI().toURL(), urlString);
             assertStreamContains(ENTRY_VALUE + i, url.openStream());
             jarFile.close();
 
-            URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { file.toURL() } );
+            URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { file.toURI().toURL() } );
             // clazz shared by all
             Class clazz = urlClassLoader.loadClass(CLASS_NAME);
             assertNotNull(clazz);
@@ -140,40 +140,40 @@
 
     public void testInverseClassLoading() throws Exception {
         File parentJar = createJarFile(0);
-        ClassLoader parentCl = new URLClassLoader(new URL[]{parentJar.toURL()});
+        ClassLoader parentCl = new URLClassLoader(new URL[]{parentJar.toURI().toURL()});
         File myJar = createJarFile(1);
-        ClassLoader cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURL()}, parentCl);
+        ClassLoader cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURI().toURL()}, parentCl);
         Class clazz = cl.loadClass(CLASS_NAME);
         assertSame(parentCl, clazz.getClassLoader());
 
         ClassLoadingRules classLoadingRules = new ClassLoadingRules();
         classLoadingRules.setInverseClassLoading(true);
-        cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURL()}, parentCl, classLoadingRules);
+        cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURI().toURL()}, parentCl, classLoadingRules);
         clazz = cl.loadClass(CLASS_NAME);
         assertSame(cl, clazz.getClassLoader());
     }
 
     public void testHiddenClasses() throws Exception {
         File parentJar = createJarFile(0);
-        ClassLoader parentCl = new URLClassLoader(new URL[]{parentJar.toURL()});
+        ClassLoader parentCl = new URLClassLoader(new URL[]{parentJar.toURI().toURL()});
         File myJar = createJarFile(1);
-        ClassLoader cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURL()}, parentCl);
+        ClassLoader cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURI().toURL()}, parentCl);
         Class clazz = cl.loadClass(CLASS_NAME);
         assertSame(parentCl, clazz.getClassLoader());
 
         ClassLoadingRules classLoadingRules = new ClassLoadingRules();
         ClassLoadingRule classLoadingRule = classLoadingRules.getHiddenRule();
         classLoadingRule.addClassPrefixes(Collections.singleton(CLASS_NAME));
-        cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURL()}, parentCl, classLoadingRules);
+        cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURI().toURL()}, parentCl, classLoadingRules);
         clazz = cl.loadClass(CLASS_NAME);
         assertSame(cl, clazz.getClassLoader());
     }
 
     public void testNonOverridableClasses() throws Exception {
         File parentJar = createJarFile(0);
-        ClassLoader parentCl = new URLClassLoader(new URL[]{parentJar.toURL()});
+        ClassLoader parentCl = new URLClassLoader(new URL[]{parentJar.toURI().toURL()});
         File myJar = createJarFile(1);
-        ClassLoader cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURL()}, parentCl);
+        ClassLoader cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURI().toURL()}, parentCl);
         Class clazz = cl.loadClass(CLASS_NAME);
         assertSame(parentCl, clazz.getClassLoader());
 
@@ -181,7 +181,7 @@
         classLoadingRules.setInverseClassLoading(true);
         ClassLoadingRule classLoadingRule = classLoadingRules.getNonOverrideableRule();
         classLoadingRule.addClassPrefixes(Collections.singleton(CLASS_NAME));
-        cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURL()}, parentCl, classLoadingRules);
+        cl = new MultiParentClassLoader(NAME, new URL[]{myJar.toURI().toURL()}, parentCl, classLoadingRules);
         clazz = cl.loadClass(CLASS_NAME);
         assertSame(parentCl, clazz.getClassLoader());
     }
@@ -320,11 +320,11 @@
 
         parents = new ArrayList<ClassLoader>(3);
         for (int i = 0; i < 3; i++) {
-            parents.add(new URLClassLoader(new URL[]{files[i].toURL()}) );
+            parents.add(new URLClassLoader(new URL[]{files[i].toURI().toURL()}) );
         }
 
         File myFile = createJarFile(33);
-        classLoader = new MultiParentClassLoader(NAME, new URL[]{myFile.toURL()}, parents);
+        classLoader = new MultiParentClassLoader(NAME, new URL[]{myFile.toURI().toURL()}, parents);
     }
 
     private static File createJarFile(int i) throws IOException {

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MyGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MyGBean.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MyGBean.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MyGBean.java Sat Aug 29 00:51:12 2009
@@ -32,7 +32,6 @@
 
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(MyGBean.class);
-        infoFactory.addOperation("main", new Class[]{String[].class});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 }

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/management/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockRepository.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockRepository.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockRepository.java Sat Aug 29 00:51:12 2009
@@ -65,10 +65,15 @@
         return repo.containsKey(artifact);
     }
 
-    public File getLocation(Artifact artifact) {
+    public File getLocation(final Artifact artifact) {
         File file = repo.get(artifact);
         if (file == null) {
-            file = new File(".");
+            file = new File("/") {
+                @Override
+                public String getAbsolutePath() {
+                    return artifact.toString();
+                }
+            };
         }
         return file;
     }

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java?rev=809078&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java Sat Aug 29 00:51:12 2009
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.kernel.osgi;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.net.URL;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.BundleContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MockBundle implements Bundle {
+
+    private final ClassLoader classLoader;
+    private final String location;
+    private final long id;
+    private BundleContext bundleContext;
+
+    public MockBundle(ClassLoader classLoader, String location, long id) {
+        this.classLoader = classLoader;
+        this.location = location;
+        this.id = id;
+    }
+
+    public int getState() {
+        return 0;
+    }
+
+    public void start(int i) throws BundleException {
+    }
+
+    public void start() throws BundleException {
+    }
+
+    public void stop(int i) throws BundleException {
+    }
+
+    public void stop() throws BundleException {
+    }
+
+    public void update() throws BundleException {
+    }
+
+    public void update(InputStream inputStream) throws BundleException {
+    }
+
+    public void uninstall() throws BundleException {
+    }
+
+    public Dictionary getHeaders() {
+        return null;
+    }
+
+    public long getBundleId() {
+        return id;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public ServiceReference[] getRegisteredServices() {
+        return new ServiceReference[0];
+    }
+
+    public ServiceReference[] getServicesInUse() {
+        return new ServiceReference[0];
+    }
+
+    public boolean hasPermission(Object o) {
+        return true;
+    }
+
+    public URL getResource(String s) {
+        return classLoader.getResource(s);
+    }
+
+    public Dictionary getHeaders(String s) {
+        return null;
+    }
+
+    public String getSymbolicName() {
+        return null;
+    }
+
+    public Class loadClass(String s) throws ClassNotFoundException {
+        return classLoader.loadClass(s);
+    }
+
+    public Enumeration getResources(String s) throws IOException {
+        return classLoader.getResources(s);
+    }
+
+    public Enumeration getEntryPaths(String s) {
+        return null;
+    }
+
+    public URL getEntry(String s) {
+        return null;
+    }
+
+    public long getLastModified() {
+        return 0;
+    }
+
+    public Enumeration findEntries(String s, String s1, boolean b) {
+        return null;
+    }
+
+    public BundleContext getBundleContext() {
+        return bundleContext;
+    }
+
+    public void setBundleContext(BundleContext bundleContext) {
+        this.bundleContext = bundleContext;
+    }
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java?rev=809078&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java Sat Aug 29 00:51:12 2009
@@ -0,0 +1,198 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.kernel.osgi;
+
+import java.io.InputStream;
+import java.io.File;
+import java.util.Dictionary;
+import java.util.Map;
+import java.util.HashMap;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.BundleListener;
+import org.osgi.framework.FrameworkListener;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.Filter;
+import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.Jsr77Naming;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.NoSuchConfigException;
+import org.apache.geronimo.kernel.config.LifecycleException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MockBundleContext implements BundleContext {
+    protected static final Naming naming = new Jsr77Naming();
+
+
+    private ConfigurationManager configurationManager;
+    private final Bundle bundle;
+    private final ClassLoader classLoader;
+    private final Map<Artifact, ConfigurationData> configurationDatas;
+    private final Map<String, Artifact> locations;
+    private final Map<Long, Bundle> bundles = new HashMap<Long, Bundle>();
+
+    private long counter = 0;
+
+    public MockBundleContext(Bundle bundle) {
+        this.bundle = bundle;
+        this.classLoader = null;
+        configurationDatas = new HashMap<Artifact, ConfigurationData>();
+        locations = new HashMap<String, Artifact>();
+    }
+
+    public MockBundleContext(ClassLoader classLoader, String location, Map<Artifact, ConfigurationData> configurationDatas, Map<String, Artifact> locationToArtifact) {
+        this.bundle = new MockBundle(classLoader, location, counter++);
+        bundles.put(counter, this.bundle);
+        this.classLoader = classLoader;
+        ((MockBundle)bundle).setBundleContext(this);
+        this.configurationDatas = configurationDatas == null? new HashMap<Artifact, ConfigurationData>(): configurationDatas;
+        this.locations = locationToArtifact == null? new HashMap<String, Artifact>(): locationToArtifact;
+    }
+
+    public void setConfigurationManager(ConfigurationManager configurationManager) {
+        this.configurationManager = configurationManager;
+    }
+
+    public String getProperty(String s) {
+        return null;
+    }
+
+    public Bundle getBundle() {
+        return bundle;
+    }
+
+    public Bundle installBundle(String location) throws BundleException {
+        MockBundle bundle = new MockBundle(classLoader, location, counter++);
+        bundles.put(counter, bundle);
+        //activate it.
+        Artifact configId = locations.get(location);
+        if (configId == null) {
+            configId = Artifact.create(location);
+        }
+        ConfigurationData configurationData = configurationDatas.get(configId);
+        if (configurationData == null) {
+            configurationData = new ConfigurationData(configId, naming);
+        }
+        BundleContext bundleContext = new WrappingBundleContext(bundle);
+        bundle.setBundleContext(bundleContext);
+        configurationData.setBundleContext(bundleContext);
+        try {
+            configurationManager.loadConfiguration(configurationData);
+        } catch (NoSuchConfigException e) {
+            throw (BundleException)new BundleException("").initCause(e);
+        } catch (LifecycleException e) {
+            throw (BundleException)new BundleException("").initCause(e);
+        }
+        return bundle;
+    }
+
+    public Bundle installBundle(String s, InputStream inputStream) throws BundleException {
+        return installBundle(s);
+    }
+
+    public Bundle getBundle(long l) {
+        return bundles.get(l);
+    }
+
+    public Bundle[] getBundles() {
+        return bundles.values().toArray(new Bundle[bundles.size()]);
+    }
+
+    public void addServiceListener(ServiceListener serviceListener, String s) throws InvalidSyntaxException {
+    }
+
+    public void addServiceListener(ServiceListener serviceListener) {
+    }
+
+    public void removeServiceListener(ServiceListener serviceListener) {
+    }
+
+    public void addBundleListener(BundleListener bundleListener) {
+    }
+
+    public void removeBundleListener(BundleListener bundleListener) {
+    }
+
+    public void addFrameworkListener(FrameworkListener frameworkListener) {
+    }
+
+    public void removeFrameworkListener(FrameworkListener frameworkListener) {
+    }
+
+    public ServiceRegistration registerService(String[] strings, Object o, Dictionary dictionary) {
+        return null;
+    }
+
+    public ServiceRegistration registerService(String s, Object o, Dictionary dictionary) {
+        return null;
+    }
+
+    public ServiceReference[] getServiceReferences(String s, String s1) throws InvalidSyntaxException {
+        return new ServiceReference[0];
+    }
+
+    public ServiceReference[] getAllServiceReferences(String s, String s1) throws InvalidSyntaxException {
+        return new ServiceReference[0];
+    }
+
+    public ServiceReference getServiceReference(String s) {
+        return null;
+    }
+
+    public Object getService(ServiceReference serviceReference) {
+        return null;
+    }
+
+    public boolean ungetService(ServiceReference serviceReference) {
+        return false;
+    }
+
+    public File getDataFile(String s) {
+        return null;
+    }
+
+    public Filter createFilter(String s) throws InvalidSyntaxException {
+        return null;
+    }
+
+    private class WrappingBundleContext extends MockBundleContext {
+
+        private WrappingBundleContext(Bundle bundle) {
+            super(bundle);
+        }
+
+        @Override
+        public Bundle installBundle(String location) throws BundleException {
+            return MockBundleContext.this.installBundle(location);
+        }
+
+    }
+
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java?rev=809078&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java Sat Aug 29 00:51:12 2009
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.kernel.osgi;
+
+import java.io.File;
+
+import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.kernel.repository.Artifact;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MockRespository implements Repository {
+    public boolean contains(Artifact artifact) {
+        return true;
+    }
+
+    public File getLocation(final Artifact artifact) {
+        return new File("/") {
+            @Override
+            public String getAbsolutePath() {
+                return artifact.toString();
+            }
+        };
+    }
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java Sat Aug 29 00:51:12 2009
@@ -40,7 +40,7 @@
     protected void setUp() throws Exception {
         File dir = new File(System.getProperty("user.home"));
 
-        baseURL = dir.toURL().toString();
+        baseURL = dir.toURI().toURL().toString();
         if (baseURL.endsWith("/")) {
             baseURL = baseURL.substring(0, baseURL.length() - 1);
         }

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m1/junk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m1/junk/propertiess/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m1/org.bar/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m1/org.bar/propertiess/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m1/org.foo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m1/org.foo/propertiess/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/junk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/junk/junk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/junk/junk/1.5/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/org/bar/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.5/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/org/foo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/org/foo/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/repo/m2/org/foo/test/2.0.1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,10 +25,11 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-logging</artifactId>
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Logging</name>
 
 </project>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/main/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/main/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/main/java/org/apache/geronimo/framework/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/main/java/org/apache/geronimo/framework/logging/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/main/java/org/slf4j/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -1,10 +1,9 @@
+.*
 *.iws
 *.ipr
 *.iml
-.classpath
-.project
-.settings
 *.log
 junit*.properties
+maven-eclipse.xml
 target
 bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,10 +25,11 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-management</artifactId>
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Management API</name>
     
     <description>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebModule.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebModule.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebModule.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebModule.java Sat Aug 29 00:51:12 2009
@@ -47,4 +47,10 @@
      * content or a user would copy updated JSPs to.
      */
     public URL getWARDirectory();
+    
+    /**
+     * Get the first displayName value set in the web.xml
+     * @return
+     */
+    public String getDisplayName();
 }

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/stats/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/stats/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -1,10 +1,9 @@
+.*
 *.iws
 *.ipr
 *.iml
-.classpath
-.project
-.settings
 *.log
 junit*.properties
+maven-eclipse.xml
 target
 bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,10 +25,11 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-naming</artifactId>
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Naming</name>
     
     <dependencies>
@@ -37,6 +38,13 @@
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.xbean</groupId>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/enc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompGBeanTest.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompGBeanTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompGBeanTest.java Sat Aug 29 00:51:12 2009
@@ -28,6 +28,7 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
+import org.apache.geronimo.kernel.osgi.MockBundleContext;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -44,6 +45,7 @@
  * @version $Rev$ $Date$
  */
 public class JavaCompGBeanTest extends AbstractContextTest {
+    private MockBundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(), "", new HashMap<Artifact, ConfigurationData>(), null);
     private Kernel kernel;
     private Hashtable contextEnv;
 
@@ -83,7 +85,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        kernel = KernelFactory.newInstance().createKernel("test");
+        kernel = KernelFactory.newInstance(bundleContext).createKernel("test");
         kernel.boot();
 
         ConfigurationData bootstrap = new ConfigurationData(new Artifact("bootstrap", "bootstrap", "", "car"), kernel.getNaming());
@@ -93,15 +95,16 @@
         GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.class);
         artifactResolverData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
 
-        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.GBEAN_INFO);
+        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.class);
         configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
         configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
 
-        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, getClass().getClassLoader());
+        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
 
         ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
 
         ConfigurationData configurationData = new ConfigurationData(new Artifact("test", "test", "", "car"), kernel.getNaming());
+        configurationData.setBundleContext(bundleContext);
         configurationData.addGBean("GlobalContext", GlobalContextGBean.GBEAN_INFO);
         configurationData.addGBean("JavaComp", JavaCompContextGBean.GBEAN_INFO);
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java Sat Aug 29 00:51:12 2009
@@ -35,6 +35,7 @@
 import org.apache.geronimo.gjndi.binding.ResourceBinding;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
+import org.apache.geronimo.kernel.osgi.MockBundleContext;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -50,6 +51,7 @@
  * @version $Rev$ $Date$
  */
 public class KernelContextGBeanTest extends AbstractContextTest {
+    private MockBundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(), "", new HashMap<Artifact, ConfigurationData>(), null);
     private Kernel kernel;
     private ConfigurationManager configurationManager;
     private ConfigurationData configurationData;
@@ -175,7 +177,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        kernel = KernelFactory.newInstance().createKernel("test");
+        kernel = KernelFactory.newInstance(bundleContext).createKernel("test");
         kernel.boot();
 
         ConfigurationData bootstrap = new ConfigurationData(new Artifact("bootstrap", "bootstrap", "", "car"), kernel.getNaming());
@@ -185,15 +187,16 @@
         GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.class);
         artifactResolverData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
 
-        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.GBEAN_INFO);
+        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.class);
         configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
         configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
 
-        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, getClass().getClassLoader());
+        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
 
         configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
 
         configurationData = new ConfigurationData(new Artifact("test", "test", "", "car"), kernel.getNaming());
+        configurationData.setBundleContext(bundleContext);
         configurationData.addGBean("GlobalContext", GlobalContextGBean.GBEAN_INFO);
 
         GBeanInfoBuilder builder = new GBeanInfoBuilder(ImmutableContext.class);

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java Sat Aug 29 00:51:12 2009
@@ -34,6 +34,7 @@
 import org.apache.geronimo.gjndi.WritableContextGBean;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
+import org.apache.geronimo.kernel.osgi.MockBundleContext;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -47,10 +48,11 @@
  * @version $Rev$ $Date$
  */
 public class GBeanBindingTest extends AbstractContextTest {
+    private MockBundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(), "", new HashMap<Artifact, ConfigurationData>(), null);
     private Kernel kernel;
 
     private Hashtable contextEnv;
-    private Map globalBindings;
+    private Map<String, Object> globalBindings;
     private AbstractName ds1Name;
     private AbstractName ds2Name;
 
@@ -93,7 +95,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        kernel = KernelFactory.newInstance().createKernel("test");
+        kernel = KernelFactory.newInstance(bundleContext).createKernel("test");
         kernel.boot();
 
         ConfigurationData bootstrap = new ConfigurationData(new Artifact("bootstrap", "bootstrap", "", "car"), kernel.getNaming());
@@ -103,15 +105,16 @@
         GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.class);
         artifactResolverData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
 
-        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.GBEAN_INFO);
+        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.class);
         configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
         configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
 
-        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, getClass().getClassLoader());
+        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
 
         ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
 
         ConfigurationData configurationData = new ConfigurationData(new Artifact("test", "test", "", "car"), kernel.getNaming());
+        configurationData.setBundleContext(bundleContext);
         configurationData.addGBean("GlobalContext", GlobalContextGBean.GBEAN_INFO);
 
         contextEnv = new Hashtable();

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/naming/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/naming/enc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/naming/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/naming/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,10 +25,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.apache.geronimo.framework</groupId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>geronimo-plugin</artifactId>
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Plugin</name>
     
     <dependencies>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java Sat Aug 29 00:51:12 2009
@@ -39,6 +39,7 @@
 import org.apache.geronimo.system.plugin.model.PluginArtifactType;
 import org.apache.geronimo.system.plugin.model.PluginListType;
 import org.apache.geronimo.system.plugin.model.PluginType;
+import org.osgi.framework.BundleContext;
 
 /**
  * @version $Rev$ $Date$
@@ -50,18 +51,18 @@
     private final Collection<PersistentConfigurationList> persistentConfigurationLists;
     private final PluginInstallerGBean oldPluginInstallerGBean;
     private final ConfigurationManager configManager;
-    private final Kernel kernel;
+    private final BundleContext bundleContext;
 
     public NewServerInstanceGBean(@ParamAttribute(name = "defaultPlugins")Map<String, String> defaultPlugins,
                                   @ParamReference(name = "PersistentConfigurationList", namingType="PersistentConfigurationList.PERSISTENT_CONFIGURATION_LIST")Collection<PersistentConfigurationList> persistentConfigurationLists,
                                   @ParamReference(name = "PluginInstallerGBean")PluginInstallerGBean pluginInstallerGBean,
                                   @ParamReference(name = "ConfigManager", namingType = "ConfigurationManager")ConfigurationManager configManager,
-                                  @ParamSpecial(type = SpecialAttributeType.kernel)Kernel kernel) {
+                                  @ParamSpecial(type = SpecialAttributeType.bundleContext)BundleContext bundleContext) {
         this.persistentConfigurationLists = persistentConfigurationLists;
         this.oldPluginInstallerGBean = pluginInstallerGBean;
         this.configManager = configManager;
         this.defaultPlugins = defaultPlugins == null ? Collections.<String>emptySet() : defaultPlugins.keySet();
-        this.kernel = kernel;
+        this.bundleContext = bundleContext;
     }
 
     public void newServerInstance(String serverName) throws Exception {
@@ -80,7 +81,7 @@
                 }
             }
 
-            Kernel kernel = new BasicKernel("assembly");
+            Kernel kernel = new BasicKernel("assembly", bundleContext);
 
             try {
                 PluginInstallerGBean pluginInstallerGBean = oldPluginInstallerGBean.pluginInstallerCopy(serverName, kernel);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Sat Aug 29 00:51:12 2009
@@ -18,10 +18,10 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.FileInputStream;
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URL;
@@ -51,7 +51,6 @@
 import javax.security.auth.login.FailedLoginException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
 import org.apache.geronimo.gbean.ReferenceCollection;
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;
@@ -63,6 +62,7 @@
 import org.apache.geronimo.kernel.InvalidGBeanException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.basic.BasicKernel;
+import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
@@ -71,15 +71,14 @@
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
 import org.apache.geronimo.kernel.config.PersistentConfigurationList;
-import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactManager;
 import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
 import org.apache.geronimo.kernel.repository.Dependency;
 import org.apache.geronimo.kernel.repository.FileWriteMonitor;
 import org.apache.geronimo.kernel.repository.ImportType;
+import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.kernel.repository.MissingDependencyException;
-import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.Version;
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
 import org.apache.geronimo.kernel.util.XmlUtil;
@@ -104,6 +103,7 @@
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.system.threads.ThreadPool;
 import org.codehaus.plexus.util.FileUtils;
+import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
@@ -131,7 +131,7 @@
     private final Map<Object, DownloadResults> asyncKeys;
     private final ThreadPool threadPool;
     private final Collection<? extends ServerInstanceData> serverInstanceDatas;
-    private final ClassLoader classLoader;
+    private final BundleContext bundleContext;
     private final Map<String, ServerInstance> servers = new HashMap<String, ServerInstance>();
     private final Collection<PersistentConfigurationList> persistentConfigurationLists;
     private final PluginRepositoryList pluginRepositoryList;
@@ -150,7 +150,7 @@
      * @param threadPool                   thread pool for async operations
      * @param artifactManager              artifact manager to resolve existing artifacts
      * @param persistentConfigurationLists used to start new plugins in a running server
-     * @param classLoader                  classLoader @throws IOException exception if server instance cannot be loaded
+     * @param bundleContext                  classLoader @throws IOException exception if server instance cannot be loaded
      * @throws java.io.IOException from bad ServerInstance
      */
     public PluginInstallerGBean(@ParamAttribute(name = "installedPluginsList")String installedPluginsList,
@@ -163,8 +163,8 @@
                                 @ParamReference(name = "ArtifactManager") final ArtifactManager artifactManager,
                                 @ParamReference(name = "PersistentConfigurationLists", namingType = "AttributeStore")Collection<PersistentConfigurationList> persistentConfigurationLists,
                                 @ParamReference(name = "PluginRepositoryList")PluginRepositoryList pluginRepositoryList,
-                                @ParamSpecial(type = SpecialAttributeType.classLoader) final ClassLoader classLoader) throws IOException {
-        this(installedPluginsList, configManager, repository, configStore, serverInstanceDatas, serverInfo, threadPool, artifactManager, persistentConfigurationLists, pluginRepositoryList, classLoader, true);
+                                @ParamSpecial(type = SpecialAttributeType.bundleContext) final BundleContext bundleContext) throws IOException {
+        this(installedPluginsList, configManager, repository, configStore, serverInstanceDatas, serverInfo, threadPool, artifactManager, persistentConfigurationLists, pluginRepositoryList, bundleContext, true);
     }
 
     private PluginInstallerGBean(String installedPluginsList,
@@ -177,7 +177,7 @@
                                  ArtifactManager artifactManager,
                                  Collection<PersistentConfigurationList> persistentConfigurationLists,
                                  PluginRepositoryList pluginRepositoryList,
-                                 ClassLoader classLoader,
+                                 BundleContext bundleContext,
                                  boolean live) throws IOException {
         this.writeableRepo = repository;
         this.configStore = configStore;
@@ -188,7 +188,7 @@
         if (artifactManager == null) artifactManager = new DefaultArtifactManager();
         setUpServerInstances(serverInstanceDatas, serverInfo, artifactManager, servers, writeableRepo, live);
         this.persistentConfigurationLists = persistentConfigurationLists == null ? Collections.<PersistentConfigurationList>emptyList() : persistentConfigurationLists;
-        this.classLoader = classLoader;
+        this.bundleContext = bundleContext;
         if (configManager == null) {
             throw new IllegalArgumentException("No default server instance set up");
         }
@@ -208,7 +208,7 @@
      * @param serverInstanceDatas  set of server layouts
      * @param pluginRepositoryList
      * @param kernel               kernel for current server
-     * @param classLoader          classLoader 
+     * @param bundleContext          classLoader
      * @throws IOException if layouts can't be loaded
      */
     public PluginInstallerGBean(String targetRepositoryPath,
@@ -217,7 +217,7 @@
                                 Collection<? extends ServerInstanceData> serverInstanceDatas,
                                 PluginRepositoryList pluginRepositoryList,
                                 final Kernel kernel,
-                                final ClassLoader classLoader) throws Exception {
+                                final BundleContext bundleContext) throws Exception {
         final ArtifactManager artifactManager = new DefaultArtifactManager();
 
         FileUtils.forceMkdir(new File(targetServerPath));
@@ -230,9 +230,9 @@
         asyncKeys = Collections.synchronizedMap(new HashMap<Object, DownloadResults>());
         this.serverInstanceDatas = serverInstanceDatas;
         this.persistentConfigurationLists = Collections.emptyList();
-        this.classLoader = classLoader;
+        this.bundleContext = bundleContext;
         setUpServerInstances(serverInstanceDatas, serverInfo, artifactManager, servers, writeableRepo, false);
-        this.configManager = buildConfigurationManager(artifactManager, writeableRepo, kernel, configStore, classLoader, servers);
+        this.configManager = buildConfigurationManager(artifactManager, writeableRepo, kernel, configStore, bundleContext, servers);
         localSourceRepository = new GeronimoSourceRepository(configManager.getRepositories(), configManager.getArtifactResolver());
         this.pluginRepositoryList = pluginRepositoryList;
         this.installedPluginsList = installedPluginsList;
@@ -242,7 +242,7 @@
     public PluginInstallerGBean pluginInstallerCopy(String serverName, Kernel kernel) throws Exception {
         ServerInfo newServerInfo = new BasicServerInfo(serverInfo.getCurrentBaseDirectory(), serverName);
         final ArtifactManager artifactManager = new DefaultArtifactManager();
-        ConfigurationManager configManager = buildConfigurationManager(artifactManager, writeableRepo, kernel, configStore, classLoader, servers);
+        ConfigurationManager configManager = buildConfigurationManager(artifactManager, writeableRepo, kernel, configStore, bundleContext, servers);
 //        ArrayList<ServerInstanceData> serverInstanceDatasCopy = new ArrayList<ServerInstanceData>(serverInstanceDatas.size());
 //        for (ServerInstanceData serverInstance: serverInstanceDatas) {
 //            if (serverInstance instanceof ReferenceServerInstanceData) {
@@ -261,7 +261,7 @@
                 artifactManager,
                 persistentConfigurationLists,
                 pluginRepositoryList,
-                classLoader,
+                bundleContext,
                 false);
     }
 
@@ -323,7 +323,7 @@
                                                                   WritableListableRepository targetRepo,
                                                                   Kernel kernel,
                                                                   ConfigurationStore targetStore,
-                                                                  ClassLoader classloader,
+                                                                  BundleContext bundleContext,
                                                                   Map<String, org.apache.geronimo.system.plugin.ServerInstance> servers) throws IOException {
         for (ServerInstance instance : servers.values()) {
             if ("default".equals(instance.getServerName())) {
@@ -333,9 +333,9 @@
                         (PersistentConfigurationList) instance.getAttributeStore(),
                         artifactManager,
                         instance.getArtifactResolver(),
-                        Collections.singleton(targetRepo),
+                        Collections.<ListableRepository>singleton(targetRepo),
                         null,
-                        classloader);
+                        bundleContext);
                 configurationManager.setOnline(false);
                 return configurationManager;
             }
@@ -359,7 +359,7 @@
         asyncKeys = Collections.synchronizedMap(new HashMap<Object, DownloadResults>());
         serverInstanceDatas = null;
         this.persistentConfigurationLists = Collections.emptyList();
-        classLoader = null;
+        bundleContext = null;
         for (ServerInstance instance : servers) {
             this.servers.put(instance.getServerName(), instance);
         }
@@ -443,7 +443,7 @@
             FileUtils.forceDelete(targetServerPath);
         }
         String targetServerPathName = targetServerPath.getAbsolutePath();
-        Kernel kernel = new BasicKernel("assembly");
+        Kernel kernel = new BasicKernel("assembly", bundleContext);
 
         try {
             PluginInstallerGBean installer = new PluginInstallerGBean(
@@ -453,7 +453,7 @@
                     serverInstanceDatas,
                     pluginRepositoryList, 
                     kernel,
-                    classLoader);
+                    bundleContext);
 
             installer.install(pluginList, localSourceRepository, true, null, null, downloadPoller);
         } finally {
@@ -799,9 +799,17 @@
                         if (!configManager.isRunning(artifact)) {
                             poller.setCurrentMessage("Starting " + artifact);
                             if (!configManager.isLoaded(artifact)) {
-                                configManager.loadConfiguration(artifact);
+                                try {
+                                    configManager.loadConfiguration(artifact);
+                                } catch (Exception e) {
+                                    log.error("Unable to load configuration. ", e);
+                                    configManager.uninstallConfiguration(artifact);
+                                }
+                            } 
+                            
+                            if (configManager.isLoaded(artifact)) {
+                                configManager.startConfiguration(artifact);
                             }
-                            configManager.startConfiguration(artifact);
                         }
                     }
                 }
@@ -982,7 +990,7 @@
             // 2. Validate that we can install this
             if (!validatePlugin(data)) {
                 //already installed
-                throw new MissingDependencyException("Already installed", toArtifact(data.getPluginArtifact().get(0).getModuleId()), (Stack<Artifact>)null);
+                throw new ConfigurationAlreadyExistsException("Configuration " + toArtifact(data.getPluginArtifact().get(0).getModuleId()) + " is already installed.");
             }
 
             verifyPrerequisites(data);

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/resources/archivertest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/resources/archivertest/bin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/resources/archivertest/lib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin



Mime
View raw message