6
0

Accepting request 692207 from home:fstrba:maven

OBS-URL: https://build.opensuse.org/request/show/692207
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-el?expand=0&rev=1
This commit is contained in:
2019-04-08 07:28:19 +00:00
committed by Git OBS Bridge
commit 31fd16b32e
8 changed files with 336 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.osc

104
apache-commons-el.spec Normal file
View File

@@ -0,0 +1,104 @@
#
# spec file for package apache
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global base_name el
%global short_name commons-%{base_name}
Name: apache-%{short_name}
Version: 1.0
Release: 0
Summary: The Apache Commons Extension Language
License: Apache-1.1
Group: Development/Libraries/Java
URL: http://commons.apache.org/%{base_name}
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1: http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
Patch0: %{short_name}-%{version}-license.patch
Patch1: %{short_name}-eclipse-manifest.patch
Patch2: %{short_name}-enum.patch
BuildRequires: ant
BuildRequires: apache-commons-logging
BuildRequires: fdupes
BuildRequires: glassfish-jsp-api
BuildRequires: glassfish-servlet-api
BuildRequires: javapackages-local
BuildRequires: junit
Requires: mvn(commons-logging:commons-logging)
BuildArch: noarch
%description
An implementation of standard interfaces and abstract classes for
javax.servlet.jsp.el which is part of the JSP 2.0 specification.
%package javadoc
Summary: API documentation for %{name}
Group: Development/Libraries/Java
%description javadoc
%{summary}.
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1 -b .license
%patch1 -p1
%patch2 -p1
# remove all precompiled stuff
find . -type f -name "*.jar" -exec rm -f {} \;
cat > build.properties <<EOBP
build.compiler=modern
junit.jar=$(build-classpath junit)
servlet-api.jar=$(build-classpath glassfish-servlet-api)
jsp-api.jar=$(build-classpath glassfish-jsp-api)
servletapi.build.notrequired=true
jspapi.build.notrequired=true
EOBP
%build
export CLASSPATH=
export OPT_JAR_LIST=:
%{ant} \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Dfinal.name=%{short_name} \
-Dj2se.javadoc=%{_javadocdir}/java \
jar javadoc
%install
# jar
install -dm 0755 %{buildroot}%{_javadir}
install -pm 0644 dist/%{short_name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}
install -pm 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{short_name}.pom
%add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-el"
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
%license LICENSE.txt
%doc STATUS.html
%{_javadir}/%{name}.jar
%files javadoc
%license LICENSE.txt
%{_javadocdir}/%{name}
%changelog

View File

@@ -0,0 +1,31 @@
--- commons-el-1.0-src/build.xml.old 2003-12-17 16:00:14.000000000 +0200
+++ commons-el-1.0-src/build.xml 2003-12-17 16:00:27.000000000 +0200
@@ -230,8 +230,8 @@
<target name="dist" depends="compile,javadoc"
description="Create binary distribution">
<mkdir dir="${dist.home}"/>
- <copy file="../LICENSE"
- todir="${dist.home}"/>
+ <copy file="LICENSE.txt"
+ tofile="${dist.home}/LICENSE"/>
<copy file="RELEASE-NOTES.txt"
todir="${dist.home}"/>
<antcall target="jar"/>
@@ -242,7 +242,7 @@
description="Create jar">
<mkdir dir="${dist.home}"/>
<mkdir dir="${build.home}/classes/META-INF"/>
- <copy file="../LICENSE"
+ <copy file="LICENSE.txt"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
<jar jarfile="${commons-el.jar}"
manifest="${build.home}/conf/MANIFEST.MF">
@@ -257,7 +257,7 @@
<copy todir="${build.home}/classes/META-INF" filtering="on">
<fileset dir="${conf.home}" includes="*.MF"/>
</copy>
- <copy file="../LICENSE"
+ <copy file="LICENSE.txt"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
<jar jarfile="${commons-el.jar}"
manifest="${build.home}/classes/META-INF/MANIFEST.MF">

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6
size 64009

125
commons-el-1.0.pom Normal file
View File

@@ -0,0 +1,125 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
<name>EL</name>
<version>1.0</version>
<description>JSP 2.0 Expression Language Interpreter Implementation</description>
<url>http://jakarta.apache.org/commons/el/</url>
<issueManagement>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<ciManagement>
<notifiers>
<notifier>
<address>commons-dev@jakarta.apache.org</address>
</notifier>
</notifiers>
</ciManagement>
<inceptionYear>2003</inceptionYear>
<mailingLists>
<mailingList>
<name>Commons Dev List</name>
<subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
</mailingList>
<mailingList>
<name>Commons User List</name>
<subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>arista</id>
<name>Nathan Abramson</name>
<email>arista@alum.mit.edu</email>
<organization>Massachusetts Institute of Technology</organization>
</developer>
<developer>
<id>shawn</id>
<name>Shawn Bayern</name>
<email>shawn@apache.org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>pierred</id>
<name>Pierre Delisle</name>
<email>pierre.delisle@sun.com</email>
<organization>Sun Microsystems, Inc.</organization>
</developer>
<developer>
<id>craigmcc</id>
<name>Craig McClanahan</name>
<email>craigmcc@apache.org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>luehe</id>
<name>Jan Luehe</name>
<email>jan.luehe@sun.com</email>
<organization>Sun Microsystems, Inc.</organization>
</developer>
</developers>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>/LICENSE.txt</url>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk</connection>
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk</url>
</scm>
<organization>
<name>The Apache Software Foundation</name>
<url>http://jakarta.apache.org</url>
</organization>
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
<version>2.4-20040521</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jspapi</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0-20040521</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>default</id>
<name>Default Repository</name>
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/el/</url>
</repository>
<site>
<id>default</id>
<name>Default Site</name>
<url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/el/</url>
</site>
</distributionManagement>
</project>

View File

@@ -0,0 +1,19 @@
--- commons-el-1.0-src/src/conf/MANIFEST.MF.orig 2007-07-11 12:47:24.000000000 -0400
+++ commons-el-1.0-src/src/conf/MANIFEST.MF 2007-07-11 12:49:32.000000000 -0400
@@ -9,3 +9,16 @@
Implementation-Title: org.apache.commons.el
Implementation-Vendor: Apache Software Foundation
Implementation-Version: 1.0
+Import-Package: javax.servlet;version="2.4",javax.servlet.http;version
+ ="2.4",javax.servlet.jsp;version="2.0",javax.servlet.jsp.el;version="
+ 2.0",javax.servlet.jsp.resources;version="2.0",javax.servlet.jsp.tage
+ xt;version="2.0",javax.servlet.resources;version="2.4"
+Bundle-ManifestVersion: 2
+Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo
+ ns.el.parser;version="1.0.0"
+Bundle-Version: 1.0.0.v200806031608
+Bundle-SymbolicName: org.apache.commons.el
+Bundle-Name: Apache Commons JSP 2.0 Expression Language Interpreter
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+Bundle-Localization: plugin
+Bundle-Vendor: Apache Software Foundation

30
commons-el-enum.patch Normal file
View File

@@ -0,0 +1,30 @@
--- commons-el-1.0-src/src/java/org/apache/commons/el/ImplicitObjects.java 2003-02-04 01:22:25.000000000 +0100
+++ commons-el-1.0-src/src/java/org/apache/commons/el/ImplicitObjects.java 2018-11-26 08:54:18.489575421 +0100
@@ -535,10 +535,10 @@
if (pKey instanceof String) {
// Drain the header enumeration
List l = new ArrayList ();
- Enumeration enum = request.getHeaders ((String) pKey);
- if (enum != null) {
- while (enum.hasMoreElements ()) {
- l.add (enum.nextElement ());
+ Enumeration emun = request.getHeaders ((String) pKey);
+ if (emun != null) {
+ while (emun.hasMoreElements ()) {
+ l.add (emun.nextElement ());
}
}
String [] ret = (String []) l.toArray (new String [l.size ()]);
--- commons-el-1.0-src/src/java/org/apache/commons/el/parser/ELParser.java 2003-03-31 03:17:07.000000000 +0200
+++ commons-el-1.0-src/src/java/org/apache/commons/el/parser/ELParser.java 2018-11-26 08:54:27.193619805 +0100
@@ -1838,8 +1838,8 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement());
+ for (java.util.Enumeration emun = jj_expentries.elements(); emun.hasMoreElements();) {
+ int[] oldentry = (int[])(emun.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {