Author: felixk
Date: Wed Oct 19 12:17:51 2011
New Revision: 1186149

URL: http://svn.apache.org/viewvc?rev=1186149&view=rev
Log:
Reformat (JAMES-1339)

Modified:
    james/jdkim/trunk/assemble/pom.xml
    james/jdkim/trunk/mailets/pom.xml
    james/jdkim/trunk/main/pom.xml
    james/jdkim/trunk/pom.xml

Modified: james/jdkim/trunk/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/assemble/pom.xml?rev=1186149&r1=1186148&r2=1186149&view=diff
==============================================================================
--- james/jdkim/trunk/assemble/pom.xml (original)
+++ james/jdkim/trunk/assemble/pom.xml Wed Oct 19 12:17:51 2011
@@ -1,34 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
+    or more contributor license agreements. See the NOTICE file
     distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
+    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
+    with the License. You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    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
+    KIND, either express or implied. See the License for the
     specific language governing permissions and limitations
-    under the License.    
+    under the License.
 -->
-<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";>
+<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";>
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>apache-jdkim-project</artifactId>
         <groupId>org.apache.james.jdkim</groupId>
         <version>0.3-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <groupId>org.apache.james.jdkim</groupId>
     <artifactId>apache-jdkim</artifactId>
+    <packaging>pom</packaging>
+
     <name>Apache JAMES jDKIM Assembly</name>
     <description>A Java implementation for the DKIM 
specification.</description>
-    <packaging>pom</packaging>
 
     <dependencies>
         <dependency>

Modified: james/jdkim/trunk/mailets/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/pom.xml?rev=1186149&r1=1186148&r2=1186149&view=diff
==============================================================================
--- james/jdkim/trunk/mailets/pom.xml (original)
+++ james/jdkim/trunk/mailets/pom.xml Wed Oct 19 12:17:51 2011
@@ -1,34 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
+    or more contributor license agreements. See the NOTICE file
     distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
+    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
+    with the License. You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    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
+    KIND, either express or implied. See the License for the
     specific language governing permissions and limitations
-    under the License.    
+    under the License.
 -->
-<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";>
+<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";>
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>apache-jdkim-project</artifactId>
         <groupId>org.apache.james.jdkim</groupId>
         <version>0.3-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <groupId>org.apache.james.jdkim</groupId>
     <artifactId>apache-jdkim-mailets</artifactId>
+
     <name>jDKIM Mailets for Apache James</name>
-    <url>http://james.apache.org/jdkim/mailets/</url>
     <description>Mailets integrating DKIM functions</description>
+    <url>http://james.apache.org/jdkim/mailets/</url>
 
     <distributionManagement>
         <site>

Modified: james/jdkim/trunk/main/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/pom.xml?rev=1186149&r1=1186148&r2=1186149&view=diff
==============================================================================
--- james/jdkim/trunk/main/pom.xml (original)
+++ james/jdkim/trunk/main/pom.xml Wed Oct 19 12:17:51 2011
@@ -1,54 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
+    or more contributor license agreements. See the NOTICE file
     distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
+    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
+    with the License. You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    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
+    KIND, either express or implied. See the License for the
     specific language governing permissions and limitations
-    under the License.    
+    under the License.
 -->
-<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";>
+<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";>
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>apache-jdkim-project</artifactId>
         <groupId>org.apache.james.jdkim</groupId>
         <version>0.3-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <groupId>org.apache.james.jdkim</groupId>
     <artifactId>apache-jdkim-library</artifactId>
-    <name>Apache JAMES jDKIM</name>
     <packaging>jar</packaging>
+
+    <name>Apache JAMES jDKIM</name>
     <description>A Java implementation for the DKIM 
specification.</description>
     <url>http://james.apache.org/jdkim/main/</url>
     <inceptionYear>2008</inceptionYear>
 
-    <distributionManagement>
-        <site>
-            <id>jdkim-website-main</id>
-            <url>scp://people.apache.org/www/james.apache.org/jdkim/main/</url>
-        </site>
-    </distributionManagement>
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>http://issues.apache.org/jira/browse/JDKIM</url>
-    </issueManagement>
+    <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/jdkim/trunk</connection>
         
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/jdkim/trunk</developerConnection>
         <url>http://svn.apache.org/viewvc/james/jdkim/trunk/</url>
     </scm>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>http://issues.apache.org/jira/browse/JDKIM</url>
+    </issueManagement>
+
+    <distributionManagement>
+        <site>
+            <id>jdkim-website-main</id>
+            <url>scp://people.apache.org/www/james.apache.org/jdkim/main/</url>
+        </site>
+    </distributionManagement>
 
     <dependencies>
         <dependency>
@@ -101,7 +124,6 @@
     </dependencies>
 
     <build>
-
         <plugins>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -136,7 +158,7 @@
                         <!-- test resources created by JAMES committers / we 
can't include ALv2 headers there -->
                         
<exclude>src/test/resources/org/apache/james/jdkim/corpus/*</exclude>
                         
<exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/FAKE_DNS.dat</exclude>
-                        <!-- 3rd party resources described in NOTICE: see the 
maven-remote-resources-plugin 
+                        <!-- 3rd party resources described in NOTICE: see the 
maven-remote-resources-plugin
                             configuration, in this file -->
                         
<exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/corpus/*</exclude>
                         <!-- maven / IDE artifacts created during build -->
@@ -208,47 +230,47 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- 
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-doap-plugin</artifactId>
-              <executions>
+            <!--
+                <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-doap-plugin</artifactId>
+                <executions>
                 <execution>
-                  <id>site</id>
-                  <phase>site</phase>
-                  <goals>
-                    <goal>generate</goal>
-                  </goals>
+                <id>site</id>
+                <phase>site</phase>
+                <goals>
+                <goal>generate</goal>
+                </goals>
                 </execution>
-              </executions>
-              <configuration>
-               <doapOptions>
-                  <programmingLanguage>java</programmingLanguage>
-                 <category>mail</category>
-                 
<downloadPage>http://james.apache.org/download.cgi</downloadPage>
-               </doapOptions>
-               <asfExtOptions>
-                 <included>true</included>
-                 <pmc>http://james.apache.org</pmc>
-                 <name>Apache JAMES</name>
-                 <standards>
-                  <standard>
-                    <id>DKIM</id>
-                    <title>DomainKeys Identified Mail (DKIM) Signatures</title>
-                    <body>IEFT</body>
-                    <url>http://www.ietf.org/rfc/rfc4871.txt</url>
-                  </standard>
-                  <standard>
-                    <id>DKIM</id>
-                    <title>DomainKeys Identified Mail (DKIM) Signatures - - 
Update</title>
-                    <body>IEFT</body>
-                    <url>http://www.ietf.org/rfc/rfc5672.txt</url>
-                  </standard>
-                 </standards>
-               </asfExtOptions>
-              </configuration>
-            </plugin>
-             -->
+                </executions>
+                <configuration>
+                <doapOptions>
+                <programmingLanguage>java</programmingLanguage>
+                <category>mail</category>
+                
<downloadPage>http://james.apache.org/download.cgi</downloadPage>
+                </doapOptions>
+                <asfExtOptions>
+                <included>true</included>
+                <pmc>http://james.apache.org</pmc>
+                <name>Apache JAMES</name>
+                <standards>
+                <standard>
+                <id>DKIM</id>
+                <title>DomainKeys Identified Mail (DKIM) Signatures</title>
+                <body>IEFT</body>
+                <url>http://www.ietf.org/rfc/rfc4871.txt</url>
+                </standard>
+                <standard>
+                <id>DKIM</id>
+                <title>DomainKeys Identified Mail (DKIM) Signatures - - 
Update</title>
+                <body>IEFT</body>
+                <url>http://www.ietf.org/rfc/rfc5672.txt</url>
+                </standard>
+                </standards>
+                </asfExtOptions>
+                </configuration>
+                </plugin>
+            -->
             <!-- Shading commons-codec Base64 class so that we don't have one 
more dependency -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -295,22 +317,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <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>
-
 </project>

Modified: james/jdkim/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/pom.xml?rev=1186149&r1=1186148&r2=1186149&view=diff
==============================================================================
--- james/jdkim/trunk/pom.xml (original)
+++ james/jdkim/trunk/pom.xml Wed Oct 19 12:17:51 2011
@@ -1,41 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
+    or more contributor license agreements. See the NOTICE file
     distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
+    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
+    with the License. You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    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
+    KIND, either express or implied. See the License for the
     specific language governing permissions and limitations
-    under the License.    
+    under the License.
 -->
-<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";>
+<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";>
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
         <version>1.6</version>
+        <relativePath></relativePath>
     </parent>
+
     <groupId>org.apache.james.jdkim</groupId>
     <artifactId>apache-jdkim-project</artifactId>
-    <name>Apache JAMES DomainKey Project</name>
     <version>0.3-SNAPSHOT</version>
     <packaging>pom</packaging>
+
+    <name>Apache JAMES DomainKey Project</name>
     <description>Apache JAMES jDKIM Project</description>
     <url>http://james.apache.org/jdkim/</url>
     <inceptionYear>2009</inceptionYear>
 
-    <properties>
-        <target.jdk>1.5</target.jdk>
-    </properties>
+    <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>
@@ -43,6 +56,16 @@
         <module>assemble</module>
     </modules>
 
+    <scm>
+        
<connection>scm:svn:http://svn.apache.org/repos/asf/james/jdkim/trunk</connection>
+        
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/jdkim/trunk</developerConnection>
+        
<url>http://svn.apache.org/viewcvs.cgi/james/jdkim/trunk/?root=Apache-SVN</url>
+    </scm>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://issues.apache.org/jira/browse/JDKIM</url>
+    </issueManagement>
+
     <distributionManagement>
         <site>
             <id>jdkim-current-website</id>
@@ -50,26 +73,9 @@
         </site>
     </distributionManagement>
 
-    <issueManagement>
-        <system>JIRA</system>
-        <url>https://issues.apache.org/jira/browse/JDKIM</url>
-    </issueManagement>
-
-    <scm>
-        
<connection>scm:svn:http://svn.apache.org/repos/asf/james/jdkim/trunk</connection>
-        
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/jdkim/trunk</developerConnection>
-        
<url>http://svn.apache.org/viewcvs.cgi/james/jdkim/trunk/?root=Apache-SVN</url>
-    </scm>
-
-    <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>
+    <properties>
+        <target.jdk>1.5</target.jdk>
+    </properties>
 
     <dependencyManagement>
         <dependencies>
@@ -291,11 +297,11 @@
                     <version>2.7</version>
                 </plugin>
                 <!--
-                <plugin>
+                    <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-doap-plugin</artifactId>
                     <version>1.1</version>
-                </plugin>
+                    </plugin>
                 -->
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -353,40 +359,40 @@
                 </executions>
             </plugin>
             <!--
-            <plugin>
+                <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-doap-plugin</artifactId>
                 <configuration>
-                    <doapOptions>
-                        <programmingLanguage>java</programmingLanguage>
-                        
<downloadPage>http://james.apache.org/download.cgi</downloadPage>
-                    </doapOptions>
-                    <asfExtOptions>
-                        <included>true</included>
-                        <name>Apache JAMES</name>
-                        <pmc>http://james.apache.org</pmc>
-                        <chair>Norman Maurer</chair>
-                        <charter>Apache JAMES is dedicated to email related 
code in Java</charter>
-                        <standards>
-                            <standard>
-                                <title>DomainKeys Identified Mail (DKIM) 
Signatures</title>
-                                <url>http://www.ietf.org/rfc/rfc4871.txt</url>
-                                <id>RFC 4871</id>
-                                <body>IETF</body>
-                            </standard>
-                        </standards>
-                    </asfExtOptions>
+                <doapOptions>
+                <programmingLanguage>java</programmingLanguage>
+                
<downloadPage>http://james.apache.org/download.cgi</downloadPage>
+                </doapOptions>
+                <asfExtOptions>
+                <included>true</included>
+                <name>Apache JAMES</name>
+                <pmc>http://james.apache.org</pmc>
+                <chair>Norman Maurer</chair>
+                <charter>Apache JAMES is dedicated to email related code in 
Java</charter>
+                <standards>
+                <standard>
+                <title>DomainKeys Identified Mail (DKIM) Signatures</title>
+                <url>http://www.ietf.org/rfc/rfc4871.txt</url>
+                <id>RFC 4871</id>
+                <body>IETF</body>
+                </standard>
+                </standards>
+                </asfExtOptions>
                 </configuration>
                 <executions>
-                    <execution>
-                        <id>site</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
+                <execution>
+                <id>site</id>
+                <phase>site</phase>
+                <goals>
+                <goal>generate</goal>
+                </goals>
+                </execution>
                 </executions>
-            </plugin>
+                </plugin>
             -->
 
             <!-- Site generation -->
@@ -529,23 +535,23 @@
                             <artifactId>emma-maven-plugin</artifactId>
                         </plugin>
                         <!--
-                        <plugin>
-                          <groupId>org.apache.maven.plugins</groupId>
-                          <artifactId>maven-changes-plugin</artifactId>
-                          <configuration>
+                            <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>
+                            </configuration>
+                            <reportSets>
                             <reportSet>
-                              <reports>
-                                <report>jira-report</report>
-                              </reports>
+                            <reports>
+                            <report>jira-report</report>
+                            </reports>
                             </reportSet>
-                          </reportSets>
-                        </plugin>
+                            </reportSets>
+                            </plugin>
                         -->
                     </reportPlugins>
                 </configuration>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to