Author: bago
Date: Tue May 8 15:56:28 2007
New Revision: 536368
URL: http://svn.apache.org/viewvc?view=rev&rev=536368
Log:
Created assemblies descriptors for bin, src and source packages.
Updated site to have a better order (download => build and not viceversa)
Fixed syntax validity for build page.
Updated log4j to 1.2.14
Updated local staged james snapshots dependencies.
Removed LICENSE/NOTICE in favor of maven generated ones.
Added:
james/mime4j/trunk/src/assemble/
james/mime4j/trunk/src/assemble/bin.xml
james/mime4j/trunk/src/assemble/source.xml
james/mime4j/trunk/src/assemble/src.xml
james/mime4j/trunk/src/main/appended-resources/
james/mime4j/trunk/stage/junit/poms/
james/mime4j/trunk/stage/log4j/jars/log4j-1.2.14.jar (with props)
james/mime4j/trunk/stage/log4j/poms/
james/mime4j/trunk/stage/org.apache.james/xmls/james-parent-1.1-SNAPSHOT-site_en.xml
james/mime4j/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site_en.xml
Removed:
james/mime4j/trunk/LICENSE.txt
james/mime4j/trunk/NOTICE.txt
james/mime4j/trunk/stage/log4j/jars/log4j-1.2.13.jar
Modified:
james/mime4j/trunk/pom.xml
james/mime4j/trunk/src/site/site.xml
james/mime4j/trunk/src/site/xdoc/start/build.xml
james/mime4j/trunk/stage/org.apache.james/jars/maven-skin-1.1-SNAPSHOT.jar
james/mime4j/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom
james/mime4j/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom
james/mime4j/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml
Modified: james/mime4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/pom.xml?view=diff&rev=536368&r1=536367&r2=536368
==============================================================================
--- james/mime4j/trunk/pom.xml (original)
+++ james/mime4j/trunk/pom.xml Tue May 8 15:56:28 2007
@@ -145,12 +145,43 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
<configuration>
- <descriptorRefs>
- <descriptorRef>bin</descriptorRef>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
+
<descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
</configuration>
</plugin>
+ <!-- Add NOTICE and LICENSE to generated JAR -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <!-- <preProjectText>PRE PROCESS TEXT</preProjectText>
-->
+ <postProjectText>This file is automatically generated by
dependencies declared in pom.xml</postProjectText>
+ <addLicense>true</addLicense>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Use the assembly or we won't have the LICENSE/NOTICE
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ -->
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ -->
</plugins>
</build>
<repositories>
@@ -214,7 +245,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
+ <version>1.2.14</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -222,7 +253,7 @@
<version>3.8.1</version>
<type>jar</type>
<!-- Removed as a workaround for an unidentified M2 bug -->
- <!-- <scope>test</scope> -->
+ <scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -231,37 +262,5 @@
<version>1.2</version>
</dependency>
</dependencies>
- <!--
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetjdk>1.4</targetjdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <format>xml</format>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
- -->
+
</project>
Added: james/mime4j/trunk/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/assemble/bin.xml?view=auto&rev=536368
==============================================================================
--- james/mime4j/trunk/src/assemble/bin.xml (added)
+++ james/mime4j/trunk/src/assemble/bin.xml Tue May 8 15:56:28 2007
@@ -0,0 +1,58 @@
+<assembly>
+ <!--
+ 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.
+ -->
+ <id>bin</id>
+ <!--
+ Generates a jar file including the binary jar and the runtime dependencies.
+ including NOTICE and LICENSE in the root.
+ -->
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib/</outputDirectory>
+ <!-- <outputFileNameMapping></outputFileNameMapping> -->
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Added: james/mime4j/trunk/src/assemble/source.xml
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/assemble/source.xml?view=auto&rev=536368
==============================================================================
--- james/mime4j/trunk/src/assemble/source.xml (added)
+++ james/mime4j/trunk/src/assemble/source.xml Tue May 8 15:56:28 2007
@@ -0,0 +1,51 @@
+<assembly>
+ <!--
+ 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.
+ -->
+ <id>source</id>
+ <!--
+ Generates a jar file including all sources (original and generated) and
+ including NOTICE and LICENSE from the remote-resources plugin.
+ -->
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>./src/main/java/</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>./target/generated-sources/javacc/</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>./target/generated-sources/jjtree/</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: james/mime4j/trunk/src/assemble/src.xml
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/assemble/src.xml?view=auto&rev=536368
==============================================================================
--- james/mime4j/trunk/src/assemble/src.xml (added)
+++ james/mime4j/trunk/src/assemble/src.xml Tue May 8 15:56:28 2007
@@ -0,0 +1,52 @@
+<assembly>
+ <!--
+ 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.
+ -->
+ <id>src</id>
+ <!--
+ Generates a file including all the source tree excluding files/folders
+ starting with "." , *.bak and the target
+ -->
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>.*</exclude>
+ <exclude>.*/**</exclude>
+ <exclude>**.bak</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>LICENSE</exclude>
+ </excludes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: james/mime4j/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/site/site.xml?view=diff&rev=536368&r1=536367&r2=536368
==============================================================================
--- james/mime4j/trunk/src/site/site.xml (original)
+++ james/mime4j/trunk/src/site/site.xml Tue May 8 15:56:28 2007
@@ -34,8 +34,8 @@
<item name="News and Status" href="/status.html"/>
<item name="Example" href="/samples.html"/>
<item name="Start" href="/start/index.html" collapse="true">
+ <item name="Download" href="/start/download.html" collapse="true"/>
<item name="Build" href="/start/build.html" collapse="true"/>
- <item name="Download" href="/start/download.html" collapse="true"/>
</item>
</menu>
Modified: james/mime4j/trunk/src/site/xdoc/start/build.xml
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/site/xdoc/start/build.xml?view=diff&rev=536368&r1=536367&r2=536368
==============================================================================
--- james/mime4j/trunk/src/site/xdoc/start/build.xml (original)
+++ james/mime4j/trunk/src/site/xdoc/start/build.xml Tue May 8 15:56:28 2007
@@ -73,7 +73,8 @@
</p>
<p>
To generate an Eclipse project from the sources run
<blockquote>
- <code>mvn eclipse:eclipse</code></blockquote>
+ <code>mvn eclipse:eclipse</code></blockquote>
+ </p>
<p>
<strong>NOTE!</strong> Mime4j uses <a
href="https://javacc.dev.java.net/";>JavaCC</a> to generate parsers for
header fields. <code>mvn eclipse:eclipse</code> currently
has problems with
Added: james/mime4j/trunk/stage/log4j/jars/log4j-1.2.14.jar
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/stage/log4j/jars/log4j-1.2.14.jar?view=auto&rev=536368
==============================================================================
Binary file - no diff available.
Propchange: james/mime4j/trunk/stage/log4j/jars/log4j-1.2.14.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
james/mime4j/trunk/stage/org.apache.james/jars/maven-skin-1.1-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/stage/org.apache.james/jars/maven-skin-1.1-SNAPSHOT.jar?view=diff&rev=536368&r1=536367&r2=536368
==============================================================================
Binary files - no diff available.
Modified:
james/mime4j/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom?view=diff&rev=536368&r1=536367&r2=536368
==============================================================================
---
james/mime4j/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom
(original)
+++
james/mime4j/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom
Tue May 8 15:56:28 2007
@@ -28,7 +28,7 @@
</description>
<prerequisites>
- <maven>2.0.5</maven>
+ <maven>2.0.6</maven>
</prerequisites>
<url>http://james.apache.org/</url>
@@ -184,22 +184,6 @@
</site>
</distributionManagement>
- <!--
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>maven-central</id>
- <name>maven-central</name>
- <url>http://repo1.maven.org/maven2</url>
- </pluginRepository>
- </pluginRepositories>
- -->
-
<repositories>
<repository>
<id>central</id>
@@ -235,23 +219,6 @@
</repository>
</repositories>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <!-- also include license and notice files in all the jars -->
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
- </build>
-
<profiles>
<!-- local profile: used to ignore remote repositories in a local build -->
<profile>
@@ -355,29 +322,4 @@
<!-- END SNIPPET: release-profile -->
</profiles>
- <!-- Attempt to use velocity-news plugin (not yet working)
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.velocity.site</groupId>
- <artifactId>velocity-site-news-plugin</artifactId>
- <configuration>
- <baseUrl>http://james.apache.org</baseUrl>
- <newsfile>news.xml</newsfile>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.velocity.site</groupId>
- <artifactId>velocity-site-news-extension</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </extension>
- </extensions>
- </build>
- -->
-
</project>
Modified:
james/mime4j/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom?view=diff&rev=536368&r1=536367&r2=536368
==============================================================================
--- james/mime4j/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom
(original)
+++ james/mime4j/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom
Tue May 8 15:56:28 2007
@@ -41,11 +41,35 @@
</site>
</distributionManagement>
+ <!-- This is here because of http://jira.codehaus.org/browse/MRRESOURCES-6
-->
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk/maven-skin</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk/maven-skin</developerConnection>
<url>http://svn.apache.org/viewvc/james/project/trunk/maven-skin</url>
</scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added:
james/mime4j/trunk/stage/org.apache.james/xmls/james-parent-1.1-SNAPSHOT-site_en.xml
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/stage/org.apache.james/xmls/james-parent-1.1-SNAPSHOT-site_en.xml?view=auto&rev=536368
==============================================================================
(empty)
Modified:
james/mime4j/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml?view=diff&rev=536368&r1=536367&r2=536368
==============================================================================
---
james/mime4j/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml
(original)
+++
james/mime4j/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml
Tue May 8 15:56:28 2007
@@ -18,6 +18,7 @@
<links>
<item name="JAMES Project" href="/index.html" />
<item name="Server" href="/server/index.html" />
+ <item name="Mailet API" href="/mailet/index.html" />
<item name="jSPF" href="/jspf/index.html" />
<item name="Mime4J" href="/mime4j/index.html" />
<item name="JSieve" href="/jsieve/index.html" />
@@ -25,6 +26,7 @@
</links>
<menu name="Sub Projects">
<item name="Server" href="/server/index.html" />
+ <item name="Mailet API" href="/mailet/index.html" />
<item name="jSPF" href="/jspf/index.html" />
<item name="Mime4J" href="/mime4j/index.html" />
<item name="JSieve" href="/jsieve/index.html" />
Added:
james/mime4j/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site_en.xml
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site_en.xml?view=auto&rev=536368
==============================================================================
(empty)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
