[Jpackage-commits] rpms/free/maven-archetype2 maven-archetype-plugin-pom.patch, 1.1, NONE maven-archetype2-catalog-mdo.patch, NONE, 1.1 maven-archetype2-common-mdo.patch, NONE, 1.1 maven-archetype2-common-pom.patch, NONE, 1.1 maven-archetype2-descriptor-mdo.patch, NONE, 1.1 maven-archetype2-jpp-depmap.xml, 1.1, 1.2 maven-archetype2-mdo.patch, NONE, 1.1 maven-archetype2-plugin-pom.patch, NONE, 1.1 maven-archetype2-registry-mdo.patch, NONE, 1.1 maven-archetype2.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Sun Dec 5 19:32:00 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/maven-archetype2
In directory ryu.zarb.org:/tmp/NlsoYXNeTE/rpms/free/maven-archetype2

Modified Files:
	maven-archetype2-jpp-depmap.xml maven-archetype2.spec 
Added Files:
	maven-archetype2-catalog-mdo.patch 
	maven-archetype2-common-mdo.patch 
	maven-archetype2-common-pom.patch 
	maven-archetype2-descriptor-mdo.patch 
	maven-archetype2-mdo.patch maven-archetype2-plugin-pom.patch 
	maven-archetype2-registry-mdo.patch 
Removed Files:
	maven-archetype-plugin-pom.patch 
Log Message:
2.0-0.a3.2.jpp6

Index: maven-archetype2-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-archetype2/maven-archetype2-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-archetype2-jpp-depmap.xml	27 Sep 2008 07:51:23 -0000	1.1
--- maven-archetype2-jpp-depmap.xml	5 Dec 2010 18:31:57 -0000	1.2
***************
*** 39,41 ****
--- 39,54 ----
   </dependency>
  
+  <dependency>
+    <maven>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5-20081211</version>
+    </maven>
+    <jpp>
+      <groupId>JPP</groupId>
+      <artifactId>servlet_2_5_api</artifactId>
+      <version>2.5</version>
+    </jpp>
+  </dependency>
+ 
  </dependencies>

--- NEW FILE: maven-archetype2-common-mdo.patch ---
--- archetype-common/src/main/mdo/archetype-common.mdo.sav	2010-11-28 23:49:43.000000000 +0100
+++ archetype-common/src/main/mdo/archetype-common.mdo	2010-11-28 23:51:13.000000000 +0100
@@ -17,7 +17,9 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/ARCHETYPECOMMON/${version}">
+
   <id>archetype-common</id>
   <name>ArchetypeCommon</name>
 

--- NEW FILE: maven-archetype2-descriptor-mdo.patch ---
--- archetype-common/src/main/mdo/archetype-descriptor.mdo.sav	2010-11-29 00:02:29.000000000 +0100
+++ archetype-common/src/main/mdo/archetype-descriptor.mdo	2010-11-29 00:03:30.000000000 +0100
@@ -17,7 +17,9 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/ARCHETYPEDESCRIPTOR/${version}">
+
   <id>archetype-descriptor</id>
   <name>ArchetypeDescriptor</name>
 

--- NEW FILE: maven-archetype2-mdo.patch ---
--- archetype-common/src/main/mdo/archetype.mdo.sav	2010-11-29 00:08:40.000000000 +0100
+++ archetype-common/src/main/mdo/archetype.mdo	2010-11-29 00:09:13.000000000 +0100
@@ -2,7 +2,8 @@
 
  <!-- START SNIPPET: modello-model -->
 
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/ARCHETYPE/${version}">
   <id>archetype</id>
   <name>Archetype</name>
   <description><![CDATA[Maven's model for the archetype descriptor.]]></description>

--- NEW FILE: maven-archetype2-plugin-pom.patch ---
--- archetype-plugin/pom.xml.sav	2008-08-22 10:37:50.000000000 +0200
+++ archetype-plugin/pom.xml	2008-08-22 10:38:13.000000000 +0200
@@ -70,6 +70,7 @@
 
   <build>
     <plugins>
+<!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
@@ -86,6 +87,7 @@
           </execution>
         </executions>
       </plugin>
+-->
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>

--- NEW FILE: maven-archetype2-catalog-mdo.patch ---
--- archetype-common/src/main/mdo/archetype-catalog.mdo.sav	2010-11-29 00:05:45.000000000 +0100
+++ archetype-common/src/main/mdo/archetype-catalog.mdo	2010-11-29 00:06:32.000000000 +0100
@@ -17,7 +17,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/ARCHETYPECATALOG/${version}">
   <id>archetype-catalog</id>
   <name>ArchetypeCatalog</name>
   <description>

Index: maven-archetype2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-archetype2/maven-archetype2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-archetype2.spec	27 Sep 2008 07:51:23 -0000	1.1
--- maven-archetype2.spec	5 Dec 2010 18:31:58 -0000	1.2
***************
*** 45,49 ****
  Name:           maven-archetype2
  Version:        2.0
! Release:        0.a3.1%{dist}
  Epoch:          0
  Summary:        Maven Archetype 2
--- 45,49 ----
  Name:           maven-archetype2
  Version:        2.0
! Release:        0.a3.2%{dist}
  Epoch:          0
  Summary:        Maven Archetype 2
***************
*** 59,63 ****
  Source4:        %{name}-parent-2.pom
  Source5:        %{name}-autogenerated-files.tar.gz
! Patch0:         maven-archetype-plugin-pom.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
--- 59,69 ----
  Source4:        %{name}-parent-2.pom
  Source5:        %{name}-autogenerated-files.tar.gz
! Patch0:         maven-archetype2-plugin-pom.patch
! Patch1:         maven-archetype2-common-pom.patch
! Patch2:         maven-archetype2-common-mdo.patch
! Patch3:         maven-archetype2-registry-mdo.patch
! Patch4:         maven-archetype2-descriptor-mdo.patch
! Patch5:         maven-archetype2-catalog-mdo.patch
! Patch6:         maven-archetype2-mdo.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
***************
*** 65,70 ****
  BuildArch:      noarch
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-antlr
  BuildRequires:  junit
--- 71,76 ----
  BuildArch:      noarch
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  ant-antlr
  BuildRequires:  junit
***************
*** 86,90 ****
  BuildRequires:  maven-shared-invoker
  BuildRequires:  maven-shared-plugin-testing-harness
! BuildRequires:  modello-maven-plugin >= 0:1.0-0.a17
  BuildRequires:  jetty6-core
  BuildRequires:  jetty6-maven2-plugins
--- 92,98 ----
  BuildRequires:  maven-shared-invoker
  BuildRequires:  maven-shared-plugin-testing-harness
! BuildRequires:  apache-commons-parent
! BuildRequires:  geronimo-genesis
! BuildRequires:  modello-maven-plugin >= 0:1.3
  BuildRequires:  jetty6-core
  BuildRequires:  jetty6-maven2-plugins
***************
*** 94,106 ****
  BuildRequires:  cargo
  BuildRequires:  easymock-java5
! BuildRequires:  modello >= 0:1.0-0.a17
  
! BuildRequires:  jakarta-commons-io
  BuildRequires:  jchardet
  BuildRequires:  geronimo-jta-1.0.1B-api
  
! Requires:  java >= 0:1.5.0
  Requires:  geronimo-jta-1.0.1B-api
! Requires:  jakarta-commons-io
  Requires:  jchardet
  Requires:  maven-shared-invoker
--- 102,114 ----
  BuildRequires:  cargo
  BuildRequires:  easymock-java5
! BuildRequires:  modello >= 0:1.3
  
! BuildRequires:  apache-commons-io
  BuildRequires:  jchardet
  BuildRequires:  geronimo-jta-1.0.1B-api
  
! Requires:  java >= 0:1.6.0
  Requires:  geronimo-jta-1.0.1B-api
! Requires:  apache-commons-io
  Requires:  jchardet
  Requires:  maven-shared-invoker
***************
*** 132,135 ****
--- 140,149 ----
  %endif
  %patch0 -b .sav0
+ %patch1 -b .sav1
+ %patch2 -b .sav2
+ %patch3 -b .sav3
+ %patch4 -b .sav4
+ %patch5 -b .sav5
+ %patch6 -b .sav6
  
  %build
***************
*** 362,365 ****
--- 376,382 ----
  
  %changelog
+ * Sun Nov 28 2010 Ralph Apel <r.apel at r-apel.de> 0:2.0-0.a3.2
+ - Adapt to JPP6
+ 
  * Sat Sep 27 2008 Ralph Apel <r.apel at r-apel.de> 0:2.0-0.a3.1.jpp5
  - First release

--- NEW FILE: maven-archetype2-common-pom.patch ---
--- archetype-common/pom.xml.sav	2010-11-28 23:43:11.000000000 +0100
+++ archetype-common/pom.xml	2010-11-28 23:44:55.000000000 +0100
@@ -157,7 +157,9 @@
             </goals>
             <configuration>
               <version>1.0.0</version>
+              <models>
               <model>src/main/mdo/archetype-common.mdo</model>
+              </models>
             </configuration>
           </execution>
           <execution>
@@ -170,7 +172,9 @@
             </goals>
             <configuration>
               <version>1.0.0</version>
+              <models>
               <model>src/main/mdo/archetype-registry.mdo</model>
+              </models>
             </configuration>
           </execution>
           <execution>
@@ -183,7 +187,9 @@
             </goals>
             <configuration>
               <version>1.0.0</version>
+              <models>
               <model>src/main/mdo/archetype-descriptor.mdo</model>
+              </models>
             </configuration>
           </execution>
           <execution>
@@ -196,7 +202,9 @@
             </goals>
             <configuration>
               <version>1.0.0</version>
+              <models>
               <model>src/main/mdo/archetype-catalog.mdo</model>
+              </models>
             </configuration>
           </execution>
           <execution>
@@ -209,7 +217,9 @@
             </goals>
             <configuration>
               <version>1.0.0</version>
+              <models>
               <model>src/main/mdo/archetype.mdo</model>
+              </models>
             </configuration>
           </execution>
         </executions>
@@ -415,4 +425,4 @@
           </build>          
       </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

--- maven-archetype-plugin-pom.patch DELETED ---

--- NEW FILE: maven-archetype2-registry-mdo.patch ---
--- archetype-common/src/main/mdo/archetype-registry.mdo.sav	2010-11-28 23:58:29.000000000 +0100
+++ archetype-common/src/main/mdo/archetype-registry.mdo	2010-11-28 23:59:39.000000000 +0100
@@ -17,7 +17,9 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/ARCHETYPEREGISTRY/${version}">
+
   <id>archetype-registry</id>
   <name>ArchetypeRegistry</name>
 




More information about the JPackage-commits mailing list