geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r330478 - in /geronimo: specs/trunk/ specs/trunk/geronimo-spec-activation/ specs/trunk/geronimo-spec-jaxrpc/ specs/trunk/geronimo-spec-jsp/ specs/trunk/geronimo-spec-servlet/ trunk/ trunk/etc/
Date Thu, 03 Nov 2005 06:17:55 GMT
Author: dain
Date: Wed Nov  2 22:17:50 2005
New Revision: 330478

URL: http://svn.apache.org/viewcvs?rev=330478&view=rev
Log:
Specs build now publishes to both the m1 and m2 local and remote repositories.
Added resource declarations to poms.
Fixed a few typos

Modified:
    geronimo/specs/trunk/geronimo-spec-activation/pom.xml
    geronimo/specs/trunk/geronimo-spec-jaxrpc/pom.xml
    geronimo/specs/trunk/geronimo-spec-jsp/pom.xml
    geronimo/specs/trunk/geronimo-spec-servlet/pom.xml
    geronimo/specs/trunk/pom.xml
    geronimo/trunk/etc/project.properties
    geronimo/trunk/pom.xml

Modified: geronimo/specs/trunk/geronimo-spec-activation/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-activation/pom.xml?rev=330478&r1=330477&r2=330478&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-activation/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-spec-activation/pom.xml Wed Nov  2 22:17:50 2005
@@ -6,6 +6,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geronimo-spec-activation</artifactId>
-  <name>Geronimo Activation</name>
+  <name>Activation</name>
   <version>${geronimoSpecActivationVersion}</version>
 </project>

Modified: geronimo/specs/trunk/geronimo-spec-jaxrpc/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-jaxrpc/pom.xml?rev=330478&r1=330477&r2=330478&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-jaxrpc/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-spec-jaxrpc/pom.xml Wed Nov  2 22:17:50 2005
@@ -6,7 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geronimo-spec-jaxrpc</artifactId>
-  <name></name>
+  <name>JAXRPC</name>
   <version>${geronimoSpecJaxrpcVersion}</version>
   <dependencies>
     <dependency>

Modified: geronimo/specs/trunk/geronimo-spec-jsp/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-jsp/pom.xml?rev=330478&r1=330477&r2=330478&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-jsp/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-spec-jsp/pom.xml Wed Nov  2 22:17:50 2005
@@ -7,11 +7,43 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geronimo-spec-jsp</artifactId>
   <name>JSP</name>
-  <version>${geronimoSpecJspVersiona}</version>
+  <version>${geronimoSpecJspVersion}</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-spec-servlet</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/schema</directory>
+        <targetPath>javax/servlet/jsp/resources</targetPath>
+        <includes>
+          <include>*.dtd</include>
+          <include>*.xsd</include>
+        </includes>
+      </resource>
+      <!-- Jetty needs the jsp_2_0.xsd file located at javax/servlet/resources/jsp_2_0.xsd
-->
+      <resource>
+        <directory>${basedir}/src/schema</directory>
+        <targetPath>javax/servlet/resources</targetPath>
+        <includes>
+          <include>jsp_2_0.xsd</include>
+        </includes>
+      </resource>
+      <!--
+         - Tomcat 5.0.28 needs the web-jsptaglibrary_2_0.xsd file
+         - located at javax/servlet/resources/web-jsptaglibrary_2_0.xsd
+         -->
+      <resource>
+        <directory>${basedir}/src/schema</directory>
+        <targetPath>javax/servlet/resources</targetPath>
+        <includes>
+          <include>web-jsptaglibrary_2_0.xsd</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
 </project>

Modified: geronimo/specs/trunk/geronimo-spec-servlet/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-servlet/pom.xml?rev=330478&r1=330477&r2=330478&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-servlet/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-spec-servlet/pom.xml Wed Nov  2 22:17:50 2005
@@ -8,4 +8,24 @@
   <artifactId>geronimo-spec-servlet</artifactId>
   <name>Servlet</name>
   <version>${geronimoSpecServletVersion}</version>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/java/javax/servlet</directory>
+        <targetPath>javax/servlet</targetPath>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/schema</directory>
+        <targetPath>javax/servlet/resources</targetPath>
+        <includes>
+          <include>*.dtd</include>
+          <include>*.xsd</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
 </project>

Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/pom.xml?rev=330478&r1=330477&r2=330478&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Wed Nov  2 22:17:50 2005
@@ -30,4 +30,12 @@
     <module>geronimo-spec-saaj</module>
     <module>geronimo-spec-servlet</module>
   </modules>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+      </resource>
+    </resources>
+  </build>
 </project>

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=330478&r1=330477&r2=330478&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Wed Nov  2 22:17:50 2005
@@ -100,9 +100,9 @@
 geronimo_spec_jms_version=1.1-rc4
 geronimo_spec_jsp_version=2.0-rc4
 geronimo_spec_jta_version=1.0.1B-rc4
+geronimo_spec_qname_version=1.1-rc4
 geronimo_spec_saaj_version=1.1-rc4
 geronimo_spec_servlet_version=2.4-rc4
-geronimo_spec_qname_version=1.1-rc4
 
 ant_version=1.5
 antlr_version=2.7.2

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/pom.xml?rev=330478&r1=330477&r2=330478&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Wed Nov  2 22:17:50 2005
@@ -1,5 +1,24 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 
+<!-- $Rev: 111629 $ $Date$ -->
+
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo</artifactId>
@@ -91,23 +110,23 @@
      | Geronimo specification versions
      |
      -->
-    <geronimoSpecActivationVersion>1.0-SNAPSHOT</geronimoSpecActivationVersion>
-    <geronimoSpecCorbaVersion>1.0-SNAPSHOT</geronimoSpecCorbaVersion>
-    <geronimoSpecEjbVersion>1.0-SNAPSHOT</geronimoSpecEjbVersion>
-    <geronimoSpecJ2eeVersion>1.0-SNAPSHOT</geronimoSpecJ2eeVersion>
-    <geronimoSpecJ2eeConnectorVersion>1.0-SNAPSHOT</geronimoSpecJ2eeConnectorVersion>
-    <geronimoSpecJ2eeDeploymentVersion>1.0-SNAPSHOT</geronimoSpecJ2eeDeploymentVersion>
-    <geronimoSpecJ2eeJaccVersion>1.0-SNAPSHOT</geronimoSpecJ2eeJaccVersion>
-    <geronimoSpecJ2eeManagementVersion>1.0-SNAPSHOT</geronimoSpecJ2eeManagementVersion>
-    <geronimoSpecJavamailVersion>1.0-SNAPSHOT</geronimoSpecJavamailVersion>
-    <geronimoSpecJaxrVersion>1.0-SNAPSHOT</geronimoSpecJaxrVersion>
-    <geronimoSpecJaxrpcVersion>1.0-SNAPSHOT</geronimoSpecJaxrpcVersion>
-    <geronimoSpecJmsVersion>1.0-SNAPSHOT</geronimoSpecJmsVersion>
-    <geronimoSpecJspVersion>1.0-SNAPSHOT</geronimoSpecJspVersion>
-    <geronimoSpecJtaVersion>1.0-SNAPSHOT</geronimoSpecJtaVersion>
-    <geronimoSpecQnameVersion>1.0-SNAPSHOT</geronimoSpecQnameVersion>
-    <geronimoSpecSaajVersion>1.0-SNAPSHOT</geronimoSpecSaajVersion>    
-    <geronimoSpecServletVersion>1.0-SNAPSHOT</geronimoSpecServletVersion>
+    <geronimoSpecActivationVersion>1.0.2-rc4</geronimoSpecActivationVersion>
+    <geronimoSpecCorbaVersion>2.3-rc4</geronimoSpecCorbaVersion>
+    <geronimoSpecEjbVersion>2.1-rc4</geronimoSpecEjbVersion>
+    <geronimoSpecJ2eeVersion>1.4-rc4</geronimoSpecJ2eeVersion>
+    <geronimoSpecJ2eeConnectorVersion>1.5-rc4</geronimoSpecJ2eeConnectorVersion>
+    <geronimoSpecJ2eeDeploymentVersion>1.1-rc4</geronimoSpecJ2eeDeploymentVersion>
+    <geronimoSpecJ2eeJaccVersion>1.0-rc5</geronimoSpecJ2eeJaccVersion>
+    <geronimoSpecJ2eeManagementVersion>1.0-rc4</geronimoSpecJ2eeManagementVersion>
+    <geronimoSpecJavamailVersion>1.3.1-rc6</geronimoSpecJavamailVersion>
+    <geronimoSpecJaxrVersion>1.0-rc4</geronimoSpecJaxrVersion>
+    <geronimoSpecJaxrpcVersion>1.1-rc4</geronimoSpecJaxrpcVersion>
+    <geronimoSpecJmsVersion>1.1-rc4</geronimoSpecJmsVersion>
+    <geronimoSpecJspVersion>2.0-rc4</geronimoSpecJspVersion>
+    <geronimoSpecJtaVersion>1.0.1B-rc4</geronimoSpecJtaVersion>
+    <geronimoSpecQnameVersion>1.1-rc4</geronimoSpecQnameVersion>
+    <geronimoSpecSaajVersion>1.1-rc4</geronimoSpecSaajVersion>
+    <geronimoSpecServletVersion>2.4-rc4</geronimoSpecServletVersion>
     <!--
      |
      | External dependency versions
@@ -262,24 +281,55 @@
 
   <distributionManagement>
     <repository>
-      <id>repo1</id>
-      <name>Maven Central Repository</name>
-      <url>scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2</url>
+      <id>apache-repo</id>
+      <name>Apache CVS Repository</name>
+      <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
     </repository>
     <snapshotRepository>
-      <id>snapshots</id>
-      <name>Maven Central Development Repository</name>
-      <url>scp://repo1.maven.org/home/projects/maven/repository-staging/snapshots/maven2</url>
+      <id>apache-snapshots</id>
+      <name>Apache CVS Development Repository</name>
+      <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
     </snapshotRepository>
     <site>
-      <id>website</id>
-      <url>scp://minotaur.apache.org/www/maven.apache.org/geronimo/</url>
+      <id>geronimo-website</id>
+      <url>scpexe://minotaur.apache.org/www/geronimo.apache.org/maven/</url>
     </site>
   </distributionManagement>
 
   <build>
     <sourceDirectory>src/java</sourceDirectory>
     <testSourceDirectory>src/test</testSourceDirectory>
+
+    <plugins>
+      <plugin>
+        <artifactId>maven-one-plugin</artifactId>
+        <executions>
+          <execution>
+            <configuration>
+              <remoteRepositoryUrl>scpexe://cvs.apache.org/www/cvs.apache.org/repository</remoteRepositoryUrl>
+            </configuration>
+            <goals>
+              <goal>install-maven-one-repository</goal>
+              <goal>deploy-maven-one-repository</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh-external</artifactId>
+        <version>1.0-alpha-5</version>
+      </extension>
+    </extensions>
   </build>
 
+  <pluginRepositories>
+    <pluginRepository>
+      <id>snapshots</id>
+      <name>Maven Central Plugins Development Repository</name>
+      <url>http://snapshots.maven.codehaus.org/maven2</url>
+    </pluginRepository>
+  </pluginRepositories>
 </project>



Mime
View raw message