james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r536929 - in /james/project/trunk: ./ maven-skin/ parent/ project/ project/stage/ stage/ stage/org.apache.maven.skins/ stage/org.apache.maven.skins/jars/ stage/org.apache.maven.skins/poms/
Date Thu, 10 May 2007 16:40:44 GMT
Author: bago
Date: Thu May 10 09:40:42 2007
New Revision: 536929

URL: http://svn.apache.org/viewvc?view=rev&rev=536929
Log:
Refactoring james-project layout to make poms tree consistent with folder tree.

Added:
    james/project/trunk/project/stage/
    james/project/trunk/stage/
    james/project/trunk/stage/org.apache.maven.skins/
    james/project/trunk/stage/org.apache.maven.skins/jars/
    james/project/trunk/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar   (with
props)
    james/project/trunk/stage/org.apache.maven.skins/poms/
    james/project/trunk/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom
Removed:
    james/project/trunk/parent/
Modified:
    james/project/trunk/HOWTO.txt
    james/project/trunk/maven-skin/pom.xml
    james/project/trunk/pom.xml
    james/project/trunk/project/pom.xml

Modified: james/project/trunk/HOWTO.txt
URL: http://svn.apache.org/viewvc/james/project/trunk/HOWTO.txt?view=diff&rev=536929&r1=536928&r2=536929
==============================================================================
--- james/project/trunk/HOWTO.txt (original)
+++ james/project/trunk/HOWTO.txt Thu May 10 09:40:42 2007
@@ -1,21 +1,25 @@
 How to build and publish the website:
 
  1. Install Apache Maven 2.0.6 and make its binary 'mvn' available on your PATH.
- 2. Enter parent folder and execute 'mvn -Plocal install'. This will generate the 
-    artifacts and install them without trying to remove them from remote repositories
-    (by using the "local" profile defined in the pom.xml).
- 3. Enter the maven-skin folder and execute 'mvn install'.
- 4. Return to the root and execute 'mvn -Plocal site'. This will generate the website for
-    each module.
- 5. Test the built site in your browser from target/site
- 6. If everything looks OK, copy target/site to the checkout of james/site/trunk/www folder
-    server/target/site to the checkout of james/site/trunk/www/server folder
-    server/2.2.0/target/site to the checkout of james/site/trunk/www/server/2.2.0 folder
- 7. If you are on windows make sure endlines are LF only.
- 8. Commit changes to SVN
- 9. Review generated pages on svn.apache.org/repos/asf/james/site/trunk/www
-10. svn-up on minotaur
-11. Wait for the changes to replicate to the Apache web server or setup 140.211.11.10:80
as 
+ 2. run "mvn -U -Plocal,parent clean install site:stage -DstagingDirectory={path}".
+    - the -U will force mvn to update plugins (check new installed skin when building
+      the project site.
+    - the -Plocal will force mvn to not lookup remote maven repositories for standard
+      dependencies.
+    - the -Pparent will add the local "stage" repository to the build (this is needed
+      so that the site generation for the parent folder will find the default maven
+      skin (this is only a workaround: the default skin is not used).
+    - install is needed because the site generated in the project module will search
+      for an installed skin.
+ 3. Test the built site in your browser from the {path} folder
+ 4. If everything looks OK, copy the {path} folder to the checkout of james/site/trunk/www
+    folder.
+ 5. If you are on windows make sure endlines are LF only
+    hint: running "ant" from james/site/trunk/ will do this (this will take a lot).
+ 6. Commit changes to SVN
+ 7. Review generated pages on svn.apache.org/repos/asf/james/site/trunk/www
+ 8. svn-up on minotaur
+ 9. Wait for the changes to replicate to the Apache web server or setup 140.211.11.10:80
as 
     a proxy to review the changes (described here: http://www.apache.org/dev/project-site.html)

 
 The logical tree of the poms is the following

Modified: james/project/trunk/maven-skin/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/maven-skin/pom.xml?view=diff&rev=536929&r1=536928&r2=536929
==============================================================================
--- james/project/trunk/maven-skin/pom.xml (original)
+++ james/project/trunk/maven-skin/pom.xml Thu May 10 09:40:42 2007
@@ -30,7 +30,7 @@
     <groupId>org.apache.james</groupId>
     <artifactId>james-parent</artifactId>
     <version>1.1-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
 

Modified: james/project/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/pom.xml?view=diff&rev=536929&r1=536928&r2=536929
==============================================================================
--- james/project/trunk/pom.xml (original)
+++ james/project/trunk/pom.xml Thu May 10 09:40:42 2007
@@ -30,6 +30,11 @@
   <prerequisites>
     <maven>2.0.6</maven>
   </prerequisites>
+  
+  <modules>
+    <module>maven-skin</module>
+    <module>project</module>
+  </modules>
 
   <url>http://james.apache.org/</url>
   <inceptionYear>2006</inceptionYear>
@@ -161,9 +166,9 @@
   </developers>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk/parent</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk/parent</developerConnection>
-    <url>http://svn.apache.org/viewvc/james/project/trunk/parent</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/james/project/trunk</url>
   </scm>
 
   <distributionManagement>
@@ -220,6 +225,26 @@
   </repositories>
   
   <profiles>
+    <!-- parent profile: used to find skin dependency in stage -->
+    <profile>
+      <id>parent</id>
+      <repositories>
+        <repository>
+          <id>local-james-parent-stage</id>
+          <name>Apache JAMES parent stage repository folder</name>
+          <url>file://${basedir}/stage</url>
+          <layout>legacy</layout>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
     <!-- local profile: used to ignore remote repositories in a local build -->
     <profile>
       <id>local</id>

Modified: james/project/trunk/project/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/project/pom.xml?view=diff&rev=536929&r1=536928&r2=536929
==============================================================================
--- james/project/trunk/project/pom.xml (original)
+++ james/project/trunk/project/pom.xml Thu May 10 09:40:42 2007
@@ -31,7 +31,7 @@
     <groupId>org.apache.james</groupId>
     <artifactId>james-parent</artifactId>
     <version>1.1-SNAPSHOT</version>
-    <relativePath>parent/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modules>
@@ -51,9 +51,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/james/project/trunk</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk/project</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk/project</developerConnection>
+    <url>http://svn.apache.org/viewvc/james/project/trunk/project</url>
   </scm>
 
   <distributionManagement>

Added: james/project/trunk/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar
URL: http://svn.apache.org/viewvc/james/project/trunk/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar?view=auto&rev=536929
==============================================================================
Binary file - no diff available.

Propchange: james/project/trunk/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/project/trunk/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom
URL: http://svn.apache.org/viewvc/james/project/trunk/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom?view=auto&rev=536929
==============================================================================
--- james/project/trunk/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom (added)
+++ james/project/trunk/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom Thu May
10 09:40:42 2007
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <parent>
+    <artifactId>maven-skins</artifactId>
+    <groupId>org.apache.maven.skins</groupId>
+    <version>2</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.skins</groupId>
+  <artifactId>maven-default-skin</artifactId>
+  <name>Maven Default Skin</name>
+  <version>1.0</version>
+  <description>Maven Default Skin</description>
+  <url>http://maven.apache.org/skins/maven-default-skin</url>
+  <issueManagement>
+    <system>jira</system>
+    <url>http://jira.codehaus.org/browse/MNG</url>
+  </issueManagement>
+  <ciManagement>
+    <system>continuum</system>
+    <url>http://maven.zones.apache.org:8080/continuum</url>
+    <notifiers>
+      <notifier>
+        <configuration>
+          <address>notifications@maven.apache.org</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <inceptionYear>2002</inceptionYear>
+  <mailingLists>
+    <mailingList>
+      <name>Maven Announcements List</name>
+      <subscribe>announce-subscribe@maven.apache.org</subscribe>
+      <unsubscribe>announce-unsubscribe@maven.apache.org</unsubscribe>
+      <post>announce@maven.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Maven Issues List</name>
+      <subscribe>issues-subscribe@maven.apache.org</subscribe>
+      <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
+      <post>issues@maven.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Maven Notifications List</name>
+      <subscribe>notifications-subscribe@maven.apache.org</subscribe>
+      <unsubscribe>notifications-unsubscribe@maven.apache.org</unsubscribe>
+      <post>notifications@maven.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <id>jvanzyl</id>
+      <name>Jason van Zyl</name>
+      <email>jason@maven.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>PMC Chair</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>brett</id>
+      <name>Brett Porter</name>
+      <email>brett@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>+10</timezone>
+    </developer>
+    <developer>
+      <id>evenisse</id>
+      <name>Emmanuel Venisse</name>
+      <email>evenisse@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>kenney</id>
+      <name>Kenney Westerhof</name>
+      <email>kenney@apache.org</email>
+      <organization>Neonics</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>snicoll</id>
+      <name>Stephane Nicoll</name>
+      <email>snicoll@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>vmassol</id>
+      <name>Vincent Massol</name>
+      <email>vmassol@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>fgiust</id>
+      <name>Fabrizio Giustina</name>
+      <email>fgiust@apache.org</email>
+      <organization>openmind</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>epunzalan</id>
+      <name>Edwin Punzalan</name>
+      <email>epunzalan@mergere.com</email>
+      <organization>Mergere</organization>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>+8</timezone>
+    </developer>
+    <developer>
+      <id>mperham</id>
+      <name>Mike Perham</name>
+      <email>mperham@gmail.com</email>
+      <organization>Webify Solutions</organization>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-6</timezone>
+    </developer>
+    <developer>
+      <id>jdcasey</id>
+      <name>John Casey</name>
+      <email>jdcasey@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>trygvis</id>
+      <name>Trygve Laugstol</name>
+      <email>trygvis@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>vsiveton</id>
+      <name>Vincent Siveton</name>
+      <email>vsiveton@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </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/maven/skins/trunk/maven-default-skin</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-default-skin</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/skins/trunk/maven-default-skin</url>
+  </scm>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+  <build>
+    <sourceDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\main\java</sourceDirectory>
+    <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+    <testSourceDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\test\java</testSourceDirectory>
+    <outputDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\target\classes</outputDirectory>
+    <testOutputDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\target\test-classes</testOutputDirectory>
+    <resources>
+      <resource>
+        <directory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\main\resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\test\resources</directory>
+      </testResource>
+    </testResources>
+    <directory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\target</directory>
+    <finalName>maven-default-skin-1.0</finalName>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <tagBase>https://svn.apache.org/repos/asf/maven/skins/tags</tagBase>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.2</version>
+        <inherited>true</inherited>
+        <configuration>
+          <updateReleaseInfo>true</updateReleaseInfo>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.0-beta-3</version>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <inherited>true</inherited>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.0.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <inherited>true</inherited>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.1</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.1</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.2-SNAPSHOT</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.0</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-install-plugin</artifactId>
+        <version>2.1</version>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>http://svn.apache.org/maven-snapshot-repository</url>
+    </repository>
+    <repository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <name>Maven Repository Switchboard</name>
+      <url>http://repo1.maven.org/maven2</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <name>Maven Plugin Repository</name>
+      <url>http://repo1.maven.org/maven2</url>
+    </pluginRepository>
+  </pluginRepositories>
+  <reporting>
+    <outputDirectory>target/site</outputDirectory>
+  </reporting>
+  <distributionManagement>
+    <repository>
+      <id>apache.releases</id>
+      <name>Apache Release Distribution Repository</name>
+      <url>scp://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache.snapshots</id>
+      <name>Apache Development Snapshot Repository</name>
+      <url>scp://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+    </snapshotRepository>
+    <site>
+      <id>website</id>
+      <url>scp://minotaur.apache.org/www/maven.apache.org/skins/maven-default-skin</url>
+    </site>
+  </distributionManagement>
+</project>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message