geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r437294 - in /geronimo/server/trunk: assemblies/pom.xml configs/client/pom.xml configs/openejb-deployer/pom.xml modules/geronimo-tomcat-builder/pom.xml modules/geronimo-tomcat/pom.xml pom.xml
Date Sun, 27 Aug 2006 03:28:50 GMT
Author: jdillon
Date: Sat Aug 26 20:28:49 2006
New Revision: 437294

URL: http://svn.apache.org/viewvc?rev=437294&view=rev
Log:
Re-added m1 repo to pick up geronimo-samples, and added documentation why, will remove when
openejb2 does not reference
Using dependency plugin to install endorsed jars for tests, remove properties that were there
to support the previous method

Modified:
    geronimo/server/trunk/assemblies/pom.xml
    geronimo/server/trunk/configs/client/pom.xml
    geronimo/server/trunk/configs/openejb-deployer/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=437294&r1=437293&r2=437294&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Sat Aug 26 20:28:49 2006
@@ -35,9 +35,7 @@
     
     <properties>
         <!--
-        
         TODO: Move this where it can be shared with the configs/pom.xml values
-        
         -->
         <PlanServerHostname>0.0.0.0</PlanServerHostname>
         <PlanNamingPort>1099</PlanNamingPort>

Modified: geronimo/server/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/pom.xml?rev=437294&r1=437293&r2=437294&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client/pom.xml Sat Aug 26 20:28:49 2006
@@ -129,8 +129,15 @@
             <artifactId>concurrent</artifactId>
         </dependency>
         
-        <!-- FIXME: Need to use the correct gid/aid for this dependency -->
+        <!--
+        NOTE: OpenEJB2 still references geronimo-spec:geronimo-spec-corba in
+              a geronimo-dependency.xml, and until that is changed we need
+              to keep using this old m1-based artifact
+        -->
         <dependency>
+            <!--
+            <groupId>org.apache.geronimo.specs</groupId>
+            -->
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-corba</artifactId>
         </dependency>

Modified: geronimo/server/trunk/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/pom.xml?rev=437294&r1=437293&r2=437294&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/pom.xml Sat Aug 26 20:28:49 2006
@@ -75,12 +75,39 @@
             <artifactId>openejb-core</artifactId>
         </dependency>
         
-        <!-- FIXME: Need to use the correct gid/aid for this dependency -->
+        <!--
+        NOTE: OpenEJB2 still references geronimo-spec:geronimo-spec-corba in
+              a geronimo-dependency.xml, and until that is changed we need
+              to keep using this old m1-based artifact
+        -->
         <dependency>
+            <!--
+            <groupId>org.apache.geronimo.specs</groupId>
+            -->
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-corba</artifactId>
         </dependency>
         
     </dependencies>
+    
+    <!--
+    HACK: Need to include the Apache m1 snapshot repo to pick up geronimo-spec:geronimo-spec-corba
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml?rev=437294&r1=437293&r2=437294&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml Sat Aug 26 20:28:49 2006
@@ -159,6 +159,33 @@
             </plugin>
             
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-endorsed-jars</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>xerces</groupId>
+                                    <artifactId>xercesImpl</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>xml-apis</groupId>
+                                    <artifactId>xml-apis</artifactId>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 
@@ -198,16 +225,6 @@
                                         <include name="war1/**"/>
                                         <include name="war3/**"/>
                                         <include name="war4/**"/>
-                                    </fileset>
-                                </copy>
-                                
-                                <!--
-                                FIXME: Use dependency plugin.
-                                -->
-                                <copy todir="${project.build.directory}/endorsed" flatten="true">
-                                    <fileset dir="${settings.localRepository}">
-                                        <include name="xerces/xercesImpl/${xercesVersion}/*.jar"/>
-                                        <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar"/>
                                     </fileset>
                                 </copy>
                             </tasks>

Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/pom.xml?rev=437294&r1=437293&r2=437294&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Sat Aug 26 20:28:49 2006
@@ -31,11 +31,6 @@
     <artifactId>geronimo-tomcat</artifactId>
     <name>Geronimo :: Tomcat</name>
     
-    <properties>
-        <endorsedDir>${project.build.directory}/endorsed</endorsedDir>
-        <localRepoDir>${settings.localRepository}</localRepoDir>
-    </properties>
-    
     <dependencies>
     
         <dependency>
@@ -252,14 +247,41 @@
                     <systemProperties>
                         <property>
                             <name>java.endorsed.dirs</name>
-                            <value>${endorsedDir}</value>
+                            <value>${project.build.directory}/endorsed</value>
                         </property>
                     </systemProperties>
                     
                     <forkMode>pertest</forkMode>
                 </configuration>
             </plugin>
-
+            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-endorsed-jars</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>xerces</groupId>
+                                    <artifactId>xercesImpl</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>xml-apis</groupId>
+                                    <artifactId>xml-apis</artifactId>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -276,12 +298,6 @@
                                     <fileset dir="src/test/resources/deployables">
                                         <include name="war1/**" />
                                         <include name="war3/**" />
-                                    </fileset>
-                                </copy>
-                                <copy todir="${endorsedDir}" flatten="true">
-                                    <fileset dir="${localRepoDir}">
-                                        <include name="xerces/xercesImpl/${xercesVersion}/*.jar"
/>
-                                        <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar"
/>
                                     </fileset>
                                 </copy>
                             </tasks>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=437294&r1=437293&r2=437294&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Aug 26 20:28:49 2006
@@ -45,7 +45,6 @@
     </scm>
 
     <properties>
-        
         <genesis.version>1.0.0-SNAPSHOT</genesis.version>
 
         <!--
@@ -68,13 +67,6 @@
         HACK: Used by uddi-jetty and uddi-tomcat configs
         -->
         <tranqlVendorsVersion>1.1</tranqlVendorsVersion>
-        
-        <!--
-        HACK: Used by tomcate-builder tests, needs to replace with dependency plugin
-        -->
-        <xercesVersion>2.6.2</xercesVersion>
-        <xmlApisVersion>1.0.b2</xmlApisVersion>
-        
     </properties>
 
     <dependencyManagement>
@@ -87,9 +79,16 @@
                 <artifactId>geronimo-activation_1.0.2_spec</artifactId>
                 <version>1.1</version>
             </dependency>
-
-            <!-- FIXME: Need to use the correct groupId/artifactId for this dependency
-->
+            
+            <!--
+            NOTE: OpenEJB2 still references geronimo-spec:geronimo-spec-corba in
+                  a geronimo-dependency.xml, and until that is changed we need
+                  to keep using this old m1-based artifact
+            -->
             <dependency>
+                <!--
+                <groupId>org.apache.geronimo.specs</groupId>
+                -->
                 <groupId>geronimo-spec</groupId>
                 <artifactId>geronimo-spec-corba</artifactId>
                 <version>1.0</version>
@@ -367,7 +366,7 @@
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
-                <version>${xercesVersion}</version>
+                <version>2.6.2</version>
             </dependency>
 
             <dependency>
@@ -568,7 +567,7 @@
             <dependency>
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>
-                <version>${xmlApisVersion}</version>
+                <version>1.0.b2</version>
             </dependency>
 
             <dependency>



Mime
View raw message