[jboss-web] Upstream release 8.0.0.Alpha1
Marek Goldmann
goldmann at fedoraproject.org
Mon Jul 15 11:45:51 UTC 2013
commit 5249e7fb04f61ec5649ced027137f0ed7c4e2931
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Mon Jul 15 13:45:03 2013 +0200
Upstream release 8.0.0.Alpha1
- New guidelines
- Using Maven
.gitignore | 1 +
build-javadoc.xml | 8 ---
jboss-web-7.0.13.Final-build.patch | 13 -----
jboss-web-7.0.13.Final-pom.xml | 35 -------------
jboss-web.spec | 95 ++++++++++++------------------------
servlet-beta1-changes.patch | 30 +++++++++++
sources | 2 +-
7 files changed, 63 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31d40b2..49f3ab2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jboss-web-7.0.13.Final.tar.xz
+/jboss-web-8.0.0.Alpha1.tar.xz
diff --git a/jboss-web.spec b/jboss-web.spec
index 97e0f23..2fd0d5a 100644
--- a/jboss-web.spec
+++ b/jboss-web.spec
@@ -1,22 +1,20 @@
-%global namedreltag .Final
+%global namedreltag .Alpha1
%global namedversion %{version}%{?namedreltag}
Name: jboss-web
-Version: 7.0.13
-Release: 6%{?dist}
+Version: 8.0.0
+Release: 0.1%{namedreltag}%{?dist}
Summary: JBoss Web
-Group: Development/Libraries
License: LGPLv2+ and ASL 2.0 and MIT and (LGPLv2+ or ASL 2.0)
URL: http://www.jboss.org/jbossweb
-# svn export http://anonsvn.jboss.org/repos/jbossweb/tags/JBOSSWEB_7_0_13_FINAL/ jboss-web-7.0.13.Final
-# rm -rf jboss-web-7.0.13.Final/java/javax
-# tar cafJ jboss-web-7.0.13.Final.tar.xz jboss-web-7.0.13.Final
-Source0: %{name}-%{namedversion}.tar.xz
-Source1: %{name}-%{namedversion}-pom.xml
-Source2: build-javadoc.xml
+# svn export http://anonsvn.jboss.org/repos/jbossweb/tags/JBOSSWEB_8_0_0_ALPHA1/ jboss-web-8.0.0.Alpha1
+# rm -rf jboss-web-8.0.0.Alpha1/java/javax
+# tar cafJ jboss-web-8.0.0.Alpha1.tar.xz jboss-web-8.0.0.Alpha1
+Source0: jboss-web-%{namedversion}.tar.xz
-Patch0: %{name}-%{namedversion}-build.patch
+# Support for the Beta1 Servlet API
+Patch0: servlet-beta1-changes.patch
BuildArch: noarch
@@ -25,83 +23,52 @@ BuildRequires: java-devel
BuildRequires: jboss-annotations-1.1-api
BuildRequires: jboss-el-2.2-api
BuildRequires: jboss-jsp-2.2-api
-BuildRequires: jboss-servlet-3.0-api
+BuildRequires: jboss-servlet-3.1-api
BuildRequires: ant
BuildRequires: junit4
BuildRequires: ecj
-
-Requires: jpackage-utils
-Requires: java
-Requires: jboss-annotations-1.1-api
-Requires: jboss-el-2.2-api
-Requires: jboss-jsp-2.2-api
-Requires: jboss-servlet-3.0-api
+BuildRequires: jboss-logging
+BuildRequires: jboss-logging-tools
+BuildRequires: jboss-logmanager
+BuildRequires: maven-local
+BuildRequires: maven-injection-plugin
+BuildRequires: glassfish-el
%description
JBoss Web Server is an enterprise ready web server based on Tomcat.
-%package doc
-Summary: User guide for %{name}
-Group: Documentation
-
-%description doc
-This package contains user guide for %{name}.
-
%package javadoc
Summary: Javadocs for %{name}
-Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{namedversion}
-cp %{SOURCE2} .
-ln -s $(build-classpath jboss-annotations-1.1-api) lib
-ln -s $(build-classpath jboss-el-2.2-api) lib
-ln -s $(build-classpath jboss-jsp-2.2-api) lib
-ln -s $(build-classpath jboss-servlet-3.0-api) lib
+%setup -q -n jboss-web-%{namedversion}
%patch0 -p1
+%pom_remove_dep "org.glassfish:javax.el"
+
%build
-export CLASSPATH=$(build-classpath ecj)
-ant
-ant -f build-javadoc.xml
+%mvn_build
%install
-# JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 output/jars/jbossweb.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# POM
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc LICENSE NOTICE
-# APIDOCS
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-%doc LICENSE
-
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
-
-%files doc
-%doc LICENSE
-%doc output/build/webapps/docs/*
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
%changelog
+* Mon Jul 15 2013 Marek Goldmann <mgoldman at redhat.com> - 8.0.0-0.1.Alpha1
+- Upstream release 8.0.0.Alpha1
+- New guidelines
+- Using Maven
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0.13-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/servlet-beta1-changes.patch b/servlet-beta1-changes.patch
new file mode 100644
index 0000000..8024e85
--- /dev/null
+++ b/servlet-beta1-changes.patch
@@ -0,0 +1,30 @@
+diff -Naur jboss-web-8.0.0.Alpha1/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java jboss-web-8.0.0.Alpha1-work/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java
+--- jboss-web-8.0.0.Alpha1/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java 2012-09-26 19:13:02.000000000 +0200
++++ jboss-web-8.0.0.Alpha1-work/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java 2013-07-15 13:12:11.704668203 +0200
+@@ -632,6 +632,11 @@
+ context.declareRoles(roleNames);
+ }
+ }
++
++ @Override
++ public String getVirtualServerName() {
++ return context.getVirtualServerName();
++ }
+
+ /**
+ * Use reflection to invoke the requested method. Cache the method object
+diff -Naur jboss-web-8.0.0.Alpha1/src/main/java/org/apache/catalina/core/StandardPart.java jboss-web-8.0.0.Alpha1-work/src/main/java/org/apache/catalina/core/StandardPart.java
+--- jboss-web-8.0.0.Alpha1/src/main/java/org/apache/catalina/core/StandardPart.java 2012-07-13 17:39:34.000000000 +0200
++++ jboss-web-8.0.0.Alpha1-work/src/main/java/org/apache/catalina/core/StandardPart.java 2013-07-15 13:14:15.025452662 +0200
+@@ -103,6 +103,11 @@
+ }
+
+ @Override
++ public String getSubmittedFileName() {
++ return fileItem.getName();
++ }
++
++ @Override
+ public long getSize() {
+ return fileItem.getSize();
+ }
diff --git a/sources b/sources
index 153cb8d..39db4c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5611091fa69aa5e92f1ce05602790b9c jboss-web-7.0.13.Final.tar.xz
+70ae85c656ad0d70b4b8f91d0a3f4c0b jboss-web-8.0.0.Alpha1.tar.xz
More information about the scm-commits
mailing list