[maven-archetype] Fix jetty namespace; Add OSGI info to catalog.jar - java-sig-commits - Fedora mailing-lists

7 Aug 2012

commit 910663a6dd1848079e455a48100482da5dca9a19
Author: Gerard Ryan gerard@ryan.lt
Date:   Mon Aug 6 02:32:21 2012 +0100
Fix jetty namespace; Add OSGI info to catalog.jar
Jetty has changed namespace from org.mortbay.jetty to org.eclipse.jetty,
    which caused this package to fail. All references to jetty are updated.
OSGI information for catalog.jar is needed for m2e (Maven integration
    for Eclipse).
maven-archetype-fix-jetty-namespace.patch |  204 +++++++++++++++++++++++++++++
 maven-archetype.spec                      |   31 ++++-
 2 files changed, 232 insertions(+), 3 deletions(-)
---

diff --git a/maven-archetype-fix-jetty-namespace.patch b/maven-archetype-fix-jetty-namespace.patch
new file mode 100644
index 0000000..da4db8b
--- /dev/null
+++ b/maven-archetype-fix-jetty-namespace.patch
@@ -0,0 +1,204 @@
+--- pom.xml.orig	2012-08-06 00:54:09.491115851 +0100
++++ pom.xml	2012-08-06 00:54:25.129820980 +0100
+@@ -331,7 +331,7 @@
+           <version>2.1.1</version>
+         </plugin>
+         <plugin>
+-          <groupId>org.mortbay.jetty</groupId>
++          <groupId>org.eclipse.jetty</groupId>
+           <artifactId>maven-jetty-plugin</artifactId>
+           <version>6.1.6</version>
+         </plugin>
+diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
+--- archetype-common.orig/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java	2012-08-06 00:55:02.864109496 +0100
++++ archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java	2012-08-06 00:57:25.316423574 +0100
+@@ -22,8 +22,8 @@
+ import org.apache.maven.archetype.catalog.ArchetypeCatalog;
+ import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
+ import org.codehaus.plexus.PlexusTestCase;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.Server;
++import org.eclipse.jetty.webapp.WebAppContext;
+ 
+ import java.io.File;
+ import java.io.FileWriter;
+diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
+--- archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java	2012-08-06 00:55:02.864109496 +0100
++++ archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java	2012-08-06 00:56:58.834922877 +0100
+@@ -35,8 +35,8 @@
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.util.FileUtils;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.Server;
++import org.eclipse.jetty.webapp.WebAppContext;
+ 
+ import java.io.File;
+ import java.io.FileWriter;
+diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
+--- archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java	2012-08-06 00:55:02.864109496 +0100
++++ archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java	2012-08-06 00:56:18.124690463 +0100
+@@ -36,8 +36,8 @@
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.util.FileUtils;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.Server;
++import org.eclipse.jetty.webapp.WebAppContext;
+ 
+ import java.io.File;
+ import java.io.FileOutputStream;
+diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
+--- archetype-common.orig/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java	2012-08-06 00:55:02.864109496 +0100
++++ archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java	2012-08-06 00:55:48.423250480 +0100
+@@ -36,8 +36,8 @@
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.util.FileUtils;
+ import org.codehaus.plexus.util.StringUtils;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.Server;
++import org.eclipse.jetty.webapp.WebAppContext;
+ 
+ import java.io.File;
+ import java.io.FileOutputStream;
+diff -Naur archetype-samples.orig/webapp/pom.xml archetype-samples/webapp/pom.xml
+--- archetype-samples.orig/webapp/pom.xml	2012-08-06 01:01:25.372897736 +0100
++++ archetype-samples/webapp/pom.xml	2012-08-06 01:19:19.295657306 +0100
+@@ -22,11 +22,11 @@
+                 <defaultGoal>jetty:run</defaultGoal>
+                 <plugins>
+                     <plugin>
+-                        <groupId>org.mortbay.jetty</groupId>
++                        <groupId>org.eclipse.jetty</groupId>
+                         <artifactId>maven-jetty-plugin</artifactId>
+                         <configuration>
+                             <connectors>
+-                                <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
++                                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                                     <port>15000</port>
+                                     <maxIdleTime>60000</maxIdleTime>
+                                 </connector>
+diff -Naur archetype-testing.orig/archetype-proxy/pom.xml archetype-testing/archetype-proxy/pom.xml
+--- archetype-testing.orig/archetype-proxy/pom.xml	2012-08-06 00:57:48.450987379 +0100
++++ archetype-testing/archetype-proxy/pom.xml	2012-08-06 01:21:14.575484775 +0100
+@@ -47,7 +47,7 @@
+       <scope>provided</scope>
+     </dependency>
+     <dependency>
+-      <groupId>org.mortbay.jetty</groupId>
++      <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-util</artifactId>
+       <version>6.1.11</version>
+       <scope>compile</scope>
+@@ -68,11 +68,11 @@
+             </proxy>
+           </proxies>
+         -->
+-        <groupId>org.mortbay.jetty</groupId>
++        <groupId>org.eclipse.jetty</groupId>
+         <artifactId>maven-jetty-plugin</artifactId>
+         <configuration>
+           <connectors>
+-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
++            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+               <port>18881</port>
+               <maxIdleTime>60000</maxIdleTime>
+             </connector>
+@@ -84,4 +84,4 @@
+       </plugin>
+     </plugins>
+   </build>
+-</project>
+\ No newline at end of file
++</project>
+diff -Naur archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
+--- archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java	2012-08-06 00:57:48.451987360 +0100
++++ archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java	2012-08-06 01:07:52.133608424 +0100
+@@ -36,7 +36,7 @@
+ import javax.servlet.http.HttpServlet;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+-import org.mortbay.util.IO;
++import org.eclipse.jetty.util.IO;
+ 
+ /**
+  * Stolen code from Mortbay
+diff -Naur archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
+--- archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java	2012-08-06 00:57:48.451987360 +0100
++++ archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java	2012-08-06 01:07:08.369433256 +0100
+@@ -32,8 +32,8 @@
+ import javax.servlet.http.HttpServlet;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+-import org.mortbay.util.IO;
+-import org.mortbay.util.StringUtil;
++import org.eclipse.jetty.util.IO;
++import org.eclipse.jetty.util.StringUtil;
+ 
+ /**
+  *
+@@ -258,4 +258,4 @@
+         return "Repository Servlet";
+     }
+ 
+-}
+\ No newline at end of file
++}
+diff -Naur archetype-testing.orig/archetype-repository/pom.xml archetype-testing/archetype-repository/pom.xml
+--- archetype-testing.orig/archetype-repository/pom.xml	2012-08-06 00:57:48.452987341 +0100
++++ archetype-testing/archetype-repository/pom.xml	2012-08-06 01:22:04.447544897 +0100
+@@ -47,7 +47,7 @@
+       <scope>provided</scope>
+     </dependency>
+     <dependency>
+-      <groupId>org.mortbay.jetty</groupId>
++      <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-util</artifactId>
+       <version>6.1.11</version>
+       <scope>compile</scope>
+@@ -68,11 +68,11 @@
+             </proxy>
+           </proxies>
+         -->
+-        <groupId>org.mortbay.jetty</groupId>
++        <groupId>org.eclipse.jetty</groupId>
+         <artifactId>maven-jetty-plugin</artifactId>
+         <configuration>
+           <connectors>
+-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
++            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+               <port>18882</port>
+               <maxIdleTime>60000</maxIdleTime>
+             </connector>
+@@ -90,4 +90,4 @@
+       </plugin>
+     </plugins>
+   </build>
+-</project>
+\ No newline at end of file
++</project>
+diff -Naur archetype-testing.orig/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
+--- archetype-testing.orig/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java	2012-08-06 00:57:48.453987322 +0100
++++ archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java	2012-08-06 01:08:39.759710801 +0100
+@@ -26,8 +26,8 @@
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ 
+-import org.mortbay.util.IO;
+-import org.mortbay.util.StringUtil;
++import org.eclipse.jetty.util.IO;
++import org.eclipse.jetty.util.StringUtil;
+ 
+ /**
+  *
+@@ -83,4 +83,4 @@
+             IO.close( is );
+         }
+     }
+-}
+\ No newline at end of file
++}
diff --git a/maven-archetype.spec b/maven-archetype.spec
index ea7b0ee..f8dd6bf 100644
--- a/maven-archetype.spec
+++ b/maven-archetype.spec
@@ -1,6 +1,6 @@
 Name:           maven-archetype
 Version:        2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven project templating toolkit
Group:          Development/Libraries
@@ -14,6 +14,7 @@ Source1:        %{name}.depmap
 Patch0:         0001-Use-component-metadata-instead-of-maven-plugin.patch
 Patch1:         0002-Use-generics.patch
 Patch2:         0003-Add-Maven-3-compatibility.patch
+Patch3:         %{name}-fix-jetty-namespace.patch
BuildArch:      noarch
@@ -22,11 +23,12 @@ BuildRequires:  jpackage-utils
 BuildRequires:  maven > 3.0.3-13
 BuildRequires:  maven-war-plugin
 BuildRequires:  maven-dependency-plugin
+BuildRequires:  maven-plugin-bundle
 BuildRequires:  jchardet
 BuildRequires:  plexus-containers-component-metadata
-Requires:          jpackage-utils
-Requires:          maven
+Requires:       jpackage-utils
+Requires:       maven
%description
 Archetype is a Maven project templating toolkit. An archetype is
@@ -147,6 +149,25 @@ Requires:       %{name}-registry = %{version}-%{release}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3
+
+# Add OSGI info to catalog module
+pushd archetype-models/archetype-catalog
+    %pom_xpath_remove "pom:project/pom:packaging"
+    %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
+    %pom_xpath_inject "pom:build/pom:plugins" "
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>*</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>"
+popd
+
%build
 # we don't have cargo so skip tests for now
@@ -247,6 +268,10 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 %{_javadir}/%{name}/plugin.jar
%changelog
+* Mon Aug 06 2012 Gerard Ryan galileo@fedoraproject.org - 2.1-5
+- Fix jetty namespace
+- Add OSGI info to catalog.jar
+
 * Thu Jul 19 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

    