Author: felixk
Date: Thu Nov 10 17:50:31 2011
New Revision: 1200451
URL: http://svn.apache.org/viewvc?rev=1200451&view=rev
Log:
Move to james-project-1.7
Modified:
james/jsieve/trunk/assemble/pom.xml
james/jsieve/trunk/mailet/pom.xml
james/jsieve/trunk/main/ (props changed)
james/jsieve/trunk/main/pom.xml
james/jsieve/trunk/pom.xml
james/jsieve/trunk/src/reporting-site/site.xml
james/jsieve/trunk/src/site/site.xml
james/jsieve/trunk/util/ (props changed)
james/jsieve/trunk/util/pom.xml
Modified: james/jsieve/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/assemble/pom.xml?rev=1200451&r1=1200450&r2=1200451&view=diff
==============================================================================
--- james/jsieve/trunk/assemble/pom.xml (original)
+++ james/jsieve/trunk/assemble/pom.xml Thu Nov 10 17:50:31 2011
@@ -41,7 +41,6 @@
JAMES project. This module is used by Maven to create
fully assembled and packaged distributions.
</description>
- <url>http://james.apache.org/jsieve</url>
<inceptionYear>2004</inceptionYear>
<dependencies>
Modified: james/jsieve/trunk/mailet/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/pom.xml?rev=1200451&r1=1200450&r2=1200451&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/pom.xml (original)
+++ james/jsieve/trunk/mailet/pom.xml Thu Nov 10 17:50:31 2011
@@ -40,36 +40,8 @@
implementing RFC3028. Apache jSieve is developed by the
JAMES project.
</description>
- <url>http://james.apache.org/jsieve</url>
<inceptionYear>2004</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache James User</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-user/</archive>
- </mailingList>
- <mailingList>
- <name>Apache James Developer</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
- </mailingList>
- </mailingLists>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/jsieve/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/jsieve/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/james/jsieve/trunk/</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/JSIEVE</url>
- </issueManagement>
-
<distributionManagement>
<site>
<id>${james.www.id}</id>
@@ -77,32 +49,6 @@
</site>
</distributionManagement>
- <properties>
- <!--
- The website is committed to subversion. This property can be
overriden
- to upload the site to a local staging location.
- For example, adding the following to ~/.m2/settings.xml will upload
- to localhost:
-
- <profiles>
- <profile>
- <id>main</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <james.www>scp://localhost/www</james.www>
- <james.www.id>localhost</james.www.id>
- ...
- -->
- <!-- General location for site stage -->
- <james.www>scp://people.apache.org/www/james.apache.org/</james.www>
- <!-- Project specific location, allowing specific override -->
- <james.jsieve.www>${james.www}/jsieve/</james.jsieve.www>
- <!-- Overridding this value allows single set of loopback settings to
be maintained -->
- <james.www.id>jsieve-website</james.www.id>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
@@ -159,18 +105,8 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -185,38 +121,58 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- </plugin>
- -->
-
- <!-- Site generation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ <inherited>true</inherited>
<executions>
<execution>
- <id>attach-descriptor</id>
+ <phase>process-classes</phase>
<goals>
- <goal>attach-descriptor</goal>
+ <goal>instrument</goal>
</goals>
- <configuration>
- <siteDirectory>${basedir}/src/site</siteDirectory>
- <generateReports>false</generateReports>
- </configuration>
</execution>
</executions>
- <configuration>
- <reportPlugins combine.children="append">
- <plugin>
- <groupId>org.apache.james</groupId>
- <artifactId>maven-mailetdocs-plugin</artifactId>
- </plugin>
- </reportPlugins>
- </configuration>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <!--
+ Switches between generating the documentation site (without using
this profile) and
+ generating the technical reports site (using this profile)
+ -->
+ <profile>
+ <id>site-reports</id>
+ <build>
+ <plugins>
+ <!-- Site generation -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ <configuration>
+
<siteDirectory>${basedir}/src/site</siteDirectory>
+ <generateReports>false</generateReports>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <reportPlugins combine.children="append">
+ <plugin>
+ <groupId>org.apache.james</groupId>
+
<artifactId>maven-mailetdocs-plugin</artifactId>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Propchange: james/jsieve/trunk/main/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 10 17:50:31 2011
@@ -1,3 +1,4 @@
target
.*
*.log
+coverage.ec
Modified: james/jsieve/trunk/main/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/pom.xml?rev=1200451&r1=1200450&r2=1200451&view=diff
==============================================================================
--- james/jsieve/trunk/main/pom.xml (original)
+++ james/jsieve/trunk/main/pom.xml Thu Nov 10 17:50:31 2011
@@ -40,40 +40,8 @@
implementing RFC3028. Apache jSieve is developed by the
JAMES project.
</description>
- <url>http://james.apache.org/jsieve</url>
<inceptionYear>2004</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache James User</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-user/</archive>
- </mailingList>
- <mailingList>
- <name>Apache James Developer</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
- </mailingList>
- </mailingLists>
-
- <prerequisites>
- <maven>3.0.2</maven>
- </prerequisites>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/jsieve/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/jsieve/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/james/jsieve/trunk/</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/JSIEVE</url>
- </issueManagement>
-
<distributionManagement>
<site>
<id>${james.www.id}</id>
@@ -81,32 +49,6 @@
</site>
</distributionManagement>
- <properties>
- <!--
- The website is committed to subversion. This property can be
overriden
- to upload the site to a local staging location.
- For example, adding the following to ~/.m2/settings.xml will upload
- to localhost:
-
- <profiles>
- <profile>
- <id>main</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <james.www>scp://localhost/www</james.www>
- <james.www.id>localhost</james.www.id>
- ...
- -->
- <!-- General location for site stage -->
- <james.www>scp://people.apache.org/www/james.apache.org/</james.www>
- <!-- Project specific location, allowing specific override -->
- <james.jsieve.www>${james.www}/jsieve/</james.jsieve.www>
- <!-- Overridding this value allows single set of loopback settings to
be maintained -->
- <james.www.id>jsieve-website</james.www.id>
- </properties>
-
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
@@ -150,17 +92,10 @@
</repositories>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.5</version>
<executions>
<execution>
<id>generate-jjtree</id>
@@ -172,10 +107,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -191,40 +122,60 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- </plugin>
- -->
-
- <!-- Site generation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ <inherited>true</inherited>
<executions>
<execution>
- <id>attach-descriptor</id>
+ <phase>process-classes</phase>
<goals>
- <goal>attach-descriptor</goal>
+ <goal>instrument</goal>
</goals>
- <configuration>
- <siteDirectory>${basedir}/src/site</siteDirectory>
- <generateReports>false</generateReports>
- </configuration>
</execution>
</executions>
- <configuration>
-
<siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory>
-
<generateReports>${maven-site-plugin.generateReports}</generateReports>
- <reportPlugins combine.children="append">
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- </plugin>
- </reportPlugins>
- </configuration>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <!--
+ Switches between generating the documentation site (without using
this profile) and
+ generating the technical reports site (using this profile)
+ -->
+ <profile>
+ <id>site-reports</id>
+ <build>
+ <plugins>
+ <!-- Site generation -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ <configuration>
+
<siteDirectory>${basedir}/src/site</siteDirectory>
+ <generateReports>false</generateReports>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+
<siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory>
+
<generateReports>${maven-site-plugin.generateReports}</generateReports>
+ <reportPlugins combine.children="append">
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>javacc-maven-plugin</artifactId>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: james/jsieve/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/pom.xml?rev=1200451&r1=1200450&r2=1200451&view=diff
==============================================================================
--- james/jsieve/trunk/pom.xml (original)
+++ james/jsieve/trunk/pom.xml Thu Nov 10 17:50:31 2011
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
<relativePath></relativePath>
</parent>
@@ -40,16 +40,6 @@
<url>http://james.apache.org/jsieve/</url>
<inceptionYear>2008</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache JAMES Server List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
- </mailingList>
- </mailingLists>
-
<modules>
<module>main</module>
<module>mailet</module>
@@ -96,7 +86,7 @@
...
-->
<!-- General location for site stage -->
- <james.www>scp://people.apache.org/www/james.apache.org/</james.www>
+ <james.www>scpexe://people.apache.org/www/james.apache.org/</james.www>
<!-- Project specific location, allowing specific override -->
<james.jsieve.www>${james.www}/jsieve/</james.jsieve.www>
<!-- Overridding this value allows single set of loopback settings to
be maintained -->
@@ -207,18 +197,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${target.jdk}</source>
- <target>${target.jdk}</target>
- <encoding>iso8859-1</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -238,7 +217,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
<executions>
<execution>
<phase>verify</phase>
@@ -251,7 +229,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.2.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -269,10 +246,11 @@
</instructions>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-doap-plugin</artifactId>
- <version>1.1</version>
+ <inherited>true</inherited>
<executions>
<execution>
<id>site</id>
@@ -305,41 +283,7 @@
</asfExtOptions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
- </plugin>
+ -->
<plugin>
<groupId>org.apache.james</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
@@ -349,203 +293,18 @@
</pluginManagement>
<plugins>
- <!-- Site generation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- <configuration>
- <siteDirectory>${basedir}/src/site</siteDirectory>
- <generateReports>false</generateReports>
- </configuration>
- </execution>
- </executions>
- <configuration>
-
<siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory>
-
<generateReports>${maven-site-plugin.generateReports}</generateReports>
- <reportPlugins>
- <!-- Order matters. First project-info-reports, second
jxr. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-project-info-reports-plugin</artifactId>
- <reports>
- <report>dependencies</report>
- <report>dependency-management</report>
- <report>dependency-convergence</report>
- <report>distribution-management</report>
- <report>index</report>
- <report>license</report>
- <report>mailing-list</report>
- <report>modules</report>
- <report>plugin-management</report>
- <report>plugins</report>
- <report>project-team</report>
- <report>scm</report>
- <report>summary</report>
- </reports>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <excludes>
- <exclude>NOTICE.*</exclude>
- <exclude>LICENSE.*</exclude>
- <!-- Generated by Maven -->
- <exclude>release.properties</exclude>
- <exclude>dist/**/*</exclude>
- <!-- Eclipse -->
- <exclude>**/.*</exclude>
- <exclude>.*/**/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <targetJdk>${target.jdk}</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- <ruleset>/rulesets/imports.xml</ruleset>
- </rulesets>
- <format>xml</format>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <minmemory>256m</minmemory>
- <maxmemory>1g</maxmemory>
- <linksource>true</linksource>
- <tags>
- <tag>
- <name>note</name>
- <placement>a</placement>
- <head>NOTE</head>
- </tag>
- <tag>
- <name>todo</name>
- <placement>a</placement>
- <head>TODO</head>
- </tag>
- <tag>
- <name>warning</name>
- <placement>a</placement>
- <head>WARNING</head>
- </tag>
- </tags>
- <source>${target.jdk}</source>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>aggregate</report>
- <report>test-aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
-
<xrefLocation>${project.reporting.outputDirectory}/../xref</xrefLocation>
-
<xrefTestLocation>${project.reporting.outputDirectory}/../xref-test</xrefTestLocation>
- <!-- required by dashboard plugin and hudson
-->
- <xmlOutput>true</xmlOutput>
- <effort>Max</effort>
- <findbugsXmlOutput>true</findbugsXmlOutput>
-
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <onlyCurrentVersion>true</onlyCurrentVersion>
- <resolutionIds>Fixed</resolutionIds>
- <statusIds>Resolved,Closed</statusIds>
-
<columnNames>Type,Key,Summary,Status,Resolution,Fix Version</columnNames>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- -->
- </reportPlugins>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ <inherited>true</inherited>
<executions>
<execution>
- <phase>site</phase>
+ <phase>process-classes</phase>
<goals>
- <goal>aggregate</goal>
- <goal>test-aggregate</goal>
+ <goal>instrument</goal>
</goals>
</execution>
</executions>
- <configuration>
- <minmemory>256m</minmemory>
- <maxmemory>1g</maxmemory>
- <linksource>true</linksource>
- <tags>
- <tag>
- <name>note</name>
- <placement>a</placement>
- <head>NOTE</head>
- </tag>
- <tag>
- <name>todo</name>
- <placement>a</placement>
- <head>TODO</head>
- </tag>
- <tag>
- <name>warning</name>
- <placement>a</placement>
- <head>WARNING</head>
- </tag>
- </tags>
- <source>${target.jdk}</source>
- </configuration>
</plugin>
</plugins>
</build>
Modified: james/jsieve/trunk/src/reporting-site/site.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/reporting-site/site.xml?rev=1200451&r1=1200450&r2=1200451&view=diff
==============================================================================
--- james/jsieve/trunk/src/reporting-site/site.xml (original)
+++ james/jsieve/trunk/src/reporting-site/site.xml Thu Nov 10 17:50:31 2011
@@ -19,12 +19,6 @@
-->
<project name="${project.name}">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
-
<bannerLeft>
<name>JAMES jSieve</name>
<src>images/james-jsieve-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-jsieve-logo.gif</alt>
</bannerLeft>
- <bannerRight>
- <name>The Apache Software Foundation</name>
- <src>/images/logos/asf-logo-reduced.gif</src>
- <href>http://www.apache.org/index.html</href>
- </bannerRight>
-
<body>
<menu ref="modules" />
Modified: james/jsieve/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/site/site.xml?rev=1200451&r1=1200450&r2=1200451&view=diff
==============================================================================
--- james/jsieve/trunk/src/site/site.xml (original)
+++ james/jsieve/trunk/src/site/site.xml Thu Nov 10 17:50:31 2011
@@ -19,12 +19,6 @@
-->
<project name="jSieve">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
-
<bannerLeft>
<name>JAMES jSieve</name>
<src>images/james-jsieve-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-jsieve-logo.gif</alt>
</bannerLeft>
- <bannerRight>
- <name>The Apache Software Foundation</name>
- <src>/images/logos/asf-logo-reduced.gif</src>
- <href>http://www.apache.org/index.html</href>
- </bannerRight>
-
<body>
<menu name="jSieve">
<item name="Main" href="http://james.apache.org/jsieve/main/index.html";
/>
Propchange: james/jsieve/trunk/util/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 10 17:50:31 2011
@@ -1,3 +1,4 @@
target
.*
*.log
+coverage.ec
Modified: james/jsieve/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/util/pom.xml?rev=1200451&r1=1200450&r2=1200451&view=diff
==============================================================================
--- james/jsieve/trunk/util/pom.xml (original)
+++ james/jsieve/trunk/util/pom.xml Thu Nov 10 17:50:31 2011
@@ -40,36 +40,8 @@
implementing RFC3028. Apache jSieve is developed by the
JAMES project. This module contains additional utilities.
</description>
- <url>http://james.apache.org/jsieve</url>
<inceptionYear>2004</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache James User</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-user/</archive>
- </mailingList>
- <mailingList>
- <name>Apache James Developer</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
- </mailingList>
- </mailingLists>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/jsieve/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/jsieve/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/james/jsieve/trunk/</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/JSIEVE</url>
- </issueManagement>
-
<distributionManagement>
<site>
<id>${james.www.id}</id>
@@ -77,32 +49,6 @@
</site>
</distributionManagement>
- <properties>
- <!--
- The website is committed to subversion. This property can be
overriden
- to upload the site to a local staging location.
- For example, adding the following to ~/.m2/settings.xml will upload
- to localhost:
-
- <profiles>
- <profile>
- <id>main</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <james.www>scp://localhost/www</james.www>
- <james.www.id>localhost</james.www.id>
- ...
- -->
- <!-- General location for site stage -->
- <james.www>scp://people.apache.org/www/james.apache.org/</james.www>
- <!-- Project specific location, allowing specific override -->
- <james.jsieve.www>${james.www}/jsieve/</james.jsieve.www>
- <!-- Overridding this value allows single set of loopback settings to
be maintained -->
- <james.www.id>jsieve-website</james.www.id>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
@@ -144,18 +90,8 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -170,12 +106,19 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- </plugin>
- -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>instrument</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
