geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r822933 - in /geronimo/sandbox/djencks/osgi/framework: buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ configs/client-system/src/main/history/ configs/geronimo-gbean-deployer-bootstrap/src/main/history/ con...
Date Wed, 07 Oct 2009 21:52:49 GMT
Author: djencks
Date: Wed Oct  7 21:52:47 2009
New Revision: 822933

URL: http://svn.apache.org/viewvc?rev=822933&view=rev
Log:
With several tries, all the plugin bundles will start as bundles, but not as plugins

Modified:
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
    geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ConfigTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
Wed Oct  7 21:52:47 2009
@@ -189,6 +189,7 @@
 
     public void execute() throws MojoExecutionException, MojoFailureException {
         try {
+            System.setProperty("geronimo.build.car", "true");
 // We need to make sure to clean up any previous work first or this operation will fail
             FileUtils.forceDelete(targetRepository);
             FileUtils.forceMkdir(targetRepository);

Modified: geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml
Wed Oct  7 21:52:47 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
Wed Oct  7 21:52:47 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
Wed Oct  7 21:52:47 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
Wed Oct  7 21:52:47 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml
Wed Oct  7 21:52:47 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
Wed Oct  7 21:52:47 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
Wed Oct  7 21:52:47 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/pom.xml Wed Oct  7 21:52:47
2009
@@ -276,10 +276,10 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.impl.bundle.jmx</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse</groupId>-->
-            <!--<artifactId>osgi</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
Wed Oct  7 21:52:47 2009
@@ -21,6 +21,7 @@
 # Framework selection properties
 #
 karaf.framework=felix
+#karaf.framework=equinox
 
 karaf.framework.equinox=repository/org/eclipse/osgi/${equinox.version}/osgi-${equinox.version}.jar
 karaf.framework.felix=repository/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar

Modified: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Wed Oct  7 21:52:47 2009
@@ -51,12 +51,12 @@
 org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${felix.karaf.version}/org.apache.felix.karaf.jaas.config-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.modules/${felix.karaf.version}/org.apache.felix.karaf.jaas.modules-${felix.karaf.version}.jar=30
 
-org/apache/felix/karaf/features/org.apache.felix.karaf.features.core/${felix.karaf.version}/org.apache.felix.karaf.features.core-${felix.karaf.version}.jar=30
-org/apache/felix/karaf/features/org.apache.felix.karaf.features.command/${felix.karaf.version}/org.apache.felix.karaf.features.command-${felix.karaf.version}.jar=30
-org/apache/felix/karaf/features/org.apache.felix.karaf.features.management/${felix.karaf.version}/org.apache.felix.karaf.features.management-${felix.karaf.version}.jar=30
+#org/apache/felix/karaf/features/org.apache.felix.karaf.features.core/${felix.karaf.version}/org.apache.felix.karaf.features.core-${felix.karaf.version}.jar=30
+#org/apache/felix/karaf/features/org.apache.felix.karaf.features.command/${felix.karaf.version}/org.apache.felix.karaf.features.command-${felix.karaf.version}.jar=30
+#org/apache/felix/karaf/features/org.apache.felix.karaf.features.management/${felix.karaf.version}/org.apache.felix.karaf.features.management-${felix.karaf.version}.jar=30
 
-org/apache/felix/karaf/org.apache.felix.karaf.management/${felix.karaf.version}/org.apache.felix.karaf.management-${felix.karaf.version}.jar=30
-org/osgi/org.osgi.impl.bundle.jmx/${osgi.jmx.version}/org.osgi.impl.bundle.jmx-${osgi.jmx.version}.jar=30
+#org/apache/felix/karaf/org.apache.felix.karaf.management/${felix.karaf.version}/org.apache.felix.karaf.management-${felix.karaf.version}.jar=30
+#org/osgi/org.osgi.impl.bundle.jmx/${osgi.jmx.version}/org.osgi.impl.bundle.jmx-${osgi.jmx.version}.jar=30
 
 org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
 org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30

Modified: geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
Wed Oct  7 21:52:47 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml Wed Oct  7 21:52:47
2009
@@ -124,7 +124,7 @@
                             </config-xml-content>
                             <config-substitution key="ServerHostname">0.0.0.0</config-substitution>
                             <config-substitution key="PortOffset">0</config-substitution>
-                            <config-substitution key="NamingPort">2099</config-substitution>
+                            <config-substitution key="NamingPort">1099</config-substitution>
                             <config-substitution key="MinThreadPoolSize">200</config-substitution>
                             <config-substitution key="MaxThreadPoolSize">500</config-substitution>
                         </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml Wed Oct
 7 21:52:47 2009
@@ -69,7 +69,7 @@
                     <category>Security</category>
                     <instance>
                         <plugin-artifact>
-                            <copy-file relative-to="server" dest-dir="var">security/</copy-file>
+                            <copy-file relative-to="server" dest-dir="var/security">security/</copy-file>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
Wed Oct  7 21:52:47 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml Wed Oct
 7 21:52:47 2009
@@ -48,6 +48,26 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <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>
+                    <Import-Package>org.apache.xbean.naming,org.apache.xbean.naming.global,*</Import-Package>
+                </instructions>
+              </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
     
 </project>
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
Wed Oct  7 21:52:47 2009
@@ -310,7 +310,7 @@
             configurationModel.addConfiguration(configurationId,
                     Collections.<Artifact>emptySet(),
                     Collections.<Artifact>emptySet());
-//            configurations.put(configuration.getId(), configuration);
+//            configurations.put(configurationId, configuration);
 
 //            throw new NoSuchConfigException(configurationId, "not loaded");
         }
@@ -626,6 +626,9 @@
     }
 
     private String locateBundle(Artifact configurationId, LifecycleMonitor monitor) throws
NoSuchConfigException, IOException, InvalidConfigException {
+        if (System.getProperty("geronimo.build.car") == null) {
+            return "mvn:" + configurationId.getGroupId() + "/" + configurationId.getArtifactId()
+ "/" + configurationId.getVersion() + "/" + configurationId.getType();
+        }
         monitor.addConfiguration(configurationId);
         monitor.reading(configurationId);
         for (Repository repo : repositories) {
@@ -703,7 +706,9 @@
             for (Artifact unstartedConfiguration : unstartedConfigurations) {
                 configurationId = unstartedConfiguration;
                 Configuration configuration = getConfiguration(configurationId);
-
+                if (configuration == null) {
+                    throw new NoSuchConfigException(configurationId, "trying to start ancestor
config, but not found");
+                }
                 monitor.starting(configurationId);
                 start(configuration);
                 monitor.succeeded(configurationId);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ConfigTest.java?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ConfigTest.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ConfigTest.java
Wed Oct  7 21:52:47 2009
@@ -179,6 +179,7 @@
 //    }
 
     protected void setUp() throws Exception {
+        System.setProperty("geronimo.build.car", "true");
         super.setUp();
         kernel = KernelFactory.newInstance(bundleContext).createKernel("test");
         kernel.boot();

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java
Wed Oct  7 21:52:47 2009
@@ -676,6 +676,7 @@
     }
 
     protected void setUp() throws Exception {
+        System.setProperty("geronimo.build.car", "true");
         super.setUp();
 
         shouldFail.clear();

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=822933&r1=822932&r2=822933&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
Wed Oct  7 21:52:47 2009
@@ -1403,9 +1403,9 @@
                         start = path.lastIndexOf("!/") + 2 + sourceFile.length();
                     } else {
                         start = path.length();
-                        //this entry needs nothing done
-                        continue;
                     }
+                    //this entry needs nothing done
+                    continue;
                 } else {
                     String remove = sourceFile;
                     int pos = sourceFile.lastIndexOf('/');
@@ -1436,11 +1436,8 @@
                 log.error("Plugin install cannot write to file {}", target.getAbsolutePath());
                 continue;
             }
-            try {
-                copyFile(url.openStream(), new FileOutputStream(target));
-            } catch (NullPointerException e) {
-                throw (NullPointerException) new NullPointerException("problem copying path:
" + path + " for artifact " + configID).initCause(e);
-            }
+            InputStream in = url.openStream();
+            copyFile(in, new FileOutputStream(target));
         }
     }
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java?rev=822933&r1=822932&r2=822933&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
Wed Oct  7 21:52:47 2009
@@ -113,6 +113,9 @@
     }
 
     private String locateBundle(Artifact configurationId) throws NoSuchConfigException, IOException,
InvalidConfigException {
+        if (System.getProperty("geronimo.build.car") == null) {
+            return "mvn:" + configurationId.getGroupId() + "/" + configurationId.getArtifactId()
+ "/" + configurationId.getVersion() + "/" + configurationId.getType();
+        }
         for (Repository repo : repositories) {
             if (repo.contains(configurationId)) {
                 return "reference:file://" + repo.getLocation(configurationId).getAbsolutePath();



Mime
View raw message