james-mime4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r755630 - in /james/mime4j/trunk: assemble/ assemble/pom.xml assemble/src/ assemble/src/assemble/ assemble/src/assemble/bin.xml assemble/src/assemble/src.xml core/pom.xml core/src/assemble/ pom.xml
Date Wed, 18 Mar 2009 16:31:58 GMT
Author: rdonkin
Date: Wed Mar 18 16:31:58 2009
New Revision: 755630

URL: http://svn.apache.org/viewvc?rev=755630&view=rev
Log:
Move assembly from core into new module MIME4J-124 https://issues.apache.org/jira/browse/MIME4J-124

Added:
    james/mime4j/trunk/assemble/   (with props)
    james/mime4j/trunk/assemble/pom.xml   (with props)
    james/mime4j/trunk/assemble/src/
    james/mime4j/trunk/assemble/src/assemble/
    james/mime4j/trunk/assemble/src/assemble/bin.xml
      - copied, changed from r755538, james/mime4j/trunk/core/src/assemble/bin.xml
    james/mime4j/trunk/assemble/src/assemble/src.xml
      - copied, changed from r755538, james/mime4j/trunk/core/src/assemble/src.xml
Removed:
    james/mime4j/trunk/core/src/assemble/
Modified:
    james/mime4j/trunk/core/pom.xml
    james/mime4j/trunk/pom.xml

Propchange: james/mime4j/trunk/assemble/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 18 16:31:58 2009
@@ -0,0 +1,2 @@
+.*
+target

Added: james/mime4j/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/assemble/pom.xml?rev=755630&view=auto
==============================================================================
--- james/mime4j/trunk/assemble/pom.xml (added)
+++ james/mime4j/trunk/assemble/pom.xml Wed Mar 18 16:31:58 2009
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  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.  See the License for the
+    specific language governing permissions and limitations
+    under the License.    
+  -->
+  <parent>
+    <artifactId>apache-mime4j-project</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>0.7-SNAPSHOT</version>
+    <!-- Inherit from project -->
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>apache-mime4j</artifactId>
+  <name>Apache JAMES Mime4j (Assembly)</name>
+  <version>0.7-SNAPSHOT</version>
+  <description>Java stream based MIME message parser</description>
+  <packaging>pom</packaging>
+     
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <configuration>
+          <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id> <!-- this is used for inheritance merges
-->
+            <phase>package</phase> <!-- append to the packaging phase. -->
+            <goals>
+              <goal>attached</goal> <!-- goals == mojos -->
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>  
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-mime4j-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: james/mime4j/trunk/assemble/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: james/mime4j/trunk/assemble/src/assemble/bin.xml (from r755538, james/mime4j/trunk/core/src/assemble/bin.xml)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/assemble/src/assemble/bin.xml?p2=james/mime4j/trunk/assemble/src/assemble/bin.xml&p1=james/mime4j/trunk/core/src/assemble/bin.xml&r1=755538&r2=755630&rev=755630&view=diff
==============================================================================
--- james/mime4j/trunk/core/src/assemble/bin.xml (original)
+++ james/mime4j/trunk/assemble/src/assemble/bin.xml Wed Mar 18 16:31:58 2009
@@ -26,39 +26,32 @@
     <format>zip</format>
     <format>tar.gz</format>
   </formats>
-  <fileSets>
-    <fileSet>
-      <directory>target/maven-shared-archive-resources/META-INF/</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <includes>
-        <include>RELEASE_NOTES.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>examples</directory>
-    </fileSet>
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>${artifactId}-${version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/apidocs</directory>
-      <outputDirectory>javadocs</outputDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/..</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>LICENSE.*</include>
+        <include>NOTICE.*</include>
+        <include>RELEASE_NOTES.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../core/target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>apache-mime4j*.jar</include>
+      </includes>
     </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
       <outputDirectory>/lib/</outputDirectory>
       <useProjectArtifact>false</useProjectArtifact>
-      <scope>runtime</scope>
+      <scope>runtime</scope>
+      <excludes>
+        <exclude>apache-mime4j*</exclude>
+      </excludes>
     </dependencySet>
   </dependencySets>
 </assembly>

Copied: james/mime4j/trunk/assemble/src/assemble/src.xml (from r755538, james/mime4j/trunk/core/src/assemble/src.xml)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/assemble/src/assemble/src.xml?p2=james/mime4j/trunk/assemble/src/assemble/src.xml&p1=james/mime4j/trunk/core/src/assemble/src.xml&r1=755538&r2=755630&rev=755630&view=diff
==============================================================================
--- james/mime4j/trunk/core/src/assemble/src.xml (original)
+++ james/mime4j/trunk/assemble/src/assemble/src.xml Wed Mar 18 16:31:58 2009
@@ -28,7 +28,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>.</directory>
+      <directory>..</directory>
       <outputDirectory></outputDirectory>
       <excludes>
         <exclude>**/target/**</exclude>

Modified: james/mime4j/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/core/pom.xml?rev=755630&r1=755629&r2=755630&view=diff
==============================================================================
--- james/mime4j/trunk/core/pom.xml (original)
+++ james/mime4j/trunk/core/pom.xml Wed Mar 18 16:31:58 2009
@@ -27,8 +27,8 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>apache-mime4j</artifactId>
-  <name>Apache JAMES Mime4j</name>
+  <artifactId>apache-mime4j-core</artifactId>
+  <name>Apache JAMES Mime4j (Core)</name>
   <version>0.7-SNAPSHOT</version>
   <description>Java stream based MIME message parser</description>
 
@@ -55,23 +55,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <configuration>
-          <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id> <!-- this is used for inheritance merges
-->
-            <phase>package</phase> <!-- append to the packaging phase. -->
-            <goals>
-              <goal>attached</goal> <!-- goals == mojos -->
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>  
 

Modified: james/mime4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/pom.xml?rev=755630&r1=755629&r2=755630&view=diff
==============================================================================
--- james/mime4j/trunk/pom.xml (original)
+++ james/mime4j/trunk/pom.xml Wed Mar 18 16:31:58 2009
@@ -39,6 +39,7 @@
   
   <modules>
     <module>core</module>
+    <module>assemble</module>
   </modules>
     
   <distributionManagement>



Mime
View raw message