servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r588687 - in /incubator/servicemix/branches/servicemix-4.0/apache-servicemix: pom.xml src/main/descriptors/unix-bin.xml src/main/descriptors/unix-src.xml src/main/descriptors/windows-bin.xml src/main/descriptors/windows-src.xml
Date Fri, 26 Oct 2007 15:26:57 GMT
Author: gnodet
Date: Fri Oct 26 08:26:56 2007
New Revision: 588687

URL: http://svn.apache.org/viewvc?rev=588687&view=rev
Log:
Add windows and sources distributions

Modified:
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml?rev=588687&r1=588686&r2=588687&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Fri Oct 26 08:26:56
2007
@@ -273,46 +273,44 @@
                             <appendAssemblyId>false</appendAssemblyId>
                         </configuration>
                     </execution>
-                    <!--
                     <execution>
-                      <id>windows-bin</id>
-                      <phase>package</phase>
-                      <goals>
-                        <goal>single</goal>
-                      </goals>
-                      <configuration>
-                        <descriptors>
-                          <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
-                        </descriptors>
-                        <finalName>${pom.artifactId}-${pom.version}</finalName>
-                        <appendAssemblyId>false</appendAssemblyId>
-                      </configuration>
+                        <id>windows-bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
+                            </descriptors>
+                            <finalName>${pom.artifactId}-${pom.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
                     </execution>
                     <execution>
-                      <id>unix-src</id>
-                      <phase>package</phase>
-                      <goals>
-                        <goal>single</goal>
-                      </goals>
-                      <configuration>
-                        <descriptors>
-                          <descriptor>src/main/descriptors/unix-src.xml</descriptor>
-                        </descriptors>
-                      </configuration>
+                        <id>unix-src</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+                            </descriptors>
+                        </configuration>
                     </execution>
                     <execution>
-                      <id>windows-src</id>
-                      <phase>package</phase>
-                      <goals>
-                        <goal>single</goal>
-                      </goals>
-                      <configuration>
-                        <descriptors>
-                          <descriptor>src/main/descriptors/windows-src.xml</descriptor>
-                        </descriptors>
-                      </configuration>
+                        <id>windows-src</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/windows-src.xml</descriptor>
+                            </descriptors>
+                        </configuration>
                     </execution>
-                    -->
                 </executions>
             </plugin>
         </plugins>

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=588687&r1=588686&r2=588687&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
Fri Oct 26 08:26:56 2007
@@ -16,82 +16,86 @@
     limitations under the License.
 -->
 <assembly>
-  <id>unix-bin</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <fileSets>
-
-    <!-- Copy license and other files from root -->
-    <fileSet>
-        <directory>..</directory>
-        <outputDirectory>/</outputDirectory>
-        <includes>
-            <include>*.txt</include>
-        </includes>
-    </fileSet>
-
-    <!-- Copy over everything that needs to get unix line endings -->
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <excludes>
-        <exclude>bin/**</exclude>
-      </excludes>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>bin/macosx/wrapper.conf</include>
-        <include>bin/linux/wrapper.conf</include>
-      </includes>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-
-    <!-- Copy over files that should not get the line endings converted -->
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>bin/*.jar</include>
-      </includes>
-    </fileSet>
-
-    <!-- Copy over the files that should not get the line endings converted but need to
be chmod to 755 -->
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>bin/linux/wrapper</include>
-        <include>bin/linux/libwrapper.so</include>
-        <include>bin/macosx/wrapper</include>
-        <include>bin/macosx/libwrapper.jnilib</include>
-      </includes>
-      <fileMode>0755</fileMode>
-    </fileSet>
-
-    <!-- Copy over the files that need unix line endings and also chmod to 755 -->
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>bin/servicemix.sh</include>
-        <include>bin/macosx/servicemix.sh</include>
-        <include>bin/linux/servicemix.sh</include>
-      </includes>
-      <fileMode>0755</fileMode>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-
-    <!-- Copy over jar files -->
-    <fileSet>
-        <directory>target/dependencies</directory>
-        <outputDirectory>/bin/</outputDirectory>
-    </fileSet>
+    <id>unix-bin</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <fileSets>
+
+        <!-- Copy license and other files from root -->
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.txt</include>
+            </includes>
+        </fileSet>
+
+        <!-- Copy over everything that needs to get unix line endings -->
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>bin/**</exclude>
+            </excludes>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>bin/macosx/wrapper.conf</include>
+                <include>bin/linux/wrapper.conf</include>
+                <include>bin/win32/wrapper.conf</include>
+                <include>bin/win32/*.bat</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+
+        <!-- Copy over files that should not get the line endings converted -->
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>bin/*.jar</include>
+                <include>bin/win32/wrapper.dll</include>
+                <include>bin/win32/wrapper.exe</include>
+            </includes>
+        </fileSet>
+
+        <!-- Copy over the files that should not get the line endings converted but need
to be chmod to 755 -->
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>bin/linux/wrapper</include>
+                <include>bin/linux/libwrapper.so</include>
+                <include>bin/macosx/wrapper</include>
+                <include>bin/macosx/libwrapper.jnilib</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </fileSet>
+
+        <!-- Copy over the files that need unix line endings and also chmod to 755 -->
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>bin/servicemix.sh</include>
+                <include>bin/macosx/servicemix.sh</include>
+                <include>bin/linux/servicemix.sh</include>
+            </includes>
+            <fileMode>0755</fileMode>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+
+        <!-- Copy over jar files -->
+        <fileSet>
+            <directory>target/dependencies</directory>
+            <outputDirectory>/bin/</outputDirectory>
+        </fileSet>
 
-  </fileSets>
+    </fileSets>
 
     <dependencySets>
 
@@ -103,7 +107,7 @@
             <includes>
                 <!-- Compendium -->
                 <include>org.apache.felix:org.osgi.compendium</include>
-  		        <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
 
                 <!-- PAX Logging -->
                 <include>org.ops4j.pax.logging:pax-logging-api</include>
@@ -146,8 +150,8 @@
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-		        <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
-		        <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
+                <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
+                <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
             </includes>
         </dependencySet>
 

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml?rev=588687&r1=588686&r2=588687&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-src.xml
Fri Oct 26 08:26:56 2007
@@ -16,82 +16,80 @@
   limitations under the License.
 -->
 <assembly>
-  <id>src</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <fileSets>
-    <!-- Binary Files -->
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>src</outputDirectory>
-      <includes>
-        <include>**/*.jpeg</include>
-        <include>**/*.jpg</include>
-        <include>**/*.gif</include>
-        <include>**/*.png</include>
-        <include>**/*.exe</include>
-        <include>**/*.dll</include>
-        <include>**/*.jar</include>
-        <include>**/*.so</include>
-        <include>**/*.ks</include>
-        <include>**/*.ts</include>
-        <include>**/*.keystore</include>
-        <include>**/*.bin</include>
-        <include>**/*.jnilib</include>
-        <include>**/*.cert</include>
-        <include>assembly/src/release/bin/*/wrapper</include>
-      </includes>
-      <excludes>
-        <exclude>**/eclipse-classes/**</exclude>
-        <exclude>**/target/**</exclude>
-      </excludes>
-    </fileSet>
+    <id>src</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <fileSets>
+        <!-- Binary Files -->
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory>src</outputDirectory>
+            <includes>
+                <include>**/*.jpeg</include>
+                <include>**/*.jpg</include>
+                <include>**/*.gif</include>
+                <include>**/*.png</include>
+                <include>**/*.exe</include>
+                <include>**/*.dll</include>
+                <include>**/*.jar</include>
+                <include>**/*.so</include>
+                <include>**/*.ks</include>
+                <include>**/*.ts</include>
+                <include>**/*.keystore</include>
+                <include>**/*.bin</include>
+                <include>**/*.jnilib</include>
+                <include>**/*.cert</include>
+                <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+            </includes>
+            <excludes>
+                <exclude>**/eclipse-classes/**</exclude>
+                <exclude>**/target/**</exclude>
+            </excludes>
+        </fileSet>
 
-    <!-- Text Files -->
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>src</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-      <excludes>
-        <exclude>**/*.jpeg</exclude>
-        <exclude>**/*.jpg</exclude>
-        <exclude>**/*.gif</exclude>
-        <exclude>**/*.png</exclude>
-        <exclude>**/*.exe</exclude>
-        <exclude>**/*.dll</exclude>
-        <exclude>**/*.jar</exclude>
-        <exclude>**/*.so</exclude>
-        <exclude>**/*.ks</exclude>
-        <exclude>**/*.ts</exclude>
-        <exclude>**/*.keystore</exclude>
-        <exclude>**/*.bin</exclude>
-        <exclude>**/*.jnilib</exclude>
-        <exclude>**/*.cert</exclude>
-        <exclude>assembly/src/release/bin/*/wrapper</exclude>
-        <exclude>**/target/**</exclude>
-        <exclude>**/build/**</exclude>
-        <!-- exclude>data/**</exclude>
-        <exclude>*/data/**</exclude -->
-        <exclude>activemq-data/**</exclude>
-        <exclude>*/activemq-data/**</exclude>
-        <exclude>**/eclipse-classes/**</exclude>
-        <exclude>**/.*</exclude>
-        <exclude>**/.*/**</exclude>
+        <!-- Text Files -->
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory>src</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <excludes>
+                <exclude>**/*.jpeg</exclude>
+                <exclude>**/*.jpg</exclude>
+                <exclude>**/*.gif</exclude>
+                <exclude>**/*.png</exclude>
+                <exclude>**/*.exe</exclude>
+                <exclude>**/*.dll</exclude>
+                <exclude>**/*.jar</exclude>
+                <exclude>**/*.so</exclude>
+                <exclude>**/*.ks</exclude>
+                <exclude>**/*.ts</exclude>
+                <exclude>**/*.keystore</exclude>
+                <exclude>**/*.bin</exclude>
+                <exclude>**/*.jnilib</exclude>
+                <exclude>**/*.cert</exclude>
+                <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+                <exclude>**/target/**</exclude>
+                <exclude>**/build/**</exclude>
+                <exclude>activemq-data/**</exclude>
+                <exclude>*/activemq-data/**</exclude>
+                <exclude>**/eclipse-classes/**</exclude>
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
 
-        <exclude>**/surefire*</exclude>
-        <exclude>**/svn-commit*</exclude>
+                <exclude>**/surefire*</exclude>
+                <exclude>**/svn-commit*</exclude>
 
-        <exclude>**/*.iml</exclude>
-        <exclude>**/*.ipr</exclude>
-        <exclude>**/*.iws</exclude>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/*.ipr</exclude>
+                <exclude>**/*.iws</exclude>
 
-        <exclude>**/cobertura.ser</exclude>
+                <exclude>**/cobertura.ser</exclude>
 
-      </excludes>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-  </fileSets>
+            </excludes>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+    </fileSets>
 </assembly>

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml?rev=588687&r1=588686&r2=588687&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
Fri Oct 26 08:26:56 2007
@@ -6,9 +6,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-   
+
     http://www.apache.org/licenses/LICENSE-2.0
-   
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,128 +16,181 @@
     limitations under the License.
 -->
 <assembly>
-  <id>windows-bin</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-
-    <!-- Copy over everything that needs to get dos line endings -->
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <excludes>
-        <!--<exclude>bin/**</exclude>-->
-      </excludes>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-
-    <!-- copy the website docs 
-    <fileSet>
-      <directory>${basedir}/target/website</directory>
-      <outputDirectory>/doc/website</outputDirectory>
-    </fileSet>
-    -->
-
-    <!-- copy the manual docs -->
-    <!--
-    <fileSet>
-      <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
-      <outputDirectory>/doc</outputDirectory>
-      <includes>
-        <include>*.pdf</include>
-      </includes>
-    </fileSet>
-
-    <!-- copy the examples -->
-    <fileSet>
-      <directory>../examples</directory>
-      <outputDirectory>/examples</outputDirectory>
-      <excludes>
-        <!-- disable build and IDEA files -->
-        <exclude>**/*.i*</exclude>
-        <exclude>**/target/</exclude>
-        <exclude>**/target/*</exclude>
-        <exclude>**/*.ser</exclude>
-        <exclude>**/*.log</exclude>
-      </excludes>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-
-    <!-- Copy over jar files -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>${pom.artifactId}-${pom.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>/bin</outputDirectory>
-      <includes>
-        <include>run.jar</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/lib</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>org.apache.camel:camel-activemq</include>
-        <include>org.apache.camel:camel-atom</include>
-        <include>org.apache.camel:camel-bam</include>
-        <include>org.apache.camel:camel-core</include>
-        <include>org.apache.camel:camel-cxf</include>
-        <include>org.apache.camel:camel-ftp</include>
-        <include>org.apache.camel:camel-http</include>
-        <include>org.apache.camel:camel-ibatis</include>
-        <include>org.apache.camel:camel-irc</include>
-        <include>org.apache.camel:camel-jaxb</include>
-        <include>org.apache.camel:camel-jdbc</include>
-        <include>org.apache.camel:camel-jetty</include>
-        <include>org.apache.camel:camel-jing</include>
-        <include>org.apache.camel:camel-jms</include>
-        <include>org.apache.camel:camel-josql</include>
-        <include>org.apache.camel:camel-jpa</include>
-        <include>org.apache.camel:camel-juel</include>
-        <include>org.apache.camel:camel-mail</include>
-        <include>org.apache.camel:camel-msv</include>
-        <include>org.apache.camel:camel-ognl</include>
-        <include>org.apache.camel:camel-quartz</include>
-        <include>org.apache.camel:camel-rmi</include>
-        <include>org.apache.camel:camel-mina</include>
-        <include>org.apache.camel:camel-saxon</include>
-        <include>org.apache.camel:camel-script</include>
-        <include>org.apache.camel:camel-spring</include>
-        <include>org.apache.camel:camel-xmlbeans</include>
-        <include>org.apache.camel:camel-xmpp</include>
-        <include>org.apache.camel:camel-xstream</include>
-        <include>commons-logging:commons-logging</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib/optional</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>${pom.groupId}:apache-activemq</include>
-        <include>commons-beanutils:commons-beanutils</include>
-        <include>commons-collections:commons-collections</include>
-        <include>commons-httpclient:commons-httpclient</include>
-        <include>commons-dbcp:commons-dbcp</include>
-        <include>commons-pool:commons-pool</include>
-        <include>log4j:log4j</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
-        <include>org.apache.xbean:xbean-spring</include>
-        <include>org.springframework:spring</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
+    <id>windows-bin</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+
+        <!-- Copy license and other files from root -->
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.txt</include>
+            </includes>
+        </fileSet>
+
+        <!-- Copy over everything that needs to get unix line endings -->
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>bin/**</exclude>
+            </excludes>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>bin/macosx/wrapper.conf</include>
+                <include>bin/linux/wrapper.conf</include>
+                <include>bin/win32/wrapper.conf</include>
+                <include>bin/win32/*.bat</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+
+        <!-- Copy over files that should not get the line endings converted -->
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>bin/*.jar</include>
+                <include>bin/win32/wrapper.dll</include>
+                <include>bin/win32/wrapper.exe</include>
+            </includes>
+        </fileSet>
+
+        <!-- Copy over the files that should not get the line endings converted but need
to be chmod to 755 -->
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>bin/linux/wrapper</include>
+                <include>bin/linux/libwrapper.so</include>
+                <include>bin/macosx/wrapper</include>
+                <include>bin/macosx/libwrapper.jnilib</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </fileSet>
+
+        <!-- Copy over the files that need unix line endings and also chmod to 755 -->
+        <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>bin/servicemix.sh</include>
+                <include>bin/macosx/servicemix.sh</include>
+                <include>bin/linux/servicemix.sh</include>
+            </includes>
+            <fileMode>0755</fileMode>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+
+        <!-- Copy over jar files -->
+        <fileSet>
+            <directory>target/dependencies</directory>
+            <outputDirectory>/bin/</outputDirectory>
+        </fileSet>
+
+    </fileSets>
+
+    <dependencySets>
+
+        <!-- Mandatory bundles for everything -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <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.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.ops4j.pax.confman:pax-confman-propsloader</include>
+
+                <!-- Spring OSGi -->
+                <include>org.springframework:spring-aop</include>
+                <include>org.springframework:spring-beans</include>
+                <include>org.springframework:spring-context</include>
+                <include>org.springframework:spring-core</include>
+                <include>org.springframework.osgi:spring-osgi-core</include>
+                <include>org.springframework.osgi:spring-osgi-extender</include>
+                <include>org.springframework.osgi:spring-osgi-io</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
+
+            </includes>
+        </dependencySet>
+
+        <!-- NMR -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
+            </includes>
+        </dependencySet>
+
+        <!-- GShell -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
+                <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
+            </includes>
+        </dependencySet>
+
+        <!-- Transaction Manager -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+                <include>org.springframework:spring-tx</include>
+                <include>org.apache.servicemix:org.apache.servicemix.transaction</include>
+            </includes>
+        </dependencySet>
+
+        <!-- Management -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
+            </includes>
+        </dependencySet>
+
+        <!-- JBI 1.0 -->
+        <dependencySet>
+            <outputDirectory>/bundle</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
+            </includes>
+        </dependencySet>
+
+    </dependencySets>
+
 </assembly>

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml?rev=588687&r1=588686&r2=588687&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-src.xml
Fri Oct 26 08:26:56 2007
@@ -16,83 +16,81 @@
   limitations under the License.
 -->
 <assembly>
-  <id>src</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <!-- Binary Files -->
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>src</outputDirectory>
-      <includes>
-        <include>**/*.jpeg</include>
-        <include>**/*.jpg</include>
-        <include>**/*.gif</include>
-        <include>**/*.png</include>
-        <include>**/*.exe</include>
-        <include>**/*.dll</include>
-        <include>**/*.jar</include>
-        <include>**/*.so</include>
-        <include>**/*.ks</include>
-        <include>**/*.ts</include>
-        <include>**/*.keystore</include>
-        <include>**/*.bin</include>
-        <include>**/*.jnilib</include>
-        <include>**/*.cert</include>
-        <include>assembly/src/release/bin/*/wrapper</include>
-      </includes>
-      <excludes>
-        <exclude>**/eclipse-classes/**</exclude>
-        <exclude>**/target/**</exclude>
-      </excludes>
-    </fileSet>
-
-    <!-- Text Files -->
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>src</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-      <excludes>
-        <exclude>**/*.jpeg</exclude>
-        <exclude>**/*.jpg</exclude>
-        <exclude>**/*.gif</exclude>
-        <exclude>**/*.png</exclude>
-        <exclude>**/*.exe</exclude>
-        <exclude>**/*.dll</exclude>
-        <exclude>**/*.jar</exclude>
-        <exclude>**/*.so</exclude>
-        <exclude>**/*.ks</exclude>
-        <exclude>**/*.ts</exclude>
-        <exclude>**/*.keystore</exclude>
-        <exclude>**/*.bin</exclude>
-        <exclude>**/*.jnilib</exclude>
-        <exclude>**/*.cert</exclude>
-        <exclude>assembly/src/release/bin/*/wrapper</exclude>
-
-        <exclude>**/target/**</exclude>
-        <exclude>**/build/**</exclude>
-        <!-- exclude>data/**</exclude>
-        <exclude>*/data/**</exclude -->
-        <exclude>activemq-data/**</exclude>
-        <exclude>*/activemq-data/**</exclude>
-        <exclude>**/eclipse-classes/**</exclude>
-        <exclude>**/.*</exclude>
-        <exclude>**/.*/**</exclude>
-
-        <exclude>**/surefire*</exclude>
-        <exclude>**/svn-commit*</exclude>
-
-        <exclude>**/*.iml</exclude>
-        <exclude>**/*.ipr</exclude>
-        <exclude>**/*.iws</exclude>
-
-        <exclude>**/cobertura.ser</exclude>
-
-      </excludes>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-  </fileSets>
+    <id>src</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <!-- Binary Files -->
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory>src</outputDirectory>
+            <includes>
+                <include>**/*.jpeg</include>
+                <include>**/*.jpg</include>
+                <include>**/*.gif</include>
+                <include>**/*.png</include>
+                <include>**/*.exe</include>
+                <include>**/*.dll</include>
+                <include>**/*.jar</include>
+                <include>**/*.so</include>
+                <include>**/*.ks</include>
+                <include>**/*.ts</include>
+                <include>**/*.keystore</include>
+                <include>**/*.bin</include>
+                <include>**/*.jnilib</include>
+                <include>**/*.cert</include>
+                <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+            </includes>
+            <excludes>
+                <exclude>**/eclipse-classes/**</exclude>
+                <exclude>**/target/**</exclude>
+            </excludes>
+        </fileSet>
+
+        <!-- Text Files -->
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory>src</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <excludes>
+                <exclude>**/*.jpeg</exclude>
+                <exclude>**/*.jpg</exclude>
+                <exclude>**/*.gif</exclude>
+                <exclude>**/*.png</exclude>
+                <exclude>**/*.exe</exclude>
+                <exclude>**/*.dll</exclude>
+                <exclude>**/*.jar</exclude>
+                <exclude>**/*.so</exclude>
+                <exclude>**/*.ks</exclude>
+                <exclude>**/*.ts</exclude>
+                <exclude>**/*.keystore</exclude>
+                <exclude>**/*.bin</exclude>
+                <exclude>**/*.jnilib</exclude>
+                <exclude>**/*.cert</exclude>
+                <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+
+                <exclude>**/target/**</exclude>
+                <exclude>**/build/**</exclude>
+                <exclude>activemq-data/**</exclude>
+                <exclude>*/activemq-data/**</exclude>
+                <exclude>**/eclipse-classes/**</exclude>
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
+
+                <exclude>**/surefire*</exclude>
+                <exclude>**/svn-commit*</exclude>
+
+                <exclude>**/*.iml</exclude>
+                <exclude>**/*.ipr</exclude>
+                <exclude>**/*.iws</exclude>
+
+                <exclude>**/cobertura.ser</exclude>
+
+            </excludes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+    </fileSets>
 </assembly>



Mime
View raw message