servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r602171 - in /servicemix/branches/servicemix-4.0/runtime/minimum: ./ src/main/descriptors/ src/main/filtered-resources/ src/main/filtered-resources/etc/ src/main/release/etc/
Date Fri, 07 Dec 2007 18:20:32 GMT
Author: chirino
Date: Fri Dec  7 10:20:30 2007
New Revision: 602171

URL: http://svn.apache.org/viewvc?rev=602171&view=rev
Log:
Filtering the startup.properties now

Added:
    servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/
    servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/etc/
    servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/etc/startup.properties
  (with props)
Removed:
    servicemix/branches/servicemix-4.0/runtime/minimum/src/main/release/etc/startup.properties
Modified:
    servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml
    servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml
    servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml

Modified: servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml?rev=602171&r1=602170&r2=602171&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml Fri Dec  7 10:20:30 2007
@@ -350,7 +350,29 @@
       
     </dependencies>
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/filtered-resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

Modified: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml?rev=602171&r1=602170&r2=602171&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/unix-bin.xml Fri
Dec  7 10:20:30 2007
@@ -41,6 +41,11 @@
             <lineEnding>unix</lineEnding>
         </fileSet>
         <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+        <fileSet>
             <directory>src/main/release</directory>
             <outputDirectory>/</outputDirectory>
             <includes>

Modified: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml?rev=602171&r1=602170&r2=602171&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml
(original)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/src/main/descriptors/windows-bin.xml
Fri Dec  7 10:20:30 2007
@@ -38,8 +38,13 @@
             <excludes>
                 <exclude>bin/**</exclude>
             </excludes>
-            <lineEnding>unix</lineEnding>
+            <lineEnding>dos</lineEnding>
         </fileSet>
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </fileSet>        
         <fileSet>
             <directory>src/main/release</directory>
             <outputDirectory>/</outputDirectory>

Added: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/etc/startup.properties?rev=602171&view=auto
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/etc/startup.properties
(added)
+++ servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/etc/startup.properties
Fri Dec  7 10:20:30 2007
@@ -0,0 +1,39 @@
+# This file allows you to control the start level of each bundle.
+#
+
+# TODO: replace all the version numbers here with variable refs.
+
+#
+# Libs that don't start services should probably get loaded first.
+#
+org.apache.servicemix.bundles.ant-1.7.0-4.0-SNAPSHOT.jar=10
+org.apache.servicemix.bundles.aopalliance-1.0-4.0-SNAPSHOT.jar=10
+org.apache.servicemix.bundles.cglib-2.1_3-4.0-SNAPSHOT.jar=10
+org.apache.servicemix.bundles.mina-1.1.6-r602102-4.0-SNAPSHOT.jar=10
+org.apache.servicemix.bundles.xstream-1.2.2-4.0-SNAPSHOT.jar=10
+geronimo-servlet_2.5_spec-1.1.1-SNAPSHOT.jar=10
+geronimo-stax-api_1.0_spec-1.0.1-SNAPSHOT.jar=10
+org.osgi.compendium-0.9.0-20070713.230317-1.jar=10
+spring-aop-2.5.jar=10
+spring-beans-2.5.jar=10
+spring-context-2.5.jar=10
+spring-core-2.5.jar=10
+spring-osgi-core-1.0-m3.jar=10
+spring-osgi-extender-1.0-m3.jar=10
+spring-osgi-io-1.0-m3.jar=10
+
+#
+# Startup core services like logging
+#
+pax-logging-api-0.9.8-20071205.114123-4.jar=20
+pax-logging-service-0.9.8-20071205.114123-4.jar=20
+org.apache.servicemix.runtime.filemonitor-${version}.jar=20
+
+#
+# The rest of the services..
+#
+org.apache.felix.bundlerepository-1.1.0-20071205.111236-2.jar=50
+org.apache.felix.configadmin-0.9.0-20070906.081947-8.jar=50
+org.apache.servicemix.gshell.core-${version}.jar=50
+org.apache.servicemix.gshell.obr-${version}.jar=50
+org.apache.servicemix.gshell.osgi-${version}.jar=50

Propchange: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/etc/startup.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/etc/startup.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: servicemix/branches/servicemix-4.0/runtime/minimum/src/main/filtered-resources/etc/startup.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message