geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r439379 - in /geronimo/server/trunk: ./ applications/geronimo-uddi-server/ applications/geronimo-welcome/ configs/client-corba/ configs/client-deployer/ configs/client-security/ configs/client-system/ configs/client/
Date Fri, 01 Sep 2006 17:07:01 GMT
Author: jdillon
Date: Fri Sep  1 10:07:00 2006
New Revision: 439379

URL: http://svn.apache.org/viewvc?rev=439379&view=rev
Log:
(GERONIMO-2373) Remove usage of j2ee 1.4 uber spec; Applied patch from Bill Dudney... thanks!

Modified:
    geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml
    geronimo/server/trunk/applications/geronimo-welcome/pom.xml
    geronimo/server/trunk/configs/client-corba/pom.xml
    geronimo/server/trunk/configs/client-deployer/pom.xml
    geronimo/server/trunk/configs/client-security/pom.xml
    geronimo/server/trunk/configs/client-system/pom.xml
    geronimo/server/trunk/configs/client/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml?rev=439379&r1=439378&r2=439379&view=diff
==============================================================================
--- geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml Fri Sep  1 10:07:00 2006
@@ -18,9 +18,9 @@
 <!-- $Rev$ $Date$ -->
 
 <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.geronimo.applications</groupId>
         <artifactId>applications</artifactId>
@@ -31,36 +31,35 @@
     <artifactId>geronimo-uddi-server</artifactId>
     <name>Geronimo Applications :: UDDI Server</name>
     <packaging>war</packaging>
-    
+
     <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
+
         <dependency>
             <groupId>juddi</groupId>
             <artifactId>juddi</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.0_spec</artifactId>
+        </dependency>
+
         <!-- Required for JSPC compilation -->
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
@@ -87,5 +86,5 @@
             </releases>
         </repository>
     </repositories>
-    
+
 </project>

Modified: geronimo/server/trunk/applications/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-welcome/pom.xml?rev=439379&r1=439378&r2=439379&view=diff
==============================================================================
--- geronimo/server/trunk/applications/geronimo-welcome/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-welcome/pom.xml Fri Sep  1 10:07:00 2006
@@ -18,9 +18,9 @@
 <!-- $Rev$ $Date$ -->
 
 <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.geronimo.applications</groupId>
         <artifactId>applications</artifactId>
@@ -31,43 +31,42 @@
     <artifactId>geronimo-welcome</artifactId>
     <name>Geronimo Applications :: Welcome</name>
     <packaging>war</packaging>
-    
+
     <description>
         This is a very simple application that is intended to serve as the default page
         that can be viewed when the server is first installed so that someone can see
         that the installation is working.
     </description>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-            <scope>provided</scope>
+            <artifactId>geronimo-jsp_2.0_spec</artifactId>
         </dependency>
-        
+
         <!-- Required for JSPC compilation -->
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>

Modified: geronimo/server/trunk/configs/client-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba/pom.xml?rev=439379&r1=439378&r2=439379&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client-corba/pom.xml (original)
+++ geronimo/server/trunk/configs/client-corba/pom.xml Fri Sep  1 10:07:00 2006
@@ -20,18 +20,18 @@
 <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.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>client-corba</artifactId>
     <name>Geronimo Configs :: Corba J2EE Client</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
         
         <!-- parent config -->
@@ -42,6 +42,11 @@
             <type>car</type>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </dependency>
+
         <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -56,9 +61,9 @@
             <groupId>org.openejb</groupId>
             <artifactId>openejb-core</artifactId>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -71,9 +76,9 @@
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                 </configuration>
+                </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/server/trunk/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/pom.xml?rev=439379&r1=439378&r2=439379&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/pom.xml Fri Sep  1 10:07:00 2006
@@ -33,6 +33,7 @@
     <packaging>car</packaging>
     
     <dependencies>
+        
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -40,13 +41,6 @@
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
-        <!--
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-        </dependency>
-        -->
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/trunk/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-security/pom.xml?rev=439379&r1=439378&r2=439379&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client-security/pom.xml (original)
+++ geronimo/server/trunk/configs/client-security/pom.xml Fri Sep  1 10:07:00 2006
@@ -20,18 +20,18 @@
 <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.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>client-security</artifactId>
     <name>Geronimo Configs :: J2EE Client Security</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
         
         <!-- parent -->
@@ -50,7 +50,12 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        </dependency>
+            
         <!-- not needed in m1 -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -71,9 +76,9 @@
             <version>${pom.version}</version>
         </dependency>
         -->
-        
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -88,5 +93,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/server/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-system/pom.xml?rev=439379&r1=439378&r2=439379&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/configs/client-system/pom.xml Fri Sep  1 10:07:00 2006
@@ -21,7 +21,7 @@
 <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.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
@@ -32,27 +32,32 @@
     <artifactId>client-system</artifactId>
     <name>Geronimo Configs :: Client System</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xmlParserAPIs</artifactId>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>

Modified: geronimo/server/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/pom.xml?rev=439379&r1=439378&r2=439379&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client/pom.xml Fri Sep  1 10:07:00 2006
@@ -40,7 +40,7 @@
             <artifactId>client-system</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency> 
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -71,18 +71,19 @@
             <artifactId>geronimo-common</artifactId>
             <version>${pom.version}</version>
         </dependency> -->
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.version}</version>
         </dependency>
+
         <!-- should be transitive dependency of geronimo-j2ee -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -95,19 +96,19 @@
             <artifactId>geronimo-transaction</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
         <!-- ??? 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
         </dependency> -->
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-client</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis</artifactId>
@@ -119,12 +120,22 @@
             <artifactId>geronimo-webservices</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        </dependency>
+            
         <!-- geronimo-spec-corba, geronimo-j2ee_1.4_spec -->
         <!-- openejb-core, tranql, asm, activemq, activeio, scout, juddi, 
              concurrent, jdom -->
-        
-         <dependency>
+
+        <dependency>
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
         </dependency>
@@ -142,11 +153,7 @@
             <artifactId>geronimo-spec-corba</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-        </dependency>
-        
+
     </dependencies>
-    
+
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=439379&r1=439378&r2=439379&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Sep  1 10:07:00 2006
@@ -92,12 +92,6 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-                <version>1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>



Mime
View raw message