[simple] Initial import (#842667).
by gil
commit 69b8758be90c3b33caa7148a9ecebc772e63f264
Author: gil <puntogil(a)libero.it>
Date: Fri Aug 10 16:15:09 2012 +0200
Initial import (#842667).
.gitignore | 1 +
LICENSE-2.0.txt | 202 +++++++++++++++++++++++++++++++++
simple-4.1.21-include-resources.patch | 15 +++
simple-4.1.21-jdk7.patch | 159 ++++++++++++++++++++++++++
simple-4.1.21-test-build.patch | 38 ++++++
simple-4.1.21.pom | 75 ++++++++++++
simple.spec | 91 +++++++++++++++
sources | 1 +
8 files changed, 582 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..909f178 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/simple-4.1.21.tar.gz
diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/simple-4.1.21-include-resources.patch b/simple-4.1.21-include-resources.patch
new file mode 100644
index 0000000..a8309f4
--- /dev/null
+++ b/simple-4.1.21-include-resources.patch
@@ -0,0 +1,15 @@
+--- build.xml 2010-07-14 12:52:43.000000000 +0200
++++ build.xml-gil 2012-07-24 13:30:19.720116824 +0200
+@@ -22,7 +22,11 @@
+
+ <target name="build" depends="prepare">
+ <javac target="1.5" srcdir="${source.path}" destdir="${build.path}" debug="true" debuglevel="lines,vars,source" encoding="UTF-8"/>
+- <jar jarfile="${jar.path}/simple-${version}.jar" basedir="${build.path}"/>
++ <jar jarfile="${jar.path}/simple-${version}.jar" basedir="${build.path}">
++ <fileset dir="${source.path}">
++ <include name="org/simpleframework/http/resource/FileIndexer.properties"/>
++ </fileset>
++ </jar>
+ <delete dir="${build.path}"/>
+ </target>
+
diff --git a/simple-4.1.21-jdk7.patch b/simple-4.1.21-jdk7.patch
new file mode 100644
index 0000000..5bda30b
--- /dev/null
+++ b/simple-4.1.21-jdk7.patch
@@ -0,0 +1,159 @@
+diff -Nru test/src/org/simpleframework/transport/connect/FilterSocketChannel.java test/src/org/simpleframework/transport-gil/connect/FilterSocketChannel.java
+--- test/src/org/simpleframework/transport/connect/FilterSocketChannel.java 2010-07-14 12:52:43.000000000 +0200
++++ test/src/org/simpleframework/transport-gil/connect/FilterSocketChannel.java 2012-07-24 13:07:13.000000000 +0200
+@@ -4,8 +4,11 @@
+ import java.io.IOException;
+ import java.net.Socket;
+ import java.net.SocketAddress;
++import java.net.SocketOption;
+ import java.nio.ByteBuffer;
++import java.nio.channels.NetworkChannel;
+ import java.nio.channels.SocketChannel;
++import java.util.Set;
+
+ // Can this be selected with?????
+ public class FilterSocketChannel extends SocketChannel {
+@@ -109,4 +112,36 @@
+ protected void implConfigureBlocking(boolean block) throws IOException {
+ channel.configureBlocking(block);
+ }
++
++ public SocketAddress getRemoteAddress() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketChannel shutdownOutput() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketChannel shutdownInput() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public <T> SocketChannel setOption(SocketOption<T> name, T value) throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketChannel bind(SocketAddress local) throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public Set<SocketOption<?>> supportedOptions() {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public <T> T getOption(SocketOption<T> name) throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketAddress getLocalAddress() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
+ }
+diff -Nru test/src/org/simpleframework/transport/Console.java test/src/org/simpleframework/transport-gil/Console.java
+--- test/src/org/simpleframework/transport/Console.java 2010-07-14 12:52:43.000000000 +0200
++++ test/src/org/simpleframework/transport-gil/Console.java 2012-07-24 13:06:55.000000000 +0200
+@@ -3,11 +3,14 @@
+ import java.io.IOException;
+ import java.net.Socket;
+ import java.net.SocketAddress;
++import java.net.SocketOption;
+ import java.nio.ByteBuffer;
+ import java.nio.channels.Channels;
++import java.nio.channels.NetworkChannel;
+ import java.nio.channels.ReadableByteChannel;
+ import java.nio.channels.SocketChannel;
+ import java.nio.channels.WritableByteChannel;
++import java.util.Set;
+
+ class Console extends SocketChannel {
+
+@@ -78,4 +81,36 @@
+ @Override
+ protected void implConfigureBlocking(boolean block) throws IOException {
+ }
++
++ public SocketAddress getRemoteAddress() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketChannel shutdownOutput() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketChannel shutdownInput() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public <T> SocketChannel setOption(SocketOption<T> name, T value) throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketChannel bind(SocketAddress local) throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public Set<SocketOption<?>> supportedOptions() {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public <T> T getOption(SocketOption<T> name) throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketAddress getLocalAddress() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
+ }
+diff -Nru test/src/org/simpleframework/transport/NetworkSimulator.java test/src/org/simpleframework/transport-gil/NetworkSimulator.java
+--- test/src/org/simpleframework/transport/NetworkSimulator.java 2010-07-14 12:52:43.000000000 +0200
++++ test/src/org/simpleframework/transport-gil/NetworkSimulator.java 2012-07-24 13:07:04.000000000 +0200
+@@ -7,8 +7,11 @@
+ import java.net.ServerSocket;
+ import java.net.Socket;
+ import java.net.SocketAddress;
++import java.net.SocketOption;
+ import java.nio.ByteBuffer;
++import java.nio.channels.NetworkChannel;
+ import java.nio.channels.SocketChannel;
++import java.util.Set;
+
+ public class NetworkSimulator extends SocketChannel {
+ private SocketChannel channel;
+@@ -94,4 +97,36 @@
+ protected void implConfigureBlocking(boolean arg0) throws IOException {
+ return;
+ }
++
++ public SocketAddress getRemoteAddress() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketChannel shutdownOutput() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketChannel shutdownInput() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public <T> SocketChannel setOption(SocketOption<T> name, T value) throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketChannel bind(SocketAddress local) throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public Set<SocketOption<?>> supportedOptions() {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public <T> T getOption(SocketOption<T> name) throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ public SocketAddress getLocalAddress() throws IOException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
+ }
diff --git a/simple-4.1.21-test-build.patch b/simple-4.1.21-test-build.patch
new file mode 100644
index 0000000..02decfa
--- /dev/null
+++ b/simple-4.1.21-test-build.patch
@@ -0,0 +1,38 @@
+--- test/build.xml 2010-07-14 12:52:43.000000000 +0200
++++ test/build.xml-gil 2012-07-24 13:20:48.772292111 +0200
+@@ -4,7 +4,7 @@
+ <target name="layout">
+ <property name="parent.path" value=".."/>
+ <property name="source.path" value="src"/>
+- <property name="lib.path" value="lib"/>
++ <property name="lib.path" value="/usr/share/java"/>
+ <property name="report.path" value="report"/>
+ <property name="build.path" value="build"/>
+ </target>
+@@ -24,7 +24,7 @@
+ <javac srcdir="${parent.path}/${source.path}" destdir="${build.path}/core" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <classpath>
+ <fileset dir="${lib.path}">
+- <include name="**/*.jar"/>
++ <include name="junit.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+@@ -36,7 +36,7 @@
+ <javac srcdir="${source.path}" destdir="${build.path}/test" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <classpath>
+ <fileset dir="${lib.path}">
+- <include name="**/*.jar"/>
++ <include name="junit.jar"/>
+ </fileset>
+ <pathelement path="${build.path}/core"/>
+ </classpath>
+@@ -46,7 +46,7 @@
+ <classpath location="${build.path}/test"/>
+ <classpath>
+ <fileset dir="${lib.path}">
+- <include name="**/*.jar"/>
++ <include name="junit.jar"/>
+ </fileset>
+ </classpath>
+ <formatter type="plain"/>
diff --git a/simple-4.1.21.pom b/simple-4.1.21.pom
new file mode 100644
index 0000000..a4b3f05
--- /dev/null
+++ b/simple-4.1.21.pom
@@ -0,0 +1,75 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.simpleframework</groupId>
+ <artifactId>simple</artifactId>
+ <packaging>jar</packaging>
+ <version>4.1.21</version>
+ <name>Simple</name>
+ <url>http://www.simpleframework.org</url>
+ <description>Simple is a high performance asynchronous HTTP server for Java</description>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://simpleweb.svn.sourceforge.net/viewvc/simpleweb/trunk</url>
+ <connection>https://simpleweb.svn.sourceforge.net/svnroot/simpleweb/trunk</connection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+ <distributionManagement>
+ <repository>
+ <id>sourceforge</id>
+ <name>Source Forge Repository</name>
+ <url>scp://web.sourceforge.net/home/groups/s/si/simpleweb/htdocs/maven</url>
+ </repository>
+ </distributionManagement>
+</project>
diff --git a/simple.spec b/simple.spec
new file mode 100644
index 0000000..c761aee
--- /dev/null
+++ b/simple.spec
@@ -0,0 +1,91 @@
+Name: simple
+Version: 4.1.21
+Release: 3%{?dist}
+Summary: Asynchronous HTTP server for Java
+Group: Development/Libraries
+License: ASL 2.0 and LGPLv2+
+URL: http://www.simpleframework.org/
+Source0: http://sourceforge.net/projects/simpleweb/files/simpleweb/%{version}/%{na...
+Source1: http://repo1.maven.org/maven2/org/simpleframework/%{name}/%{version}/%{na...
+# simple package don't include the license file
+Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
+# add system junit
+Patch0: %{name}-%{version}-test-build.patch
+# include FileIndexer.properties in jar file
+Patch1: %{name}-%{version}-include-resources.patch
+# fix test build for java7+
+Patch2: %{name}-%{version}-jdk7.patch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+
+BuildRequires: ant
+# test deps
+BuildRequires: junit
+
+Requires: java
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+Simple is a high performance asynchronous HTTP server for Java.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q
+# cleanup
+rm -r javadoc/* test/report/*
+find . -name "*.class" -delete
+find . -name "*.jar" -delete
+
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+cp -p %{SOURCE1} pom.xml
+cp -p %{SOURCE2} .
+sed -i 's/\r//' LICENSE-2.0.txt
+
+%build
+
+%ant -Djar.path=target -Djavadoc.path=target/site/apidocs all
+
+%install
+
+mkdir -p %{buildroot}%{_javadir}
+install -m 644 target/%{name}-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%doc LICENSE-2.0.txt
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE-2.0.txt
+
+%changelog
+* Thu Aug 09 2012 gil cattaneo <puntogil(a)libero.it> 4.1.21-3
+- Installed proper license file
+
+* Wed Aug 08 2012 gil cattaneo <puntogil(a)libero.it> 4.1.21-2
+- Removed maven part
+- Installed license file
+
+* Tue Jul 24 2012 gil cattaneo <puntogil(a)libero.it> 4.1.21-1
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..4a2c2d4 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+c7b22ff951e9ffab36954ea93bbbcf28 simple-4.1.21.tar.gz
11 years, 9 months
[maven-archetype] Add OSGI info to descriptor.jar
by Mikolaj Izdebski
commit 909d50fd80f1940a7a4065d6f3ebf51825c5df17
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Aug 10 12:42:23 2012 +0200
Add OSGI info to descriptor.jar
maven-archetype.spec | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/maven-archetype.spec b/maven-archetype.spec
index c5eb7b2..4b68e3a 100644
--- a/maven-archetype.spec
+++ b/maven-archetype.spec
@@ -1,6 +1,6 @@
Name: maven-archetype
Version: 2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Maven project templating toolkit
Group: Development/Libraries
@@ -151,7 +151,7 @@ Requires: %{name}-registry = %{version}-%{release}
%patch2 -p1
%patch3
-# Add OSGI info to catalog module
+# Add OSGI info to catalog and descriptor jars
pushd archetype-models/archetype-catalog
%pom_xpath_remove "pom:project/pom:packaging"
%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
@@ -168,6 +168,22 @@ pushd archetype-models/archetype-catalog
</configuration>
</plugin>"
popd
+pushd archetype-models/archetype-descriptor
+ %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>
+ <_nouses>true</_nouses>
+ <Export-Package>org.apache.maven.archetype.metadata.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>"
+popd
%build
@@ -269,6 +285,9 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%{_javadir}/%{name}/plugin.jar
%changelog
+* Thu Aug 09 2012 Gerard Ryan <galileo(a)fedoraproject.org> - 2.1-7
+- Add OSGI info to descriptor.jar
+
* Tue Aug 7 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.1-6
- Export only proper OSGI packages
- Do not generate "uses" OSGI clauses
11 years, 9 months
Broken dependencies: fusesource-pom
by Fedora Koji Build System
fusesource-pom has broken dependencies in the F-18 tree:
On x86_64:
fusesource-pom-1.5-4.fc18.noarch requires maven-invoker-plugin
On i386:
fusesource-pom-1.5-4.fc18.noarch requires maven-invoker-plugin
Please resolve this as soon as possible.
11 years, 9 months