NXP-4766 - separate nuxeo-distribution build from nuxeo code build

README-java6.txt

@@ -7,7 +7,7 @@ built using the JDK6.
 You may want to build with the JDK5, however, and run with the JRE/JDK6.
 
 In this case, you must take the following information from JBoss into account
-(putting the 5 libraries mentionned below into the jboss/lib/endorsed/
+(putting the 5 libraries mentioned below into the jboss/lib/endorsed/
 directory seems to do the trick):
 
 """

README.txt

@@ -1,4 +1,4 @@
-How to build Nuxeo EP from these sources
+How to compile Nuxeo EP sources
 ========================================
 
 Short story
@@ -10,7 +10,6 @@ notably:
 
 - nuxeo-common
 - nuxeo-core
-- nuxeo-distribution
 - nuxeo-dm
 - nuxeo-features
 - nuxeo-gwt
@@ -19,6 +18,7 @@ notably:
 - nuxeo-services
 - nuxeo-theme
 - nuxeo-webengine
+- nuxeo-distribution
 
 Under Linux/Unix/MacOS: run ./clone.sh
 
@@ -27,39 +27,23 @@ Under Windows: run clone.bat
 See http://doc.nuxeo.org/xwiki/bin/view/FAQ/DownloadingNuxeoSources for more
 information if needed.
 
-2. Have JBoss 4.2.3 installed somewhere on your system (we like /opt/jboss, but
-YMMV).
-
-3. Copy build.properties.sample to build.properties and edit it to match the
-location of your JBoss instance (not needed if your JBoss is in /opt/jboss).
-
-4. Run:
-
-- "ant patch" (will "patch" your JBoss, modifying certain config files)
-
-- "ant deploy"
+2. Compile:
 
-NB: you only have to run "ant patch" once. You have to run "ant" or "ant
-deploy" each time you change the source code.
+- Using Ant: "ant install" or using Maven: "mvn clean install -Dmaven.test.skip=true"
 
-5. Start JBoss and go to http://localhost:8080/nuxeo/
-
-6. You're done.
-
-Alternative distributions
+Packaging Nuxeo EP from sources
 -------------------------
 
-To target other application servers (Jetty, Glassfish) or other DB backends
-(PostgreSQL, MySQL, Oracle, ...) see nuxeo-distribution/README.txt
+Various pre-configured packages (various application servers and multiple backends) 
+are available for download from:
+- http://maven.nuxeo.org/
+- http://www.nuxeo.com/downloads/
+
+In order to locally build Nuxeo EP, see nuxeo-distribution/README.txt
 
 Long story
 ----------
 
-If the information above are not enough, please read the "Detailed Development
-Software Installation Instructions" annex:
-
+If the information above are not enough, please read from the Nuxeo Book the 
+"Detailed Development Software Installation Instructions" annexe:
 http://doc.nuxeo.org/current/books/nuxeo-book/html/dev-environment-installation.html
-
-in the Nuxeo Book:
-
-http://doc.nuxeo.org/current/books/nuxeo-book/html/

build.properties.sample

@@ -1,25 +1,3 @@
-# Example for Windows
-jboss.dir=C:/Program Files/JBoss
-# Example for Unix
-#jboss.dir=/opt/jboss
-
-# Which JBoss server config to use
-jboss.config=default
-
 # additional command line parameters for mvn commands
 # e.g. to work offline:
 #mvn.opts=-o
-
-## Example for standard nuxeo-2parts
-## nuxeo-platform-stateful to bind on : nxplatformserver nxjmsserver
-#jboss1.dir=/opt/jboss1
-## nuxeo-web-stateless to bind on : nxwebserver
-#jboss2.dir=/opt/jboss2
-
-## Example for standard nuxeo-3parts
-## nuxeo-core to bind on : nxcoreserver nxjmsserver
-#jboss1.dir=/opt/jboss1
-## nuxeo-indexing to bind on : nxsearchserver
-#jboss2.dir=/opt/jboss2
-## nuxeo-webplatform to bind on : nxplatformserver
-#jboss3.dir=/opt/jboss3

build.xml

@@ -1,26 +1,8 @@
 <?xml version="1.0"?>
-<project name="Nuxeo EP" default="deploy" basedir=".">
+<project name="Nuxeo EP" default="install" basedir=".">
 
   <property file="build.properties" />
   <property name="mvn.opts" value="" />
-  <property name="jboss.config" value="default" />
-  <property name="jboss.dir" value="/opt/jboss" />
-  <property name="nuxeo.ear.root" value="${basedir}/nuxeo-distribution/nuxeo-distribution-dm/" />
-  <!--the default pom file to use for jboss-patch  -->
-  <property name="pom.file" value="${basedir}/nuxeo-distribution/nuxeo-distribution-jboss/jboss-patch/pom.xml" />
-
-  <!-- set default root properties if not set -->
-  <target name="set.jboss.home" unless="jboss.home">
-    <property name="jboss.home" value="${jboss.dir}" />
-  </target>
-  <!-- set default properties if not set -->
-  <target name="setproperties" unless="jboss.server" depends="set.jboss.home">
-    <property name="jboss.server" value="${jboss.home}/server/${jboss.config}" />
-    <property name="jboss.deploy" value="${jboss.server}/deploy" />
-    <property name="jboss.lib" value="${jboss.server}/lib" />
-    <property name="jboss.nuxeo.ear" value="${jboss.deploy}/nuxeo.ear" />
-    <property name="nuxeo.ear.build" value="${nuxeo.ear.root}/target/nuxeo.ear" />
-  </target>
 
   <condition property="osfamily-unix">
     <os family="unix" />
@@ -29,10 +11,6 @@
     <os family="windows" />
   </condition>
 
-  <target name="deploy" depends="install,package,copy" description="Deploy Nuxeo-EP on jboss" />
-  <target name="deploy-2parts" depends="install,package-2parts,copy-2parts" description="Deploy Nuxeo-EP on two jboss" />
-  <target name="deploy-3parts" depends="install,package-3parts,copy-3parts" description="Deploy Nuxeo-EP on three jboss" />
-
   <target name="clean" depends="clean-unix,clean-windows" description="Delete target directories" />
   <target name="clean-unix" if="osfamily-unix">
     <exec executable="mvn" failonerror="true">
@@ -49,9 +27,6 @@
     </exec>
   </target>
 
-  <!-- backward compatibility -->
-  <target name="undeploy" depends="jboss-clean" description="Undeploy Nuxeo-EP (deprecated : use jboss-clean instead)" />
-
   <target name="install" depends="clean,install-unix,install-windows" description="Run mvn install" />
   <target name="install-unix" if="osfamily-unix">
     <exec executable="env" />
@@ -71,102 +46,6 @@
     </exec>
   </target>
 
-  <target name="package-2parts" description="Package Nuxeo-EP in two parts">
-    <echo>DEPRECATED - please update your scripts to not call this target anymore</echo>
-    <antcall target="package">
-      <param name="jboss.home" value="${jboss1.dir}" />
-    </antcall>
-    <antcall target="package">
-      <param name="jboss.home" value="${jboss2.dir}" />
-    </antcall>
-  </target>
-  <target name="package-3parts" description="Package Nuxeo-EP in three parts">
-    <echo>DEPRECATED - please update your scripts to not call this target anymore</echo>
-    <antcall target="package">
-      <param name="jboss.home" value="${jboss1.dir}" />
-    </antcall>
-    <antcall target="package">
-      <param name="jboss.home" value="${jboss2.dir}" />
-    </antcall>
-    <antcall target="package">
-      <param name="jboss.home" value="${jboss3.dir}" />
-    </antcall>
-  </target>
-  <target name="package" depends="setproperties,package-unix,package-windows" description="Package Nuxeo-EP" />
-  <target name="package-unix" if="osfamily-unix">
-    <exec executable="mvn" failonerror="true">
-      <arg value="package" />
-      <arg value="-Dmaven.test.skip=true" />
-      <arg value="-f" />
-      <arg value="${nuxeo.ear.root}/pom.xml" />
-      <arg value="-N" />
-      <arg value="${mvn.opts}" />
-    </exec>
-  </target>
-  <target name="package-windows" if="osfamily-windows">
-    <exec executable="cmd" failonerror="true">
-      <arg value="/c" />
-      <arg value="mvn.bat" />
-      <arg value="package" />
-      <arg value="-Dmaven.test.skip=true" />
-      <arg value="-f" />
-      <arg value="${nuxeo.ear.root}/pom.xml" />
-      <arg value="-N" />
-      <arg value="${mvn.opts}" />
-    </exec>
-  </target>
-
-  <target name="jboss-clean" description="Remove Nuxeo-EP from jboss">
-    <ant target="jboss-clean" dir="nuxeo-distribution" />
-  </target>
-
-  <target name="jboss-clean-plugins" description="Delete plugins deployed in JBoss">
-    <ant target="jboss-clean-plugins" dir="nuxeo-distribution" />
-  </target>
-
-  <target name="jboss-clean-data" description="Delete data from JBoss">
-    <ant target="jboss-clean-data" dir="nuxeo-distribution" />
-  </target>
-
-  <target name="patch405" description="Patch a JBoss 4.0.5 for use by Nuxeo-EP (deprecated : no more 4.0.5 compatibility)">
-    <echo>Jboss 4.0.5 is not supported anymore, user Jboss >= 4.2.2</echo>
-  </target>
-  <target name="patch404" description="Patch a JBoss 4.0.4 for use by Nuxeo-EP (deprecated : no more 4.0.4 compatibility)">
-    <echo>Jboss 4.0.4 is not supported anymore, user Jboss >= 4.2.2</echo>
-  </target>
-
-  <target name="patch" description="Patch a JBoss 4.2.x for use by Nuxeo-EP">
-    <ant target="patch" dir="nuxeo-distribution/nuxeo-distribution-jboss" />
-  </target>
-
-  <target name="copy-2parts" description="Copy Nuxeo-EP in two parts">
-    <ant target="copy-2parts" dir="nuxeo-distribution" />
-  </target>
-  <target name="copy-3parts" description="Copy Nuxeo-EP in three parts">
-    <ant target="copy-3parts" dir="nuxeo-distribution" />
-  </target>
-  <target name="copy" description="Replace ear and copy libs to jboss" >
-    <ant target="copy" dir="nuxeo-distribution" />
-  </target>
-  <target name="copy-lib" description="Copy Nuxeo libs in jboss" >
-    <ant target="copy-lib" dir="nuxeo-distribution" />
-  </target>
-
-  <!-- Deprecated. TODO: JC. Removed when NXBT-57 is resolved -->
-  <target name="copy-postgresql" description="Deprecated. Deploy default postresql config">
-    <ant target="copy-postgresql" dir="nuxeo-distribution" />
-  </target>
-
-  <!-- Deprecated. TODO: JC. Removed when NXBT-57 is resolved -->
-  <target name="copy-oracle" description="Deprecated.">
-    <ant target="copy-oracle" dir="nuxeo-distribution" />
-  </target>
-
-  <!-- Deprecated. TODO: JC. Removed when NXBT-57 is resolved -->
-  <target name="copy-derby" description="Deprecated. Deploy default derby config">
-    <ant target="copy-derby" dir="nuxeo-distribution" />
-  </target>
-
   <target name="test" depends="test-unix,test-windows" description="Run tests" />
   <target name="test-unix" if="osfamily-unix">
     <exec executable="mvn" failonerror="true">

clone.bat

@@ -11,5 +11,7 @@ hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-jsf
 hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-gwt
 hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-features
 hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-dm
+
 hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-distribution
 
+hg clone -r 5.3 http://hg.nuxeo.org/addons ../nuxeo-addons

clone.sh

@@ -11,5 +11,7 @@ hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-jsf
 hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-gwt
 hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-features
 hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-dm
+
 hg clone -r 5.3 http://hg.nuxeo.org/nuxeo/nuxeo-distribution
 
+hg clone -r 5.3 http://hg.nuxeo.org/addons ../nuxeo-addons

credits.txt

@@ -16,7 +16,7 @@ bugfixes on the mailing list.
 Third-party libraries
 ---------------------
 
-This release contains open source librairies developped by the JBoss Group, the
+This release contains open source libraries developed by the JBoss Group, the
 Apache Foundation, Sun Microsystems, HP, the OSGi Alliance, the JMock project,
 the JFlex project, the Cup project, etc.
 

pom.xml

@@ -1761,15 +1761,6 @@
   </reporting>
 
   <profiles>
-    <profile>
-      <id>all-distributions</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <modules>
-        <module>nuxeo-distribution</module>
-      </modules>
-    </profile>
     <profile>
       <id>release</id>
       <activation>
@@ -1810,6 +1801,13 @@
                   <goal>jar</goal>
                 </goals>
               </execution>
+              <execution>
+                <id>aggregate</id>
+                <goals>
+                  <goal>aggregate</goal>
+                </goals>
+                <phase>site</phase>
+              </execution>
             </executions>
           </plugin>
         </plugins>
@@ -1820,6 +1818,10 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
+              <!--
+                aggregate parameter is deprecated since 2.5. use the aggregate
+                goal instead of
+              -->
               <aggregate>true</aggregate>
               <maxmemory>512m</maxmemory>
               <!--