[Jpackage-commits] dist/hawtjni/devel .cvsignore, 1.1, 1.2 hawtjni-jpp-depmap.xml, NONE, 1.1 hawtjni-plexus-archiver-unarchiver.patch, NONE, 1.1 hawtjni-pom.patch, NONE, 1.1 hawtjni-settings.xml, NONE, 1.1 hawtjni.spec, NONE, 1.1 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Tue Dec 21 00:07:35 CET 2010


Update of /home/projects/jpackage/cvs/dist/hawtjni/devel
In directory ryu.zarb.org:/tmp/cvs-serv6292/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hawtjni-jpp-depmap.xml 
	hawtjni-plexus-archiver-unarchiver.patch hawtjni-pom.patch 
	hawtjni-settings.xml hawtjni.spec 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hawtjni/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	20 Dec 2010 23:03:46 -0000	1.1
--- .cvsignore	20 Dec 2010 23:07:33 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ hawtjni-1.1.tar.bz2

--- NEW FILE: hawtjni-settings.xml ---
<settings>
    <profiles>
        <profile>
            <id>JPP</id>
            <repositories>
                <repository>
                    <id>internal</id>
                    <layout>jpp</layout>
                    <url>__JPP_URL_PLACEHOLDER__</url>
                </repository>
                <repository>
                    <id>external</id>
                    <layout>jpp</layout>
                    <url>__JAVADIR_PLACEHOLDER__</url>
                </repository>
                <repository>
                    <id>local</id>
                    <layout>jpp</layout>
                    <url>__MAVENREPO_DIR_PLACEHOLDER__</url>
                </repository>
            </repositories>
            <pluginRepositories>
                <pluginRepository>
                    <id>plugins-internal</id>
                    <name>plugins-internal</name>
                    <layout>jpp</layout>
                    <url>__JPP_URL_PLACEHOLDER__</url>
                </pluginRepository>
                <pluginRepository>
                    <id>plugins-external</id>
                    <name>plugins-external</name>
                    <layout>jpp</layout>
                    <url>__JAVADIR_PLACEHOLDER__</url>
                </pluginRepository>
                <pluginRepository>
                    <id>plugins-maven</id>
                    <name>plugins-maven</name>
                    <layout>jpp</layout>
                    <url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
                </pluginRepository>
            </pluginRepositories>
        </profile>
    </profiles>
    <activeProfiles>
        <activeProfile>JPP</activeProfile>
    </activeProfiles>
</settings>

--- NEW FILE: hawtjni-pom.patch ---
--- pom.xml.sav1	2010-12-17 16:00:05.000000000 -0500
+++ pom.xml	2010-12-20 17:59:07.207561500 -0500
@@ -144,14 +144,14 @@
   
   <reporting>
     <plugins>
-      <plugin>
+      <!--<plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jxr-maven-plugin</artifactId>
         <version>2.0-beta-1</version>
         <configuration>
           <aggregate>true</aggregate>
         </configuration>
-      </plugin>
+      </plugin>-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -200,7 +200,7 @@
     <module>hawtjni-runtime</module>
     <module>hawtjni-generator</module>
     <module>maven-hawtjni-plugin</module>
-    <module>hawtjni-example</module>
+    <!--<module>hawtjni-example</module>-->
   </modules>
 
 </project>

--- NEW FILE: hawtjni-jpp-depmap.xml ---
<dependencies>
   <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>

   <dependency>
      <maven>
         <groupId>com.thoughtworks.qdox</groupId>
         <artifactId>qdox</artifactId>
         <version>1.6.3</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>qdox</artifactId>
         <version>1.12</version>
      </jpp>
   </dependency>
</dependencies>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hawtjni/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	20 Dec 2010 23:03:46 -0000	1.1
--- sources	20 Dec 2010 23:07:33 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 426e5407a16a0a102a7fa085f01cd21d  hawtjni-1.1.tar.bz2

--- NEW FILE: hawtjni.spec ---
# Copyright (c) 2000-2010, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}

%bcond_with gcj_support
%bcond_without repolib

%if %with gcj_support
%define gcj_support 1
%else
%define gcj_support 0
%endif

%define section free

Name:           hawtjni
Version:        1.1
Release:        1%{?dist}
Epoch:          0
Summary:        Ehcache Core
License:        ASL 2.0
URL:            http://ehcache.org/
Group:          Development/Libraries/Java
# git clone git://forge.fusesource.com/hawtjni.git
# git checkout hawtjni-1.1
Source0:        %{name}-%{version}.tar.bz2
Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml
Patch0:         hawtjni-plexus-archiver-unarchiver.patch
Patch1:         hawtjni-pom.patch
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
Requires:       jpackage-utils
BuildRequires:  apache-commons-parent
BuildRequires:  fusesource-pom
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This is the ehcache core module. Pair it with other modules for added
functionality.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires:       jpackage-utils

%description javadoc
%{summary}.

%if 0
%package manual
Summary:        Documents for %{name}
Group:          Development/Documentation

%description manual
%{summary}.
%endif

%if %with repolib
%package repolib
Summary:        Artifacts to be uploaded to a repository library
Group:          Development/Libraries/Java

%description repolib
Artifacts to be uploaded to a repository library.
This package is not meant to be installed but so its contents
can be extracted through rpm2cpio.
%endif

%prep
%setup -q
%patch0 -p0 -b .sav0
%patch1 -p0 -b .sav1

cp -p %{SOURCE1} settings.xml
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml

mkdir -p external_repo
ln -s %{_javadir} external_repo/JPP

%build
export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
export M2_SETTINGS=$(pwd)/settings.xml
%{_bindir}/mvn-jpp \
        -e \
        -s $M2_SETTINGS \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
        -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
        deploy \
        javadoc:aggregate \
%if 0
        site
%endif

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_javadir}
mkdir -p %{buildroot}%{_datadir}/maven2/poms

%if 0
cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-linux*.jar %{buildroot}%{_javadir}/
cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}-native-src.zip %{buildroot}%{_javadir}/
cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.jar %{buildroot}%{_javadir}/
cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-example/%{version}/hawtjni-example-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-example.pom
%add_to_maven_depmap org.fusesource.hawtjni hawtjni-example %{version} JPP %{name}-example
%endif

cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-generator/%{version}/hawtjni-generator-%{version}.jar %{buildroot}%{_javadir}/
cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-generator/%{version}/hawtjni-generator-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-generator.pom
%add_to_maven_depmap org.fusesource.hawtjni hawtjni-generator %{version} JPP %{name}-generator

cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-pom/%{version}/hawtjni-pom-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-pom.pom
%add_to_maven_depmap org.fusesource.hawtjni hawtjni-pom %{version} JPP %{name}-pom

cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-runtime/%{version}/hawtjni-runtime-%{version}.jar %{buildroot}%{_javadir}/
cp -p maven2-brew/org/fusesource/hawtjni/hawtjni-runtime/%{version}/hawtjni-runtime-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-runtime.pom
%add_to_maven_depmap org.fusesource.hawtjni hawtjni-runtime %{version} JPP %{name}-runtime

cp -p maven2-brew/org/fusesource/hawtjni/maven-hawtjni-plugin/%{version}/maven-hawtjni-plugin-%{version}.jar %{buildroot}%{_javadir}/
cp -p maven2-brew/org/fusesource/hawtjni/maven-hawtjni-plugin/%{version}/maven-hawtjni-plugin-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-maven-hawtjni-plugin.pom
%add_to_maven_depmap org.fusesource.hawtjni maven-hawtjni-plugin JPP maven-hawtjni-plugin

(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done)

# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}

%if 0
# manual
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
cp -pr target/site/* %{buildroot}%{_docdir}/%{name}-%{version}
rm -r %{buildroot}%{_docdir}/%{name}-%{version}/apidocs
%endif

%if %with repolib
%{__mkdir_p} %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew
%{__cp} -pr maven2-brew/* %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew
%endif

%clean
rm -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%if 0
%{_javadir}*/hawtjni-example-%{version}-linux*.jar
%{_javadir}*/hawtjni-example-linux*.jar
%{_javadir}*/hawtjni-example-%{version}-native-src.zip
%{_javadir}*/hawtjni-example-native-src.zip
%{_javadir}*/hawtjni-example-%{version}.jar
%{_javadir}*/hawtjni-example.jar
%endif
%{_javadir}*/maven-hawtjni-plugin-1.1.jar
%{_javadir}*/maven-hawtjni-plugin.jar
%{_javadir}*/%{name}-generator-%{version}.jar
%{_javadir}*/%{name}-generator.jar
%{_javadir}*/%{name}-runtime-%{version}.jar
%{_javadir}*/%{name}-runtime.jar
%if 0
%{_datadir}/maven2/poms/JPP-%{name}-example.pom
%endif
%{_datadir}/maven2/poms/JPP-%{name}-generator.pom
%{_datadir}/maven2/poms/JPP-%{name}-pom.pom
%{_datadir}/maven2/poms/JPP-%{name}-runtime.pom
%{_datadir}/maven2/poms/JPP-maven-hawtjni-plugin.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%if 0
%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}
%endif

%if %with repolib
%files repolib
%defattr(0644,root,root,0755)
%dir %{_javadir}*/
%{_javadir}*/repository.jboss.com
%endif

%changelog
* Mon Dec 20 2010 David Walluck <dwalluck at redhat.com> 0:1.1-1
- release

--- NEW FILE: hawtjni-plexus-archiver-unarchiver.patch ---
--- maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java.orig	2010-12-17 15:59:24.000000000 -0500
+++ maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java	2010-12-20 17:12:21.084339376 -0500
@@ -358,7 +358,8 @@
             
             UnArchiver unArchiver = archiverManager.getUnArchiver("zip");
             unArchiver.setSourceFile(packageZipFile);
-            unArchiver.extract("", dest);
+            unArchiver.setDestDirectory(dest);
+            unArchiver.extract();
 
             String packageName = project.getArtifactId()+"-"+project.getVersion()+"-"+sourceClassifier;
             File source = new File(dest, packageName);




More information about the JPackage-commits mailing list