[Jpackage-commits] dist/jboss-security-xacml/devel .cvsignore, 1.2, 1.3 jboss-parent-4.pom, 1.1, NONE jboss-security-component-info.xml, NONE, 1.1 jboss-security-xacml-jpp-depmap.xml, 1.1, 1.2 jboss-security-xacml.spec, 1.6, 1.7 sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Mon Jul 13 17:49:56 CEST 2009


Update of /home/projects/jpackage/cvs/dist/jboss-security-xacml/devel
In directory ryu.zarb.org:/tmp/cvs-serv24305

Modified Files:
	.cvsignore jboss-security-xacml-jpp-depmap.xml 
	jboss-security-xacml.spec sources 
Added Files:
	jboss-security-component-info.xml 
Removed Files:
	jboss-parent-4.pom 
Log Message:
- 2.0.3
- add repolib
- use glassfish-jaxb


Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-security-xacml/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	16 Jun 2009 18:46:38 -0000	1.2
--- .cvsignore	13 Jul 2009 15:49:54 -0000	1.3
***************
*** 1 ****
! jboss-security-xacml-2.0.3.CR5.tar.gz
--- 1 ----
! jboss-security-xacml-2.0.3.bz2

--- NEW FILE: jboss-security-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="jboss/security"
             licenseType=""
             version="@VERSION@"
             tag="@TAG"
             description=""
             
             > 
              
    <artifact id="jbossxacml.jar"/>


    <export>
      <include input="jbossxacml.jar"/>

    </export>
  </component>
</project>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-security-xacml/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	16 Jun 2009 18:46:38 -0000	1.2
--- sources	13 Jul 2009 15:49:54 -0000	1.3
***************
*** 1 ****
! 5f3fcf04dd1aa2c7589af42c9fea824c  jboss-security-xacml-2.0.3.CR5.tar.gz
--- 1 ----
! d15505e76e4ea525c6cc77e2329d3f21  jboss-security-xacml-2.0.3.bz2

Index: jboss-security-xacml.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-security-xacml/devel/jboss-security-xacml.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** jboss-security-xacml.spec	17 Jun 2009 07:03:27 -0000	1.6
--- jboss-security-xacml.spec	13 Jul 2009 15:49:54 -0000	1.7
***************
*** 29,51 ****
  #
  
  %define section free
! %define namedversion 2.0.3.CR5
  %define oname jboss-security-xacml
  
  Name:           jboss-security-xacml
  Version:        2.0.3
! Release:        0.CR5.1%{?dist}
  Epoch:          0
  Summary:        JBoss Security XACML
! License:        LGPL
  Group:          Development/Java
  URL:            http://www.jboss.org/
! Source0:        jboss-security-xacml-2.0.3.CR5.tar.gz
! # svn export http://anonsvn.jboss.org/repos/jbossas/projects/security/security-xacml/tags/2.0.3.CR5/ jboss-security-xacml-2.0.3
! 
  Source1:        jboss-security-xacml-jpp-depmap.xml
  Source2:        jboss-security-xacml-settings.xml
! Source3:        http://repository.jboss.org/maven2/org/jboss/jboss-parent/4/jboss-parent-4.pom
! 
  BuildArch:      noarch
  Requires(post): jpackage-utils >= 0:1.7.3
--- 29,61 ----
  #
  
+ %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_without repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/jboss/security/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section free
! %define reltag %{nil}
! %define namedversion %{version}
  %define oname jboss-security-xacml
  
  Name:           jboss-security-xacml
  Version:        2.0.3
! Release:        1%{?dist}
  Epoch:          0
  Summary:        JBoss Security XACML
! License:        LGPLv2+
  Group:          Development/Java
  URL:            http://www.jboss.org/
! # svn -q export http://anonsvn.jboss.org/repos/jbossas/projects/security/security-xacml/tags/2.0.3/ jboss-security-xacml-2.0.3 && tar cjf jboss-security-xacml-2.0.3.tar.bz2 jboss-security-xacml-2.0.3
! Source0:        jboss-security-xacml-2.0.3.tar.bz2
  Source1:        jboss-security-xacml-jpp-depmap.xml
  Source2:        jboss-security-xacml-settings.xml
! Source3:        jboss-security-component-info.xml
  BuildArch:      noarch
  Requires(post): jpackage-utils >= 0:1.7.3
***************
*** 68,75 ****
--- 78,87 ----
  
  BuildRequires:  codehaus-stax11
+ BuildRequires:  glassfish-jaxb
  BuildRequires:  jaf_1_1_api
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  javolution
  BuildRequires:  jaxb_2_1_api
+ BuildRequires:  jboss-parent
  BuildRequires:  joda-time
  BuildRequires:  log4j
***************
*** 79,83 ****
  BuildRequires:  slf4j
  BuildRequires:  stax_1_0_api
- BuildRequires:  sun-jaxb-2.1-impl
  BuildRequires:  xalan-j2
  BuildRequires:  xerces-j2
--- 91,94 ----
***************
*** 99,103 ****
  Requires:  slf4j
  Requires:  stax_1_0_api
! Requires:  sun-jaxb-2.1-impl
  Requires:  xalan-j2
  Requires:  xerces-j2
--- 110,114 ----
  Requires:  slf4j
  Requires:  stax_1_0_api
! Requires:  glassfish-jaxb
  Requires:  xalan-j2
  Requires:  xerces-j2
***************
*** 105,111 ****
  Requires:  xml-security >= 0:1.4.2
  Requires:  xml-commons-jaxp-1.3-apis
! 
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
--- 116,120 ----
  Requires:  xml-security >= 0:1.4.2
  Requires:  xml-commons-jaxp-1.3-apis
! BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 119,127 ****
  %{summary}.
  
  %prep
  %setup -q -n %{name}-%{namedversion} 
  
! %build
! cp %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
--- 128,146 ----
  %{summary}.
  
+ %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 -n %{name}-%{namedversion} 
  
! cp -p %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
***************
*** 134,143 ****
  ln -s %{_javadir} external_repo/JPP
  
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
! mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/
! cp %{SOURCE3} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.jboss-jboss-parent.pom
! 
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.failure.ignore=true \
--- 153,160 ----
  ln -s %{_javadir} external_repo/JPP
  
+ %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.failure.ignore=true \
***************
*** 146,150 ****
          install 
  
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Daggregate=true \
--- 163,167 ----
          install 
  
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Daggregate=true \
***************
*** 153,157 ****
          javadoc:javadoc
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
--- 170,173 ----
***************
*** 159,165 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -m 644 jboss-sunxacml/target/jboss-sunxacml-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jboss-sunxacml-%{version}.jar
! #install -m 644 jboss-xacml-saml/target/jboss-xacml-saml-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jboss-xacml-saml-%{version}.jar
! install -m 644 jboss-xacml/target/jboss-xacml-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jboss-xacml-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
--- 175,181 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -p -m 644 jboss-sunxacml/target/jboss-sunxacml-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jboss-sunxacml-%{version}.jar
! #install -p -m 644 jboss-xacml-saml/target/jboss-xacml-saml-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jboss-xacml-saml-%{version}.jar
! install -p -m 644 jboss-xacml/target/jboss-xacml-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jboss-xacml-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
***************
*** 183,187 ****
  cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 199,217 ----
  cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! 
! %if %with repolib
! install -d -m 755 $RPM_BUILD_ROOT%{repodir}
! install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{repodir}/component-info.xml
! sed -i 's/@VERSION@/%{version}.%{reltag}-brew/g' $RPM_BUILD_ROOT%{repodir}/component-info.xml
! tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
! sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{repodirsrc}
! cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}/jboss-xacml-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/jbossxacml.jar
! %endif
  
  %clean
***************
*** 197,214 ****
  %defattr(0644,root,root,0755)
  %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/*
! %{_datadir}/maven2/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Tue Jun 16 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.0.3-0.CR5.1.jpp5
  - 2.0.3.CR5 
  
  * Fri Jun 05 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.0.2.1-1.jpp5
! - 2.0.2.SP1 
! 
--- 227,260 ----
  %defattr(0644,root,root,0755)
  %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/jboss-sunxacml-%{version}.jar
! %{_javadir}/%{name}/jboss-sunxacml.jar
! %{_javadir}/%{name}/jboss-xacml-%{version}.jar
! %{_javadir}/%{name}/jboss-xacml.jar
! %{_datadir}/maven2/poms/JPP.jboss-security-xacml-jboss-security-xacml-main.pom
! %{_datadir}/maven2/poms/JPP.jboss-security-xacml-jboss-security-xacml-project.pom
! %{_datadir}/maven2/poms/JPP.jboss-security-xacml-jboss-sunxacml.pom
! %{_datadir}/maven2/poms/JPP.jboss-security-xacml-jboss-xacml.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
! 
! %if %with repolib
! %files repolib
! %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
! %endif
  
  %changelog
+ * Wed Jul 01 2009 David Walluck <dwalluck at redhat.com> 0:2.0.3-1
+ - 2.0.3
+ - add repolib
+ - use glassfish-jaxb
+ 
  * Tue Jun 16 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.0.3-0.CR5.1.jpp5
  - 2.0.3.CR5 
  
  * Fri Jun 05 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.0.2.1-1.jpp5
! - 2.0.2.SP1

Index: jboss-security-xacml-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-security-xacml/devel/jboss-security-xacml-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jboss-security-xacml-jpp-depmap.xml	16 Jun 2009 18:46:38 -0000	1.1
--- jboss-security-xacml-jpp-depmap.xml	13 Jul 2009 15:49:54 -0000	1.2
***************
*** 176,182 ****
     </maven>
     <jpp>
!      <groupId>JPP</groupId>
!      <artifactId>jaxb_2_1_api</artifactId>
!      <version>2.1</version>
     </jpp>
   </dependency>
--- 176,182 ----
     </maven>
     <jpp>
!      <groupId>JPP/glassfish-jaxb</groupId>
!      <artifactId>jaxb-api</artifactId>
!      <version>2.1.9</version>
     </jpp>
   </dependency>
***************
*** 188,194 ****
     </maven>
     <jpp>
!      <groupId>JPP</groupId>
!      <artifactId>sun-jaxb-2.1-impl</artifactId>
!      <version>2.1.6</version>
     </jpp>
   </dependency>
--- 188,194 ----
     </maven>
     <jpp>
!      <groupId>JPP/glassfish-jaxb</groupId>
!      <artifactId>jaxb-impl</artifactId>
!      <version>2.1.9</version>
     </jpp>
   </dependency>
***************
*** 200,206 ****
     </maven>
     <jpp>
!      <groupId>JPP</groupId>
!      <artifactId>sun-jaxb-2.1-impl-xjc</artifactId>
!      <version>2.1.6</version>
     </jpp>
   </dependency>
--- 200,206 ----
     </maven>
     <jpp>
!      <groupId>JPP/glassfish-jaxb</groupId>
!      <artifactId>jaxb-xjc</artifactId>
!      <version>2.1.9</version>
     </jpp>
   </dependency>

--- jboss-parent-4.pom DELETED ---




More information about the JPackage-commits mailing list