geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r437298 - in /geronimo/server/trunk: applications/console/geronimo-console-core/pom.xml applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/core/system/serverinfo/ pom.xml
Date Sun, 27 Aug 2006 04:28:35 GMT
Author: jdillon
Date: Sat Aug 26 21:28:32 2006
New Revision: 437298

URL: http://svn.apache.org/viewvc?rev=437298&view=rev
Log:
Removed ServerConstants and SEServerInfo & related bits needed to generate the properties
it was loading
Removed geronimo-samples from top level pom now that we use versions from application/geronimo-examples

Removed:
    geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/core/system/serverinfo/
Modified:
    geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml?rev=437298&r1=437297&r2=437298&view=diff
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml Sat Aug 26 21:28:32
2006
@@ -51,41 +51,4 @@
         
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <tasks>
-                                <tstamp>
-                                    <format property="build.date" pattern="yyyy.MM.dd"
/>
-                                    <format property="build.time" pattern="HH:mm:ss.SSSZ"
/>
-                                    <format property="build.year" pattern="yyyy" />
-                                </tstamp>
-                                <property name="gen.file.name" value="${basedir}/target/classes/org/apache/geronimo/console/core/system/serverinfo/geronimo-version.properties"/>
-                                <touch file="${gen.file.name}" mkdirs="true"/>
-                                <echo file="${gen.file.name}">
-##### Generated by Maven2 ####
-version=${pom.version}
-build.date=${build.date}
-build.time=${build.time}
-copyright=Copyright (C) 2003-${build.year}, The Apache Software Foundation
-geronimo.build.version=${pom.version}
-geronimo.spec.version=${geronimoSpecJmsVersion}
-portal.core.version=${plutoVersion}
-                </echo>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=437298&r1=437297&r2=437298&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Aug 26 21:28:32 2006
@@ -46,12 +46,6 @@
 
     <properties>
         <!--
-        HACK: Used by console-core to generate geronimo-version.properties.
-        -->
-        <plutoVersion>1.0.1</plutoVersion>
-        <geronimoSpecJmsVersion>1.0.1</geronimoSpecJmsVersion>
-        
-        <!--
         HACK: Used by uddi-db to execute the sql plugin with the Derby driver.
         -->
         <derbyVersion>10.1.1.0</derbyVersion>
@@ -70,8 +64,6 @@
     <dependencyManagement>
         <dependencies>
 
-            <!-- Geronimo specification versions -->
-
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.0.2_spec</artifactId>
@@ -161,7 +153,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jms_1.1_spec</artifactId>
-                <version>${geronimoSpecJmsVersion}</version>
+                <version>1.0.1</version>
             </dependency>
 
             <dependency>
@@ -188,8 +180,6 @@
                 <version>1.0.1</version>
             </dependency>
 
-            <!-- External dependency versions -->
-
             <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
@@ -418,19 +408,19 @@
             <dependency>
                 <groupId>org.apache.pluto</groupId>
                 <artifactId>pluto</artifactId>
-                <version>${plutoVersion}</version>
+                <version>1.0.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.pluto</groupId>
                 <artifactId>pluto-portal</artifactId>
-                <version>${plutoVersion}</version>
+                <version>1.0.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.pluto</groupId>
                 <artifactId>pluto-descriptors</artifactId>
-                <version>${plutoVersion}</version>
+                <version>1.0.1</version>
             </dependency>
 
             <dependency>
@@ -655,24 +645,6 @@
                 <groupId>tomcat</groupId>
                 <artifactId>jasper-runtime</artifactId>
                 <version>${tomcatVersion}</version>
-            </dependency>
-            
-            <!--
-            TODO: Remove geronimo-samples deps and use our own applications/geronimo-example
modules
-            -->
-            
-            <dependency>
-                <groupId>geronimo-samples</groupId>
-                <artifactId>geronimo-jsp-examples-tomcat</artifactId>
-                <version>${tomcatVersion}</version>
-                <type>war</type>
-            </dependency>
-            
-            <dependency>
-                <groupId>geronimo-samples</groupId>
-                <artifactId>geronimo-servlet-examples-tomcat</artifactId>
-                <version>${tomcatVersion}</version>
-                <type>war</type>
             </dependency>
             
             <dependency>



Mime
View raw message