servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r397295 - in /incubator/servicemix/trunk: ./ servicemix-assembly/src/main/assembly/ servicemix-bpe/ servicemix-core/ servicemix-eip/ servicemix-http/ servicemix-jms/ servicemix-jsr181/ servicemix-sca/
Date Wed, 26 Apr 2006 20:43:06 GMT
Author: gnodet
Date: Wed Apr 26 13:43:04 2006
New Revision: 397295

URL: http://svn.apache.org/viewcvs?rev=397295&view=rev
Log:
Fix legal stuff in m2 build.
Still missing from components installers though.

Modified:
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml
    incubator/servicemix/trunk/servicemix-bpe/pom.xml
    incubator/servicemix/trunk/servicemix-core/pom.xml
    incubator/servicemix/trunk/servicemix-eip/pom.xml
    incubator/servicemix/trunk/servicemix-http/pom.xml
    incubator/servicemix/trunk/servicemix-jms/pom.xml
    incubator/servicemix/trunk/servicemix-jsr181/pom.xml
    incubator/servicemix/trunk/servicemix-sca/pom.xml

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/pom.xml?rev=397295&r1=397294&r2=397295&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Wed Apr 26 13:43:04 2006
@@ -38,9 +38,9 @@
     ServiceMix is an open source ESB based on the Java Business
     Integration framework - JSR-208 
   </description>
-  <url>http://www.servicemix.org/</url>
+  <url>http://incubator.apache.org/servicemix</url>
   <prerequisites>
-    <maven>2.0</maven>
+    <maven>2.0.4</maven>
   </prerequisites>
   <inceptionYear>2005</inceptionYear>
   
@@ -77,9 +77,10 @@
       <subscribe>servicemix-dev-subscribe@geronimo.apache.org</subscribe>
       <unsubscribe>servicemix-dev-unsubscribe@geronimo.apache.org</unsubscribe>
       <post>servicemix-dev@geronimo.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/geronimo-servicemix-dev/</archive>
+      <archive>http://www.nabble.com/ServiceMix---Dev-f12051.html</archive>
       <otherArchives>
         <archive>http://dir.gmane.org/gmane.comp.java.servicemix.devel</archive>
+        <archive>http://mail-archives.apache.org/mod_mbox/geronimo-servicemix-dev/</archive>
       </otherArchives>
     </mailingList>
     <mailingList>
@@ -87,9 +88,10 @@
       <subscribe>servicemix-users-subscribe@geronimo.apache.org</subscribe>
       <unsubscribe>servicemix-users-unsubscribe@geronimo.apache.org</unsubscribe>
       <post>servicemix-users@geronimo.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/geronimo-servicemix-users/</archive>
+      <archive>http://www.nabble.com/ServiceMix---User-f12050.html</archive>
       <otherArchives>
         <archive>http://dir.gmane.org/gmane.comp.java.servicemix.user</archive>
+        <archive>http://mail-archives.apache.org/mod_mbox/geronimo-servicemix-users/</archive>
       </otherArchives>
     </mailingList>
     <mailingList>
@@ -98,9 +100,6 @@
       <unsubscribe>servicemix-commits-unsubscribe@geronimo.apache.org</unsubscribe>
       <post>servicemix-commits@geronimo.apache.org</post>
       <archive>http://mail-archives.apache.org/mod_mbox/geronimo-servicemix-commits/</archive>
-      <otherArchives>
-        <archive>http://archive.servicemix.codehaus.org/scm/</archive>
-      </otherArchives>
     </mailingList>
   </mailingLists>
   
@@ -189,25 +188,12 @@
     </developer>
   </developers>
   
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/servicemix/trunk</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/servicemix/trunk</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/incubator/servicemix/trunk/</url>
   </scm>
   
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-  
   <modules>
     <module>servicemix-jbi</module>
     <module>servicemix-core</module>
@@ -1483,6 +1469,29 @@
   </distributionManagement>
   
   <build>
+    <resources>
+      <resource>
+        <directory>..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>target/generated</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
     <pluginManagement>
       <plugins>
             <plugin>

Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml?rev=397295&r1=397294&r2=397295&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml Wed Apr 26 13:43:04
2006
@@ -25,9 +25,12 @@
       <directory>..</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>README.txt</include>      
-        <include>LICENSE.txt</include>      
+        <include>README</include>      
+        <include>LICENSE</include>      
+        <include>NOTICE</include>      
         <include>STATUS</include>      
+        <include>DISCLAIMER</include>      
+        <include>licenses/*.*</include>
       </includes>
     </fileSet>
     <fileSet>

Modified: incubator/servicemix/trunk/servicemix-bpe/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/pom.xml?rev=397295&r1=397294&r2=397295&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-bpe/pom.xml Wed Apr 26 13:43:04 2006
@@ -34,61 +34,53 @@
   <description>BPE Service Engine</description>
 
   <dependencies>
-
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-components</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-http</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ode</groupId>
-      <artifactId>bpe</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ejb_2.1_spec</artifactId>
-      <scope>provided</scope>
+
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-common</artifactId>
     </dependency>
-    <dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-components</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-http</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ode</groupId>
+      <artifactId>bpe</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ejb_2.1_spec</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
     </dependency>
-    <dependency>
+    <dependency>
       <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
+      <artifactId>xalan</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
+    <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>target/generated</directory>
-      </resource>
-    </resources>
-    <plugins>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -103,24 +95,24 @@
             <exclude>**/FileSystemJarInputStreamTest.*</exclude>
           </excludes>
         </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <configuration>
-              <tasks>
-                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask"
-                  name="mapping">
-                  <classpath>
-                    <pathelement path="${basedir}/target/classes" />
-                    <path refid="maven.test.classpath" />
-                  </classpath>
-                </taskdef>
-                <mapping destFile="${basedir}/target/${pom.artifactId}-${version}.xsd"
-                  namespace="http://servicemix.apache.org/bpe/1.0" srcdir="${basedir}/src/main/java"
-                  metaInfDir="${basedir}/target/generated/" />
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask"
+                  name="mapping">
+                  <classpath>
+                    <pathelement path="${basedir}/target/classes" />
+                    <path refid="maven.test.classpath" />
+                  </classpath>
+                </taskdef>
+                <mapping destFile="${basedir}/target/${pom.artifactId}-${version}.xsd"
+                  namespace="http://servicemix.apache.org/bpe/1.0" srcdir="${basedir}/src/main/java"
+                  metaInfDir="${basedir}/target/generated/" />
               </tasks>
             </configuration>
             <goals>

Modified: incubator/servicemix/trunk/servicemix-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/pom.xml?rev=397295&r1=397294&r2=397295&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/pom.xml Wed Apr 26 13:43:04 2006
@@ -234,10 +234,17 @@
   <build>
     <resources>
       <resource>
+        <directory>..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+      <resource>
         <directory>src/main/resources</directory>
         <includes>
-          <include>**/*.properties</include>
-          <include>**/*.xml</include>
           <include>**/*</include>
         </includes>
       </resource>

Modified: incubator/servicemix/trunk/servicemix-eip/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-eip/pom.xml?rev=397295&r1=397294&r2=397295&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-eip/pom.xml Wed Apr 26 13:43:04 2006
@@ -47,24 +47,6 @@
   </dependencies>
 
   <build>
-    <resources>
-      <!--
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*.properties</include>
-          <include>**/*.xml</include>
-          <include>**/*</include>
-        </includes>
-      </resource>
-      -->
-      <resource>
-        <directory>target/generated</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>

Modified: incubator/servicemix/trunk/servicemix-http/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/pom.xml?rev=397295&r1=397294&r2=397295&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/pom.xml Wed Apr 26 13:43:04 2006
@@ -65,22 +65,6 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*.properties</include>
-          <include>**/*.xml</include>
-          <include>**/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>target/generated</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>

Modified: incubator/servicemix/trunk/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/pom.xml?rev=397295&r1=397294&r2=397295&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jms/pom.xml Wed Apr 26 13:43:04 2006
@@ -57,14 +57,6 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>target/generated</directory>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>

Modified: incubator/servicemix/trunk/servicemix-jsr181/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/pom.xml?rev=397295&r1=397294&r2=397295&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/pom.xml Wed Apr 26 13:43:04 2006
@@ -121,14 +121,6 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>target/generated</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>

Modified: incubator/servicemix/trunk/servicemix-sca/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/pom.xml?rev=397295&r1=397294&r2=397295&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/pom.xml Wed Apr 26 13:43:04 2006
@@ -129,22 +129,6 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*.properties</include>
-          <include>**/*.xml</include>
-          <include>**/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>target/generated</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>



Mime
View raw message