geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r519504 - in /geronimo/sandbox/g1.1-activemq4: README.txt maven-activemq4.diff maven1-build.diff
Date Sun, 18 Mar 2007 01:43:40 GMT
Author: jdillon
Date: Sat Mar 17 18:43:39 2007
New Revision: 519504

URL: http://svn.apache.org/viewvc?view=rev&rev=519504
Log:
We need more hacks into the build to make it work... :-(

Added:
    geronimo/sandbox/g1.1-activemq4/maven1-build.diff
Removed:
    geronimo/sandbox/g1.1-activemq4/maven-activemq4.diff
Modified:
    geronimo/sandbox/g1.1-activemq4/README.txt

Modified: geronimo/sandbox/g1.1-activemq4/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/g1.1-activemq4/README.txt?view=diff&rev=519504&r1=519503&r2=519504
==============================================================================
--- geronimo/sandbox/g1.1-activemq4/README.txt (original)
+++ geronimo/sandbox/g1.1-activemq4/README.txt Sat Mar 17 18:43:39 2007
@@ -26,40 +26,38 @@
 How to Compile
 ==============
 
-Check out Geronimo 1.1.x (using 1.1.1 here):
+Check out Geronimo 1.1.x (using 1.1.1 here, other 1.1 *might* work too):
 
     svn co http://svn.apache.org/repos/asf/geronimo/server/tags/1.1.1 server-1.1.1
     cd server-1.1.1
 
 NOTE: Commands below are relative to server-1.1.1
 
-Check out the g1.1-activemq4 modules:
+Check out the latest repository module from the 1.1 branch, some artifacts are no
+longer available in any public m1 repo:
 
-    svn co http://svn.apache.org/repos/asf/geronimo/sandbox/g1.1-activemq4 activemq4
+    svn co http://svn.apache.org/repos/asf/geronimo/server/branches/1.1/repository
 
-Patch the server's build:
+Check out the g1.1-activemq4 modules:
 
-    patch -sp0 < activemq4/maven-activemq4.diff
+    svn co http://svn.apache.org/repos/asf/geronimo/sandbox/g1.1-activemq4 activemq4
 
-Build the server's modules and plugins:
+Patch the server's build to it has better chances of actually working, plus includes
+some bits to compile to new activemq4 stuff:
 
-    maven new1
+    patch -sp0 < activemq4/maven1-build.diff
 
-Build the activem4 modules:
+NOTE: This command should not output any text if the patch was applied successfully
 
-    maven activemq4
+Build the required modules:
 
-At this point, if both builds were successful you should have functional AciveMQ4
-modules to install into your server.
+    maven install-local-repository new1 new3 new4 activemq4 -Dmaven.test.skip=true
 
-NOTE: You *might* be able to simply run `maven` and it *might* generate a set
-      of assemblies to use inplace of an official release, but don't hold your
-      breath.  Better to just build the modules here, then install them into
-      an official assembly.
+At this point, if the build reported "BUILD SUCCESSFUL" successful you should
+have functional AciveMQ4 modules to install into your server.
 
 
 How to Install
 ==============
 
 TODO
-

Added: geronimo/sandbox/g1.1-activemq4/maven1-build.diff
URL: http://svn.apache.org/viewvc/geronimo/sandbox/g1.1-activemq4/maven1-build.diff?view=auto&rev=519504
==============================================================================
--- geronimo/sandbox/g1.1-activemq4/maven1-build.diff (added)
+++ geronimo/sandbox/g1.1-activemq4/maven1-build.diff Sat Mar 17 18:43:39 2007
@@ -0,0 +1,113 @@
+Index: configs/ldap-realm/project.xml
+===================================================================
+--- configs/ldap-realm/project.xml	(revision 519498)
++++ configs/ldap-realm/project.xml	(working copy)
+@@ -120,12 +120,6 @@
+             <artifactId>activeio</artifactId>
+             <version>${activeio_version}</version>
+         </dependency>
+-       <dependency>
+-            <groupId>scout</groupId>
+-            <artifactId>jaxr-api</artifactId>
+-            <version>${scout_version}</version>
+-        </dependency>
+-
+         <dependency>
+             <groupId>scout</groupId>
+             <artifactId>scout</artifactId>
+Index: configs/client/project.xml
+===================================================================
+--- configs/client/project.xml	(revision 519498)
++++ configs/client/project.xml	(working copy)
+@@ -270,14 +270,6 @@
+             <artifactId>org.mortbay.jetty</artifactId>
+             <version>${jetty_version}</version>
+         </dependency>
+-       <dependency>
+-            <groupId>scout</groupId>
+-            <artifactId>jaxr-api</artifactId>
+-            <version>${scout_version}</version>
+-            <properties>
+-                 <geronimo.dependency>true</geronimo.dependency>
+-            </properties>
+-        </dependency>
+ 
+         <dependency>
+             <groupId>scout</groupId>
+Index: project.properties
+===================================================================
+--- project.properties	(revision 519498)
++++ project.properties	(working copy)
+@@ -18,6 +18,12 @@
+ 
+ # the directory containing the geronimo website in CVS
+ 
++maven.repo.remote=\
++    http://people.apache.org/repo/m1-snapshot-repository,\
++    http://dist.codehaus.org,\
++    http://www.mortbay.org/maven,\
++    http://repo1.maven.org/maven
++
+ geronimo.cvs.docdir = ../incubator-site/build/site/projects/geronimo
+ 
+ #module.excludes=axis
+Index: maven.xml
+===================================================================
+--- maven.xml	(revision 519498)
++++ maven.xml	(working copy)
+@@ -43,6 +43,16 @@
+             goals="multiproject:install-callback" banner="geronimo and geronimo-plugins"
ignoreFailures="false" />
+     </goal>
+ 
++    <goal name="activemq4">
++        <maven:reactor basedir="${basedir}" includes="activemq4/*/project.xml"
++            goals="multiproject:install-callback" banner="activemq4" ignoreFailures="false"
/>
++    </goal>
++    
++    <goal name="install-local-repository">
++        <maven:reactor basedir="${basedir}" includes="repository/project.xml"
++            excludes="" goals="default" banner="repository" ignoreFailures="false" />
++    </goal>
++    
+     <goal name="new2">
+         <maven:reactor basedir="${basedir}" includes="openejb/modules/core/project.xml,openejb/modules/pkgen-builder/project.xml,openejb/modules/openejb-builder/project.xml"
+             excludes="" goals="multiproject:install-callback" banner="openejb" ignoreFailures="false"
/>
+Index: etc/project.properties
+===================================================================
+--- etc/project.properties	(revision 519498)
++++ etc/project.properties	(working copy)
+@@ -26,10 +26,10 @@
+ #####################################################
+ 
+ maven.repo.remote=\
+-http://people.apache.org/repo/m1-snapshot-repository,\
+-http://dist.codehaus.org,\
+-http://www.mortbay.com/maven,\
+-http://www.ibiblio.org/maven
++    http://people.apache.org/repo/m1-snapshot-repository,\
++    http://dist.codehaus.org,\
++    http://www.mortbay.org/maven,\
++    http://repo1.maven.org/maven
+ 
+ maven.remote.group=apcvs
+ 
+Index: etc/maven.xml
+===================================================================
+--- etc/maven.xml	(revision 519498)
++++ etc/maven.xml	(working copy)
+@@ -52,7 +52,14 @@
+     <attainGoal name="clean"/>
+     <attainGoal name="build"/>
+   </goal>
+-
++  
++  <!--
++  HACK: Seems like newer m1 plugin's don't properly jar:install before war muck
++  -->
++  <preGoal name="war:webapp">
++    <attainGoal name="jar:install"/>
++  </preGoal>
++    
+   <!-- For testing -->
+   <goal name="hello">
+     <ant:echo>



Mime
View raw message