geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r809078 [12/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/or...
Date Sat, 29 Aug 2009 00:51:37 GMT
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java Sat Aug 29 00:51:12 2009
@@ -16,30 +16,32 @@
  */
 package org.apache.geronimo.system.configuration;
 
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import javax.management.ObjectName;
 import junit.framework.TestCase;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GReferenceInfo;
-import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.ReferencePatterns;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.Jsr77Naming;
+import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
+import org.apache.geronimo.kernel.osgi.MockBundle;
+import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
-
-import javax.management.ObjectName;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import org.osgi.framework.Bundle;
 
 /**
  * @version $Rev$ $Date$
@@ -51,26 +53,28 @@
     private Artifact configurationName;
     private AbstractName gbeanName;
     private GAttributeInfo attributeInfo;
+    private GAttributeInfo encryptedAttributeInfo;
     private GReferenceInfo referenceInfo;
+    private Bundle bundle = new MockBundle(getClass().getClassLoader(), "", 0L);
 
     public void testConfigurationShouldLoad() throws Exception {
         // should load by default
-        Set originalDatas = new HashSet();
+        Set<GBeanData> originalDatas = new HashSet<GBeanData>();
         GBeanData gbeanData = new GBeanData(gbeanName, GBEAN_INFO);
         originalDatas.add(gbeanData);
 
-        Set newDatas;
-        newDatas = new HashSet(localAttributeManager.applyOverrides(configurationName, originalDatas, getClass().getClassLoader()));
+        Set<GBeanData> newDatas;
+        newDatas = new HashSet<GBeanData>(localAttributeManager.applyOverrides(configurationName, originalDatas, bundle));
         assertEquals(1, newDatas.size());
         assertEquals(originalDatas, newDatas);
 
         // declare an attribute value so this configuration will exist in the store
         String attributeValue = "attribute value";
         localAttributeManager.addConfiguration(configurationName);
-        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, getClass().getClassLoader());
+        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, bundle);
 
         // should still load
-        newDatas = new HashSet(localAttributeManager.applyOverrides(configurationName, originalDatas, getClass().getClassLoader()));
+        newDatas = new HashSet<GBeanData>(localAttributeManager.applyOverrides(configurationName, originalDatas, bundle));
         assertEquals(1, newDatas.size());
         assertEquals(originalDatas, newDatas);
 
@@ -78,7 +82,7 @@
         localAttributeManager.removeConfiguration(configurationName);
 
         // should still get the same gbeans, config list and gbean attribute override functions are separate interfaces.
-        newDatas = new HashSet(localAttributeManager.applyOverrides(configurationName, originalDatas, getClass().getClassLoader()));
+        newDatas = new HashSet<GBeanData>(localAttributeManager.applyOverrides(configurationName, originalDatas, bundle));
         assertEquals(1, newDatas.size());
         assertEquals(originalDatas, newDatas);
     }
@@ -88,24 +92,24 @@
         AbstractName gbeanName2 = new AbstractName(configurationName, objectName.getKeyPropertyList(), objectName);
 
         // should load by default
-        Set originalDatas = new HashSet();
+        Set<GBeanData> originalDatas = new HashSet<GBeanData>();
         GBeanData gbeanData = new GBeanData(gbeanName, GBEAN_INFO);
         GBeanData gbeanData2 = new GBeanData(gbeanName2, GBEAN_INFO);
         originalDatas.add(gbeanData);
         originalDatas.add(gbeanData2);
 
-        Set newDatas;
-        newDatas = new HashSet(localAttributeManager.applyOverrides(configurationName, originalDatas, getClass().getClassLoader()));
+        Set<GBeanData> newDatas;
+        newDatas = new HashSet<GBeanData>(localAttributeManager.applyOverrides(configurationName, originalDatas, bundle));
         assertEquals(2, newDatas.size());
         assertEquals(originalDatas, newDatas);
 
         // declare an attribute value so this configuration will exist in the store
         String attributeValue = "attribute value";
         localAttributeManager.addConfiguration(configurationName);
-        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, getClass().getClassLoader());
+        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, bundle);
 
         // should still load
-        newDatas = new HashSet(localAttributeManager.applyOverrides(configurationName, originalDatas, getClass().getClassLoader()));
+        newDatas = new HashSet<GBeanData>(localAttributeManager.applyOverrides(configurationName, originalDatas, bundle));
         assertEquals(2, newDatas.size());
         assertEquals(originalDatas, newDatas);
 
@@ -113,21 +117,37 @@
         localAttributeManager.setShouldLoad(configurationName, gbeanName, false);
 
         // should not load
-        newDatas = new HashSet(localAttributeManager.applyOverrides(configurationName, originalDatas, getClass().getClassLoader()));
+        newDatas = new HashSet<GBeanData>(localAttributeManager.applyOverrides(configurationName, originalDatas, bundle));
         assertEquals(1, newDatas.size());
-        GBeanData newGBeanData = (GBeanData) newDatas.iterator().next();
+        GBeanData newGBeanData = newDatas.iterator().next();
         assertSame(gbeanData2, newGBeanData);
         assertEquals(attributeValue, gbeanData.getAttribute(attributeInfo.getName()));
     }
 
     public void testSetAttribute() throws Exception {
         String attributeValue = "attribute value";
-        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, getClass().getClassLoader());
-        Collection gbeanDatas = new ArrayList();
+        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, bundle);
+        Collection<GBeanData> gbeanDatas = new ArrayList<GBeanData>();
         GBeanData gbeanData = new GBeanData(gbeanName, GBEAN_INFO);
         gbeanDatas.add(gbeanData);
-        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, getClass().getClassLoader());
+        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, bundle);
         assertEquals(attributeValue, gbeanData.getAttribute(attributeInfo.getName()));
+        StringWriter w = new StringWriter();
+        localAttributeManager.write(w);
+        assertTrue(w.toString().contains(attributeValue));
+    }
+
+    public void testEncryptedAttribute() throws Exception {
+        String attributeValue = "attribute value";
+        localAttributeManager.setValue(configurationName, gbeanName, encryptedAttributeInfo, attributeValue, bundle);
+        Collection<GBeanData> gbeanDatas = new ArrayList<GBeanData>();
+        GBeanData gbeanData = new GBeanData(gbeanName, GBEAN_INFO);
+        gbeanDatas.add(gbeanData);
+        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, bundle);
+        assertEquals(attributeValue, gbeanData.getAttribute(encryptedAttributeInfo.getName()));
+        StringWriter w = new StringWriter();
+        localAttributeManager.write(w);
+        assertFalse(w.toString().contains(attributeValue));
     }
 
     public void testSetReference() throws Exception {
@@ -135,10 +155,10 @@
         AbstractName referencePattern = new AbstractName(configurationName, referencePatternObjectName.getKeyPropertyList(), referencePatternObjectName);
         ReferencePatterns referencePatterns = new ReferencePatterns(referencePattern);
         localAttributeManager.setReferencePatterns(configurationName, gbeanName, referenceInfo, referencePatterns);
-        Collection gbeanDatas = new ArrayList();
+        Collection<GBeanData> gbeanDatas = new ArrayList<GBeanData>();
         GBeanData gbeanData = new GBeanData(gbeanName, GBEAN_INFO);
         gbeanDatas.add(gbeanData);
-        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, getClass().getClassLoader());
+        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, bundle);
         assertEquals(referencePatterns, gbeanData.getReferencePatterns(referenceInfo.getName()));
     }
 
@@ -149,10 +169,10 @@
         AbstractName referencePattern2 = naming.createRootName(gbeanName.getArtifact(), "name", "referencePattern2");
         ReferencePatterns referencePatterns = new ReferencePatterns(new LinkedHashSet(Arrays.asList(new AbstractName[]{referencePattern1, referencePattern2})));
         localAttributeManager.setReferencePatterns(configurationName, gbeanName, referenceInfo, referencePatterns);
-        Collection gbeanDatas = new ArrayList();
+        Collection<GBeanData> gbeanDatas = new ArrayList<GBeanData>();
         GBeanData gbeanData = new GBeanData(gbeanName, GBEAN_INFO);
         gbeanDatas.add(gbeanData);
-        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, getClass().getClassLoader());
+        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, bundle);
         assertEquals(referencePatterns, gbeanData.getReferencePatterns(referenceInfo.getName()));
     }
 
@@ -164,13 +184,13 @@
         gbeanData.setAttribute(attributeInfo.getName(), attributeValue);
         gbeanData.setReferencePattern(referenceInfo.getName(), referencePattern);
         localAttributeManager.addConfiguration(configurationName);
-        localAttributeManager.addGBean(configurationName, gbeanData, getClass().getClassLoader());
+        localAttributeManager.addGBean(configurationName, gbeanData, bundle);
 
 
-        Collection gbeanDatas = new ArrayList();
-        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, getClass().getClassLoader());
+        Collection<GBeanData> gbeanDatas = new ArrayList<GBeanData>();
+        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, bundle);
         assertEquals(1, gbeanDatas.size());
-        GBeanData newGBeanData = (GBeanData) gbeanDatas.iterator().next();
+        GBeanData newGBeanData = gbeanDatas.iterator().next();
 
         assertNotSame(gbeanData, newGBeanData);
         assertSame(gbeanData.getGBeanInfo(), newGBeanData.getGBeanInfo());
@@ -182,9 +202,9 @@
     public void testBadGBeanSpec() throws Exception {
         String attributeValue = "attribute value";
         localAttributeManager.addConfiguration(configurationName);
-        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, getClass().getClassLoader());
+        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, bundle);
         try {
-            localAttributeManager.applyOverrides(configurationName, Collections.EMPTY_SET, getClass().getClassLoader());
+            localAttributeManager.applyOverrides(configurationName, Collections.<GBeanData>emptySet(), bundle);
             fail("no gbeans were specified in the 'plan' so overrides should fail");
         } catch (InvalidConfigException e) {
             //pass
@@ -196,12 +216,12 @@
         AbstractNameQuery referencePattern = new AbstractNameQuery(LocalAttributeManagerTest.class.getName());
 
         localAttributeManager.addConfiguration(configurationName);
-        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, getClass().getClassLoader());
+        localAttributeManager.setValue(configurationName, gbeanName, attributeInfo, attributeValue, bundle);
 
-        Collection gbeanDatas = new ArrayList();
+        Collection<GBeanData> gbeanDatas = new ArrayList<GBeanData>();
         GBeanData gbeanData = new GBeanData(gbeanName, GBEAN_INFO);
         gbeanDatas.add(gbeanData);
-        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, getClass().getClassLoader());
+        gbeanDatas = localAttributeManager.applyOverrides(configurationName, gbeanDatas, bundle);
         assertEquals(attributeValue, gbeanData.getAttribute(attributeInfo.getName()));
 
         Artifact newArtifact = Artifact.create("configuration/name/2/car");
@@ -209,10 +229,10 @@
         ObjectName objectName = ObjectName.getInstance(":name=gbean,parent="+newArtifact+",foo=bar");
         AbstractName newGBeanName = new AbstractName(newArtifact, objectName.getKeyPropertyList(), objectName);
 
-        gbeanDatas = new ArrayList();
+        gbeanDatas = new ArrayList<GBeanData>();
         gbeanData = new GBeanData(newGBeanName, GBEAN_INFO);
         gbeanDatas.add(gbeanData);
-        gbeanDatas = localAttributeManager.applyOverrides(newArtifact, gbeanDatas, getClass().getClassLoader());
+        gbeanDatas = localAttributeManager.applyOverrides(newArtifact, gbeanDatas, bundle);
         assertEquals(attributeValue, gbeanData.getAttribute(attributeInfo.getName()));
     }
 
@@ -227,6 +247,7 @@
         ObjectName objectName = ObjectName.getInstance(":name=gbean,parent="+configurationName+",foo=bar");
         gbeanName = new AbstractName(configurationName, objectName.getKeyPropertyList(), objectName);
         attributeInfo = GBEAN_INFO.getAttribute("attribute");
+        encryptedAttributeInfo = GBEAN_INFO.getAttribute("secret");
         referenceInfo = GBEAN_INFO.getReference("reference");
     }
 
@@ -241,6 +262,7 @@
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(LocalAttributeManagerTest.class);
         infoFactory.addReference("reference", String.class);
         infoFactory.addAttribute("attribute", String.class, true);
+        infoFactory.addAttribute("secret", String.class, true, true, true);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java Sat Aug 29 00:51:12 2009
@@ -32,11 +32,14 @@
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.ReferencePatterns;
+import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.osgi.MockBundle;
 import org.apache.geronimo.system.configuration.condition.JexlExpressionParser;
 import org.apache.geronimo.system.configuration.condition.ParserUtils;
 import org.apache.geronimo.system.plugin.model.GbeanType;
 import org.apache.geronimo.system.plugin.model.ModuleType;
+import org.osgi.framework.Bundle;
 
 /**
  * @version $Rev$ $Date$
@@ -44,6 +47,13 @@
 public class ServerOverrideTest extends TestCase {
     private JexlExpressionParser expressionParser;
 
+    private GAttributeInfo cheeseInfo = new GAttributeInfo("cheese", String.class.getName(), true, true, "getCheese", "setCheese");
+    private GAttributeInfo sizeInfo = new GAttributeInfo("size", String.class.getName(), true, true, "getSize", "setSize");
+    private GAttributeInfo emptyStringInfo = new GAttributeInfo("emptyString", String.class.getName(), true, true, "getEmptyString", "setEmptyString");
+    private GAttributeInfo portInfo = new GAttributeInfo("port", int.class.getName(), true, true, "getPort", "setPort");
+    private GAttributeInfo expressionInfo = new GAttributeInfo("expression", boolean.class.getName(), true, true, "getExpression", "setExpression");
+    private Bundle bundle = new MockBundle(getClass().getClassLoader(), null, 0L);
+
     protected void setUp() throws java.lang.Exception {
         HashMap<String, String> subs = new HashMap<String, String>();
         subs.put("host", "localhost");
@@ -60,7 +70,7 @@
         pizza.setLoad(false);
         assertFalse(pizza.isLoad());
 
-        pizza.setAttribute("cheese", "mozzarella");
+        pizza.setAttribute(cheeseInfo, "mozzarella", bundle);
         assertEquals("mozzarella", pizza.getAttribute("cheese"));
 
         AbstractNameQuery pizzaOvenQuery = getAbstractNameQuery(":name=PizzaOven");
@@ -105,10 +115,10 @@
         pizza.setLoad(false);
         assertCopyIdentical(pizza);
 
-        pizza.setAttribute("cheese", "mozzarella");
+        pizza.setAttribute(cheeseInfo, "mozzarella", bundle);
         assertCopyIdentical(pizza);
 
-        pizza.setAttribute("size", "x-large");
+        pizza.setAttribute(sizeInfo, "x-large", bundle);
         assertCopyIdentical(pizza);
 
         AbstractNameQuery pizzaOvenQuery = getAbstractNameQuery(":name=PizzaOven");
@@ -131,9 +141,9 @@
         assertCopyIdentical(dinnerMenu);
 
         GBeanOverride pizza = new GBeanOverride("Pizza", false, expressionParser);
-        pizza.setAttribute("cheese", "mozzarella");
-        pizza.setAttribute("size", "x-large");
-        pizza.setAttribute("emptyString", "");
+        pizza.setAttribute(cheeseInfo, "mozzarella", bundle);
+        pizza.setAttribute(sizeInfo, "x-large", bundle);
+        pizza.setAttribute(emptyStringInfo, "", bundle);
         pizza.setClearAttribute("greenPeppers");
         pizza.setNullAttribute("pineapple");
 
@@ -163,9 +173,9 @@
         ConfigurationOverride dinnerMenu = new ConfigurationOverride(new Artifact("test","Dinner Menu","1.0","car"), false);
         restaurant.addConfiguration(dinnerMenu);
         GBeanOverride pizza = new GBeanOverride("Pizza", false, expressionParser);
-        pizza.setAttribute("cheese", "mozzarella");
-        pizza.setAttribute("size", "x-large");
-        pizza.setAttribute("emptyString", "");
+        pizza.setAttribute(cheeseInfo, "mozzarella", bundle);
+        pizza.setAttribute(sizeInfo, "x-large", bundle);
+        pizza.setAttribute(emptyStringInfo, "", bundle);
         pizza.setClearAttribute("greenPeppers");
         pizza.setNullAttribute("pineapple");
         AbstractNameQuery pizzaOvenQuery = getAbstractNameQuery(":name=PizzaOven");
@@ -258,22 +268,22 @@
         GBeanOverride gbean = new GBeanOverride(gbeanElement, expressionParser);
         assertCopyIdentical(gbean);
         GBeanData data = new GBeanData(MockGBean.GBEAN_INFO);
-        gbean.setAttribute("port", "${port}");
-        gbean.applyOverrides(data, null, null, getClass().getClassLoader());
+        gbean.setAttribute(portInfo, "${port}", bundle);
+        gbean.applyOverrides(data, null, null, bundle);
         assertEquals(8080, data.getAttribute("port"));
-        gbean.setAttribute("port", "${port + 1}");
-        gbean.applyOverrides(data, null, null, getClass().getClassLoader());
+        gbean.setAttribute(portInfo, "${port + 1}", bundle);
+        gbean.applyOverrides(data, null, null, bundle);
         assertEquals(8081, data.getAttribute("port"));
-        gbean.setAttribute("port", "${port + portOffset}");
-        gbean.applyOverrides(data, null, null, getClass().getClassLoader());
+        gbean.setAttribute(portInfo, "${port + portOffset}", bundle);
+        gbean.applyOverrides(data, null, null, bundle);
         assertEquals(8081, data.getAttribute("port"));
         
-        gbean.setAttribute("expression", "${if (java == null) 'null'; else 'non-null';}");
-        gbean.applyOverrides(data, null, null, getClass().getClassLoader());
+        gbean.setAttribute(expressionInfo, "${if (java == null) 'null'; else 'non-null';}", bundle);
+        gbean.applyOverrides(data, null, null, bundle);
         assertEquals("non-null", data.getAttribute("expression"));
         
-        gbean.setAttribute("expression", "${if (java == null) { 'null'; } else { if (os == null) { 'java,null'; } else { 'java,non-null'; } } }");
-        gbean.applyOverrides(data, null, null, getClass().getClassLoader());
+        gbean.setAttribute(expressionInfo, "${if (java == null) { 'null'; } else { if (os == null) { 'java,null'; } else { 'java,non-null'; } } }", bundle);
+        gbean.applyOverrides(data, null, null, bundle);
         assertEquals("java,non-null", data.getAttribute("expression"));
     }
 

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/condition/
------------------------------------------------------------------------------
--- 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-system/src/test/java/org/apache/geronimo/system/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-system/src/test/java/org/apache/geronimo/system/logging/log4j/
------------------------------------------------------------------------------
--- 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-system/src/test/java/org/apache/geronimo/system/properties/
------------------------------------------------------------------------------
--- 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-system/src/test/java/org/apache/geronimo/system/serverinfo/
------------------------------------------------------------------------------
--- 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-system/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-system/src/test/resources/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-system/src/test/resources/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-system/src/test/resources/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-system/src/test/resources/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-system/src/test/resources/org/apache/geronimo/system/configuration/
------------------------------------------------------------------------------
--- 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-system/src/test/resources/org/apache/geronimo/system/url/
------------------------------------------------------------------------------
--- 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-system/src/test/resources/org/apache/geronimo/system/url/resource/
------------------------------------------------------------------------------
--- 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-transformer/
------------------------------------------------------------------------------
--- 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-transformer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-transformer/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-transformer/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-transformer/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-transformer</artifactId>
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Transformer</name>
 
     <dependencies>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-transformer/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-transformer/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-transformer/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-transformer/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-transformer/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-transformer/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-transformer/src/main/java/org/apache/geronimo/transformer/
------------------------------------------------------------------------------
--- 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-upgrade/
------------------------------------------------------------------------------
--- 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-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/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-upgrade</artifactId>
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Upgrade</name>
     
     <dependencies>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/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-upgrade/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-upgrade/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-upgrade/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-upgrade/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-upgrade/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-upgrade/src/main/java/org/apache/geronimo/upgrade/
------------------------------------------------------------------------------
--- 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-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java Sat Aug 29 00:51:12 2009
@@ -71,8 +71,8 @@
 
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(UpgradeGBean.class);
-        infoBuilder.addOperation("execute", new Class[] {String[].class});
-        infoBuilder.addOperation("execute", new Class[] {String.class, String.class});
+//        infoBuilder.addOperation("execute", new Class[] {String[].class});
+//        infoBuilder.addOperation("execute", new Class[] {String.class, String.class});
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/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-upgrade/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-upgrade/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-upgrade/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-upgrade/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-upgrade/src/test/java/org/apache/geronimo/upgrade/
------------------------------------------------------------------------------
--- 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-upgrade/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-upgrade/src/test/resources/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/gbean_1.xml Sat Aug 29 00:51:12 2009
@@ -18,7 +18,7 @@
 
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
   configId="hello"
-  parentId="geronimo/j2ee-security/2.2-SNAPSHOT/car">
+  parentId="geronimo/j2ee-security/3.0-SNAPSHOT/car">
 
 
     <gbean name="hello-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
@@ -27,10 +27,10 @@
             <name>hello-login-chain</name>
         </reference>
         <reference name="ServerInfo">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-system/2.2-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-system/3.0-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
         </reference>
         <reference name="LoginService">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-security/2.2-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=JaasLoginService,name=JaasLoginService</gbean-name>
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-security/3.0-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=JaasLoginService,name=JaasLoginService</gbean-name>
         </reference>
     </gbean>
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/gbean_1_result.xml Sat Aug 29 00:51:12 2009
@@ -28,7 +28,7 @@
       <dep:dependency>
         <dep:groupId>geronimo</dep:groupId>
         <dep:artifactId>j2ee-security</dep:artifactId>
-        <dep:version>2.2-SNAPSHOT</dep:version>
+        <dep:version>3.0-SNAPSHOT</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
     </dep:dependencies>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>modules</artifactId>
@@ -120,4 +120,30 @@
         </profile>
     </profiles>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>maven-bundle-plugin</artifactId>
+                  <version>2.0.0</version>
+                  <extensions>true</extensions>
+                  <configuration>
+                    <instructions>
+                      <Implementation-Title>${project.name}</Implementation-Title>
+                      <Implementation-Version>${project.version}</Implementation-Version>
+                      <Bundle-DocURL>${project.url}</Bundle-DocURL>
+                    </instructions>
+                  </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml Sat Aug 29 00:51:12 2009
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.testsupport</groupId>
@@ -59,6 +59,26 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-container-default</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit-extender-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.runner</groupId>
+            <artifactId>pax-runner-no-jcl</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

Modified: geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java Sat Aug 29 00:51:12 2009
@@ -24,6 +24,7 @@
 import junit.framework.TestCase;
 
 import org.slf4j.Logger;
+import org.osgi.framework.BundleContext;
 
 /**
  * Provides support for tests.
@@ -33,6 +34,9 @@
 public abstract class TestSupport
     extends TestCase
 {
+//    @Inject
+    protected BundleContext bundleContext;
+
 
     private final TestUtil testUtil;
     
@@ -64,6 +68,7 @@
         BASEDIR = testUtil.getBaseDir();
         log = testUtil.getLog();
         
+//        bundleContext = new MockBundleContext(getClass().getClassLoader(), BASEDIR.getAbsolutePath());
         log.info("Initialized");
     }
     
@@ -78,9 +83,14 @@
         BASEDIR = testUtil.getBaseDir();
         log = testUtil.getLog();
 
+//        bundleContext = new MockBundleContext(getClass().getClassLoader(), BASEDIR.getAbsolutePath());
         log.info("Initialized");
     }
-    
+
+    public BundleContext getBundleContext() {
+        return bundleContext;
+    }
+
     protected File getBaseDir() {
         return BASEDIR;
     }

Propchange: geronimo/sandbox/djencks/osgi/framework/plugingroups/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+

Propchange: geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+

Modified: geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/pom.xml Sat Aug 29 00:51:12 2009
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>plugingroups</artifactId>
         <groupId>org.apache.geronimo.framework.plugingroups</groupId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>framework</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/plugingroups/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/plugingroups/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/plugingroups/pom.xml Sat Aug 29 00:51:12 2009
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.framework.plugingroups</groupId>
@@ -61,7 +61,6 @@
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,13 +25,78 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.framework</groupId>
     <artifactId>framework</artifactId>
     <name>Geronimo Framework</name>
     <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-default</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit-extender-impl</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.runner</groupId>
+                <artifactId>pax-runner-no-jcl</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.configadmin</artifactId>
+                <version>1.0.10</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-api</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-service</artifactId>
+                <version>1.3.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                    <!--<exclusion>-->
+                        <!--<groupId>javax</groupId>-->
+                        <!--<artifactId>jms</artifactId>-->
+                    <!--</exclusion>-->
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.url</groupId>
+                <artifactId>pax-url-mvn</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     
     <!--<dependencies>-->
         <!--<dependency>-->



Mime
View raw message