servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r679830 - in /servicemix/smx4/kernel/trunk: assembly/src/main/descriptors/ assembly/src/main/distribution/text/etc/ assembly/src/main/filtered-resources/etc/ gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/e...
Date Fri, 25 Jul 2008 15:11:44 GMT
Author: gnodet
Date: Fri Jul 25 08:11:43 2008
New Revision: 679830

URL: http://svn.apache.org/viewvc?rev=679830&view=rev
Log:
SMX4KNL-61, SMX4KNL-65: Organize the system folder as a maven 2 repository, After copying
or moving the kernel, it does not start in a very clean way anymore

Modified:
    servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
    servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.ops4j.pax.url.mvn.cfg
    servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=679830&r1=679829&r2=679830&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Jul 25 08:11:43
2008
@@ -98,55 +98,102 @@
 
     <dependencySets>
 
-        <!-- Mandatory bundles for everything -->
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
-            <scope>runtime</scope>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <!-- Compendium -->
                 <include>org.apache.felix:org.osgi.compendium</include>
-                <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-
-                <!-- PAX Logging -->
+                <include>org.apache.felix:org.apache.felix.configadmin</include>
+                <include>org.apache.felix:org.apache.felix.bundlerepository</include>
+                <include>org.apache.felix:org.apache.felix.prefs</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
                 <include>org.ops4j.pax.logging:pax-logging-api</include>
                 <include>org.ops4j.pax.logging:pax-logging-service</include>
-
-                <!-- PAX config -->
-                <include>org.apache.felix:org.apache.felix.configadmin</include>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
-
-                <!-- Spring OSGi -->
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.ops4j.pax.url:pax-url-mvn</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
                 <include>org.springframework:spring-aop</include>
                 <include>org.springframework:spring-beans</include>
                 <include>org.springframework:spring-context</include>
                 <include>org.springframework:spring-core</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
                 <include>org.springframework.osgi:spring-osgi-core</include>
                 <include>org.springframework.osgi:spring-osgi-extender</include>
                 <include>org.springframework.osgi:spring-osgi-io</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
-
-                <!-- JAAS -->
-                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
-                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.keystore</include>
-
-                <!-- GShell -->
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/kernel/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
+                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/kernel/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
-
-		        <!-- OBR + GShell command -->
-                <include>org.apache.felix:org.apache.felix.bundlerepository</include>
-                <include>org.apache.felix:org.apache.felix.prefs</include>
-                <include>org.ops4j.pax.url:pax-url-mvn</include>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
-
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
+                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.keystore</include>
             </includes>
         </dependencySet>
 

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=679830&r1=679829&r2=679830&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Jul 25
08:11:43 2008
@@ -90,55 +90,102 @@
 
     <dependencySets>
 
-        <!-- Mandatory bundles for everything -->
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
-            <scope>runtime</scope>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
-                <!-- Compendium -->
                 <include>org.apache.felix:org.osgi.compendium</include>
-                <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-
-                <!-- PAX Logging -->
+                <include>org.apache.felix:org.apache.felix.configadmin</include>
+                <include>org.apache.felix:org.apache.felix.bundlerepository</include>
+                <include>org.apache.felix:org.apache.felix.prefs</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
                 <include>org.ops4j.pax.logging:pax-logging-api</include>
                 <include>org.ops4j.pax.logging:pax-logging-service</include>
-
-                <!-- PAX config -->
-                <include>org.apache.felix:org.apache.felix.configadmin</include>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
-
-                <!-- Spring OSGi -->
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.ops4j.pax.url:pax-url-mvn</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
                 <include>org.springframework:spring-aop</include>
                 <include>org.springframework:spring-beans</include>
                 <include>org.springframework:spring-context</include>
                 <include>org.springframework:spring-core</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
                 <include>org.springframework.osgi:spring-osgi-core</include>
                 <include>org.springframework.osgi:spring-osgi-extender</include>
                 <include>org.springframework.osgi:spring-osgi-io</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
-
-                <!-- JAAS -->
-                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
-                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.keystore</include>
-
-                <!-- GShell -->
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/kernel/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
+                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/kernel/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
-
-                <!-- OBR + GShell command -->
-                <include>org.apache.felix:org.apache.felix.bundlerepository</include>
-                <include>org.apache.felix:org.apache.felix.prefs</include>
-                <include>org.ops4j.pax.url:pax-url-mvn</include>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
                 <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
-
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
+                <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.keystore</include>
             </includes>
         </dependencySet>
 

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?rev=679830&r1=679829&r2=679830&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
Fri Jul 25 08:11:43 2008
@@ -58,4 +58,4 @@
 #
 # For example, the following property will add the Apache Snapshots repository to
 # the default list of repositories.
-org.ops4j.pax.url.mvn.repositories=+http://people.apache.org/repo/m2-snapshot-repository/@snapshots@noreleases
+org.ops4j.pax.url.mvn.repositories=+file:${servicemix.home}/system,http://people.apache.org/repo/m2-snapshot-repository/@snapshots@noreleases

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=679830&r1=679829&r2=679830&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Fri Jul 25 08:11:43 2008
@@ -23,40 +23,40 @@
 #
 # Startup core services like logging
 #
-geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
-org.osgi.compendium-${felix.compendium.version}.jar=10
-org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
-org.apache.servicemix.kernel.filemonitor-${pom.version}.jar=15
-pax-logging-api-${pax.logging.version}.jar=20
-pax-logging-service-${pax.logging.version}.jar=20
-org.apache.felix.prefs-${felix.prefs.version}.jar=10
+org/ops4j/pax/url/pax-url-mvn/${pax.url.version}/pax-url-mvn-${pax.url.version}.jar=5
+org/apache/geronimo/specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}/geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
+org/apache/felix/org.osgi.compendium/${felix.compendium.version}/org.osgi.compendium-${felix.compendium.version}.jar=10
+org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
+org/apache/servicemix/kernel/org.apache.servicemix.kernel.filemonitor/${pom.version}/org.apache.servicemix.kernel.filemonitor-${pom.version}.jar=15
+org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=20
+org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=20
+org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
 
 #
 # The rest of the services..
 #
-org.apache.servicemix.bundles.ant-${ant.version}.jar=50
-org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
-org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
-org.apache.servicemix.bundles.mina-${mina.version}.jar=50
-spring-aop-${spring.version}.jar=50
-spring-beans-${spring.version}.jar=50
-spring-context-${spring.version}.jar=50
-spring-core-${spring.version}.jar=50
-spring-osgi-core-${spring.osgi.version}.jar=50
-spring-osgi-extender-${spring.osgi.version}.jar=50
-spring-osgi-io-${spring.osgi.version}.jar=50
-org.apache.servicemix.kernel.spring-${pom.version}.jar=50
-org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
-pax-url-mvn-${pax.url.version}.jar=50
-org.apache.servicemix.kernel.gshell.obr-${pom.version}.jar=50
-org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=50
-org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=50
-org.apache.servicemix.kernel.gshell.log-${pom.version}.jar=50
-org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=50
-org.apache.servicemix.kernel.jaas.keystore-${pom.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.ant/${ant.version}/org.apache.servicemix.bundles.ant-${ant.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}/org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/${cglib.version}/org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.mina/${mina.version}/org.apache.servicemix.bundles.mina-${mina.version}.jar=50
+org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar=50
+org/springframework/spring-beans/${spring.version}/spring-beans-${spring.version}.jar=50
+org/springframework/spring-context/${spring.version}/spring-context-${spring.version}.jar=50
+org/springframework/spring-core/${spring.version}/spring-core-${spring.version}.jar=50
+org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar=50
+org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar=50
+org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar=50
+org/apache/servicemix/kernel/org.apache.servicemix.kernel.spring/${pom.version}/org.apache.servicemix.kernel.spring-${pom.version}.jar=50
+org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.obr/${pom.version}/org.apache.servicemix.kernel.gshell.obr-${pom.version}.jar=50
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.osgi/${pom.version}/org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=50
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.features/${pom.version}/org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=50
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.log/${pom.version}/org.apache.servicemix.kernel.gshell.log-${pom.version}.jar=50
+org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.config/${pom.version}/org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=50
+org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.keystore/${pom.version}/org.apache.servicemix.kernel.jaas.keystore-${pom.version}.jar=50
 
 #
 # Start console last
 #
-org.apache.servicemix.kernel.gshell.core-${pom.version}.jar=100
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.core/${pom.version}/org.apache.servicemix.kernel.gshell.core-${pom.version}.jar=100
 

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties?rev=679830&r1=679829&r2=679830&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
Fri Jul 25 08:11:43 2008
@@ -23,40 +23,40 @@
 #
 # Startup core services like logging
 #
-geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
-org.osgi.compendium-${felix.compendium.version}.jar=10
-org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
-org.apache.servicemix.kernel.filemonitor-${pom.version}.jar=15
-pax-logging-api-${pax.logging.version}.jar=20
-pax-logging-service-${pax.logging.version}.jar=20
-org.apache.felix.prefs-${felix.prefs.version}.jar=10
+org/ops4j/pax/url/pax-url-mvn/${pax.url.version}/pax-url-mvn-${pax.url.version}.jar=5
+org/apache/geronimo/specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}/geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
+org/apache/felix/org.osgi.compendium/${felix.compendium.version}/org.osgi.compendium-${felix.compendium.version}.jar=10
+org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
+org/apache/servicemix/kernel/org.apache.servicemix.kernel.filemonitor/${pom.version}/org.apache.servicemix.kernel.filemonitor-${pom.version}.jar=15
+org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=20
+org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=20
+org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
 
 #
 # The rest of the services..
 #
-org.apache.servicemix.bundles.ant-${ant.version}.jar=50
-org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
-org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
-org.apache.servicemix.bundles.mina-${mina.version}.jar=50
-spring-aop-${spring.version}.jar=50
-spring-beans-${spring.version}.jar=50
-spring-context-${spring.version}.jar=50
-spring-core-${spring.version}.jar=50
-spring-osgi-core-${spring.osgi.version}.jar=50
-spring-osgi-extender-${spring.osgi.version}.jar=50
-spring-osgi-io-${spring.osgi.version}.jar=50
-org.apache.servicemix.kernel.spring-${pom.version}.jar=50
-org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
-pax-url-mvn-${pax.url.version}.jar=50
-org.apache.servicemix.kernel.gshell.obr-${pom.version}.jar=50
-org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=50
-org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=50
-org.apache.servicemix.kernel.gshell.log-${pom.version}.jar=50
-org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=50
-org.apache.servicemix.kernel.jaas.keystore-${pom.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.ant/${ant.version}/org.apache.servicemix.bundles.ant-${ant.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}/org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/${cglib.version}/org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.mina/${mina.version}/org.apache.servicemix.bundles.mina-${mina.version}.jar=50
+org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar=50
+org/springframework/spring-beans/${spring.version}/spring-beans-${spring.version}.jar=50
+org/springframework/spring-context/${spring.version}/spring-context-${spring.version}.jar=50
+org/springframework/spring-core/${spring.version}/spring-core-${spring.version}.jar=50
+org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar=50
+org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar=50
+org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar=50
+org/apache/servicemix/kernel/org.apache.servicemix.kernel.spring/${pom.version}/org.apache.servicemix.kernel.spring-${pom.version}.jar=50
+org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.obr/${pom.version}/org.apache.servicemix.kernel.gshell.obr-${pom.version}.jar=50
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.osgi/${pom.version}/org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=50
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.features/${pom.version}/org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=50
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.log/${pom.version}/org.apache.servicemix.kernel.gshell.log-${pom.version}.jar=50
+org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.config/${pom.version}/org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=50
+org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.keystore/${pom.version}/org.apache.servicemix.kernel.jaas.keystore-${pom.version}.jar=50
 
 #
 # Start console last
 #
-org.apache.servicemix.kernel.gshell.core-${pom.version}.jar=100
+org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.core/${pom.version}/org.apache.servicemix.kernel.gshell.core-${pom.version}.jar=100
 

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.ops4j.pax.url.mvn.cfg?rev=679830&r1=679829&r2=679830&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.ops4j.pax.url.mvn.cfg
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.ops4j.pax.url.mvn.cfg
Fri Jul 25 08:11:43 2008
@@ -58,4 +58,4 @@
 #
 # For example, the following property will add the Apache Snapshots repository to
 # the default list of repositories.
-org.ops4j.pax.url.mvn.repositories=+http://people.apache.org/repo/m2-snapshot-repository/@snapshots@noreleases
+org.ops4j.pax.url.mvn.repositories=+file:${servicemix.base}/system,file:${servicemix.home}/system,http://people.apache.org/repo/m2-snapshot-repository/@snapshots@noreleases

Modified: servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java?rev=679830&r1=679829&r2=679830&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
(original)
+++ servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
Fri Jul 25 08:11:43 2008
@@ -104,6 +104,11 @@
      */
     public static final String BUNDLE_LOCATIONS = "bundle.locations";
 
+    /**
+     * Config property that indicates we want to convert bundles locations to maven style
urls
+     */
+    public static final String PROPERTY_CONVERT_TO_MAVEN_URL = "servicemix.maven.convert";
+
     private File servicemixHome;
     private File servicemixBase;
     private static Properties m_configProps = null;
@@ -374,6 +379,9 @@
      * specified configuration properties.
      */
     private static void processAutoProperties(BundleContext context) {
+        // Check if we want to convert URLs to maven style
+        boolean convertToMavenUrls = Boolean.parseBoolean(m_configProps.getProperty(PROPERTY_CONVERT_TO_MAVEN_URL,
"true"));
+
         // Retrieve the Start Level service, since it will be needed
         // to set the start level of the installed bundles.
         StartLevel sl = (StartLevel) context.getService(
@@ -412,7 +420,8 @@
                     location = nextLocation(st);
                     if (location != null) {
                         try {
-                            Bundle b = context.installBundle(location, null);
+                            String[] parts = convertToMavenUrlsIfNeeded(location, convertToMavenUrls);
+                            Bundle b = context.installBundle(parts[0], new URL(parts[1]).openStream());
                             sl.setBundleStartLevel(b, startLevel);
                         }
                         catch (Exception ex) {
@@ -459,7 +468,8 @@
                     location = nextLocation(st);
                     if (location != null) {
                         try {
-                            Bundle b = context.installBundle(location, null);
+                            String[] parts = convertToMavenUrlsIfNeeded(location, convertToMavenUrls);
+                            Bundle b = context.installBundle(parts[0], new URL(parts[1]).openStream());
                             sl.setBundleStartLevel(b, startLevel);
                         }
                         catch (Exception ex) {
@@ -483,7 +493,8 @@
                         if (location != null) {
                             // Installing twice just returns the same bundle.
                             try {
-                                Bundle b = context.installBundle(location, null);
+                                String[] parts = convertToMavenUrlsIfNeeded(location, convertToMavenUrls);
+                                Bundle b = context.installBundle(parts[0], new URL(parts[1]).openStream());
                                 if (b != null) {
                                     b.start();
                                 }
@@ -499,6 +510,50 @@
         }
     }
 
+    private static String[] convertToMavenUrlsIfNeeded(String location, boolean convertToMavenUrls)
{
+        String[] parts = location.split("\\|");
+        if (convertToMavenUrls) {
+            String[] p = parts[1].split("/");
+            String groupId = null;
+            String artifactId = p[p.length-3];
+            String version = p[p.length-2];
+            String classifier;
+            String type;
+            String artifactIdVersion = artifactId + "-" + version;
+            StringBuffer sb = new StringBuffer();
+            if (p.length >= 4 && p[p.length-1].startsWith(artifactIdVersion))
{
+                if (p[p.length-1].charAt(artifactIdVersion.length()) == '-') {
+                    classifier = p[p.length-1].substring(artifactIdVersion.length() + 1,
p[p.length-1].lastIndexOf('.'));
+                } else {
+                    classifier = null;
+                }
+                type = p[p.length-1].substring(p[p.length-1].lastIndexOf('.') + 1);
+                sb.append("mvn:");
+                for (int j = 0; j < p.length - 3; j++) {
+                    if (j > 0) {
+                        sb.append('.');
+                    }
+                    sb.append(p[j]);
+                }
+                sb.append('/').append(artifactId).append('/').append(version);
+                if (!"jar".equals(type) || classifier != null) {
+                    sb.append('/');
+                    if (!"jar".equals(type)) {
+                        sb.append(type);
+                    }
+                    if (classifier != null) {
+                        sb.append('/').append(classifier);
+                    }
+                }
+                parts[1] = parts[0];
+                parts[0] = sb.toString();
+            }
+        } else {
+            parts[1] = parts[0];
+        }
+        return parts;
+    }
+
     private static String nextLocation(StringTokenizer st) {
         String retVal = null;
 
@@ -627,7 +682,7 @@
         // installation directory.  Try to load it from one of these
         // places.
 
-        ArrayList<File> bundleDirs = new ArrayList<File>();
+            ArrayList<File> bundleDirs = new ArrayList<File>();
 
         // See if the property URL was specified as a property.
         URL configPropURL = null;
@@ -784,7 +839,7 @@
                         levels.put(level, sb);
                     }
                     try {
-                        sb.append("\"").append(file.toURL().toString()).append("\" ");
+                        sb.append("\"").append(file.toURL().toString()).append("|").append(name).append("\"
");
                     } catch (MalformedURLException e) {
                         System.err.print("Ignoring " + file.toString() + " (" + e + ")");
                     }



Mime
View raw message