[Jpackage-commits] dist/geronimo-specs/devel .cvsignore, 1.1, 1.2 geronimo-specs-1.2-pom_xml.patch, NONE, 1.1 geronimo-specs-j2ee-1.4-pom_xml.patch, NONE, 1.1 geronimo-specs-j2ee-connector-1.5-pom_xml.patch, NONE, 1.1 geronimo-specs-jpp-depmap.xml, NONE, 1.1 geronimo-specs-jta-1.0.1B-pom_xml.patch, NONE, 1.1 geronimo-specs-servlet-2.4-pom_xml.patch, NONE, 1.1 geronimo-specs.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:15:02 CEST 2008


Update of /home/projects/jpackage/cvs/dist/geronimo-specs/devel
In directory ryu.zarb.org:/tmp/cvs-serv1544/devel

Modified Files:
	.cvsignore sources 
Added Files:
	geronimo-specs-1.2-pom_xml.patch 
	geronimo-specs-j2ee-1.4-pom_xml.patch 
	geronimo-specs-j2ee-connector-1.5-pom_xml.patch 
	geronimo-specs-jpp-depmap.xml 
	geronimo-specs-jta-1.0.1B-pom_xml.patch 
	geronimo-specs-servlet-2.4-pom_xml.patch geronimo-specs.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/geronimo-specs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:14:42 -0000	1.1
--- .cvsignore	28 May 2008 18:15:00 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ geronimo-specs-1.2-src.tar.gz

--- NEW FILE: geronimo-specs-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<dependencies>
   <dependency>
      <maven>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>${junit_version}</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit</artifactId>
         <version>${junit_version}</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>mockobjects</groupId>
         <artifactId>mockobjects-core</artifactId>
         <version>1.0</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>mockobjects-core</artifactId>
         <version>1.0</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>mx4j</groupId>
         <artifactId>mx4j</artifactId>
         <version>1.0</version>
      </maven>
      <jpp>
         <groupId>JPP/mx4j</groupId>
         <artifactId>mx4j</artifactId>
         <version>1.0</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>scout</groupId>
         <artifactId>scout</artifactId>
         <version>0.5</version>
      </maven>
      <jpp>
         <groupId>JPP/ws-scout</groupId>
         <artifactId>scout</artifactId>
         <version>1.0</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>scout</groupId>
         <artifactId>scout</artifactId>
         <version>1.0</version>
      </maven>
      <jpp>
         <groupId>JPP/ws-scout</groupId>
         <artifactId>scout</artifactId>
         <version>1.0</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>plexus</groupId>
         <artifactId>plexus-compiler-api</artifactId>
         <version>1.5</version>
      </maven>
      <jpp>
         <groupId>JPP/plexus</groupId>
         <artifactId>compiler-api</artifactId>
         <version>1.5</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>logkit</groupId>
         <artifactId>logkit</artifactId>
         <version>1.2.2</version>
      </maven>
      <jpp>
         <groupId>JPP/excalibur</groupId>
         <artifactId>avalon-logkit</artifactId>
         <version>1.2.2</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>org.jacorb</groupId>
         <artifactId>jacorb-idl-compiler</artifactId>
         <version>1.0</version>
      </maven>
      <jpp>
         <groupId>JPP/jacorb</groupId>
         <artifactId>idl</artifactId>
         <version>1.0</version>
      </jpp>
   </dependency>
</dependencies>

--- NEW FILE: geronimo-specs-servlet-2.4-pom_xml.patch ---
--- geronimo-servlet_2.4_spec-1.1.1/pom.xml.sav3	2007-10-17 13:07:04.000000000 +0200
+++ geronimo-servlet_2.4_spec-1.1.1/pom.xml	2007-10-17 13:07:44.000000000 +0200
@@ -58,9 +58,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <verbose>true</verbose>
-                    <source>1.3</source>
-                    <target>1.3</target>
-                    <compilerVersion>1.3</compilerVersion>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                    <compilerVersion>1.4</compilerVersion>
                 </configuration>
             </plugin>
         </plugins>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/geronimo-specs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:14:42 -0000	1.1
--- sources	28 May 2008 18:15:00 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ dc19acd6f91cc9b477b75ecb0b8e2a87  geronimo-specs-1.2-src.tar.gz

--- NEW FILE: geronimo-specs-jta-1.0.1B-pom_xml.patch ---
--- geronimo-jta_1.0.1B_spec-1.1.1/pom.xml.sav1	2007-10-17 12:56:38.000000000 +0200
+++ geronimo-jta_1.0.1B_spec-1.1.1/pom.xml	2007-10-17 12:57:17.000000000 +0200
@@ -41,9 +41,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <verbose>true</verbose>
-                    <source>1.3</source>
-                    <target>1.3</target>
-                    <compilerVersion>1.3</compilerVersion>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                    <compilerVersion>1.4</compilerVersion>
                 </configuration>
             </plugin>
         </plugins>

--- NEW FILE: geronimo-specs.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
[...3250 lines suppressed...]
- Add missing dependency on isorelax
- Set JAVA_HOME
- Rename pom files to prevent conflict with similar files from other packages

* Thu Apr 28 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M2.2jpp_1rh
- First Red Hat build
- Add missing build requires for jakarta-commons-jelly-tags-xml and forehead
- Add missing build requires for maven-plugins-base
- Use unversioned maven directory and require version >= 1.0.2

* Thu Feb 03 2005 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.M2.2jpp
- Process project.xml files with saxon
- Don't tamper with $HOME
- Don't use build-jar-repository: [xyz].jar will not work with geronimo deploy

* Fri Oct 08 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.M2.1jpp
- Upgrade to M2
* Thu Sep 30 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.M1.1jpp
- First JPackage build


--- NEW FILE: geronimo-specs-j2ee-1.4-pom_xml.patch ---
--- geronimo-spec-j2ee/pom.xml.sav4	2007-10-18 13:28:50.000000000 +0200
+++ geronimo-spec-j2ee/pom.xml	2007-10-18 13:29:40.000000000 +0200
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>specs</artifactId>
     <groupId>org.apache.geronimo.specs</groupId>
-    <version>1.1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geronimo-j2ee_1.4_spec</artifactId>
   <name>J2EE</name>
-  <version>${geronimoSpecsVersion}</version>
+  <version>1.2</version>
   <packaging>pom</packaging>
   
   <scm>

--- NEW FILE: geronimo-specs-j2ee-connector-1.5-pom_xml.patch ---
--- geronimo-j2ee-connector_1.5_spec-1.1.1/pom.xml.sav2	2007-10-17 12:59:37.000000000 +0200
+++ geronimo-j2ee-connector_1.5_spec-1.1.1/pom.xml	2007-10-17 12:59:52.000000000 +0200
@@ -50,9 +50,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <verbose>true</verbose>
-                    <source>1.3</source>
-                    <target>1.3</target>
-                    <compilerVersion>1.3</compilerVersion>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                    <compilerVersion>1.4</compilerVersion>
                 </configuration>
             </plugin>
         </plugins>

--- NEW FILE: geronimo-specs-1.2-pom_xml.patch ---
--- pom.xml.sav0	2007-10-17 11:59:14.000000000 +0200
+++ pom.xml	2007-10-18 13:59:17.000000000 +0200
@@ -24,17 +24,19 @@
 
     <modelVersion>4.0.0</modelVersion>
 
+<!--
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
         <version>1.1</version>
     </parent>
+-->
 
     <groupId>org.apache.geronimo.specs</groupId>
     <artifactId>specs</artifactId>
     <packaging>pom</packaging>
     <name>Geronimo Specifications</name>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2</version>
 
     <description>
         Provides open-source implementations of Sun specifications.
@@ -74,6 +76,7 @@
 
     <build>
         <plugins>
+<!--
             <plugin>
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>
@@ -87,6 +90,7 @@
                     </execution>
                 </executions>
             </plugin>
+-->
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -114,6 +118,7 @@
                 </configuration>
             </plugin>
 
+<!--
 	        <plugin>
 	            <groupId>org.apache.felix</groupId>
 	            <artifactId>maven-bundle-plugin</artifactId>
@@ -131,20 +136,46 @@
 		           </instructions>
 		        </configuration>
 	        </plugin>
+-->
 
         </plugins>
     </build>
     
     <modules>
-        <module>geronimo-activation_1.1_spec</module>
-        <module>geronimo-commonj_1.1_spec</module>
+        <module>geronimo-activation_1.0.2_spec-1.2</module>
+        <module>geronimo-activation_1.1_spec-1.0</module>
+        <module>geronimo-ejb_2.1_spec-1.1</module>
+        <module>geronimo-el_1.0_spec-1.0</module>
+        <module>geronimo-j2ee-connector_1.5_spec-1.1.1</module>
+        <module>geronimo-j2ee-deployment_1.1_spec-1.1</module>
+        <module>geronimo-j2ee-jacc_1.0_spec-1.1</module>
+        <module>geronimo-j2ee-management_1.0_spec-1.1</module>
+        <module>geronimo-j2ee-management_1.1_spec-1.0</module>
+        <module>geronimo-jacc_1.1_spec-1.0</module>
+<!--
         <module>geronimo-jaspi_1.0_spec</module>
-        <module>geronimo-javamail_1.4_spec</module>
-        <module>geronimo-j2ee-management_1.1_spec</module>
-        <module>geronimo-jms_1.1_spec</module>
-        <module>geronimo-jta_1.1_spec</module>
-        <module>geronimo-servlet_2.5_spec</module>
-        <module>geronimo-stax-api_1.0_spec</module>
+-->
+        <module>geronimo-javaee-deployment_1.1MR3_spec-1.0</module>
+        <module>geronimo-javamail_1.3.1_spec-1.3</module>
+        <module>geronimo-javamail_1.4_spec-1.1</module>
+        <module>geronimo-jaxr_1.0_spec-1.1</module>
+        <module>geronimo-jaxrpc_1.1_spec-1.1</module>
+        <module>geronimo-jms_1.1_spec-1.1</module>
+        <module>geronimo-jpa_3.0_spec-1.1.0</module>
+        <module>geronimo-jsp_2.0_spec-1.1</module>
+        <module>geronimo-jsp_2.1_spec-1.0</module>
+        <module>geronimo-jta_1.0.1B_spec-1.1.1</module>
+        <module>geronimo-jta_1.1_spec-1.1.0</module>
+        <module>geronimo-qname_1.1_spec-1.1</module>
+        <module>geronimo-saaj_1.1_spec-1.1</module>
+        <module>geronimo-servlet_2.4_spec-1.1.1</module>
+        <module>geronimo-servlet_2.5_spec-1.1</module>
+        <module>geronimo-spec-commonj</module>
+        <module>geronimo-spec-corba</module>
+        <module>geronimo-spec-corba-2.3</module>
+        <module>geronimo-spec-corba-3.0</module>
+        <module>geronimo-stax-api_1.0_spec-1.0</module>
+        <module>geronimo-ws-metadata_2.0_spec-1.1.1</module>
     </modules>
 
     <profiles>
@@ -160,9 +191,9 @@
             </activation>
 
             <modules>
-		        <module>geronimo-annotation_1.0_spec</module>
-		        <module>geronimo-ejb_3.0_spec</module>
-		        <module>geronimo-interceptor_3.0_spec</module>
+                        <module>geronimo-annotation_1.0_spec-1.1.0</module>
+                        <module>geronimo-ejb_3.0_spec-1.0</module>
+                        <module>geronimo-interceptor_3.0_spec-1.0</module>
             </modules>
         </profile>
     </profiles>




More information about the JPackage-commits mailing list