[Jpackage-commits] rpms/free/felix felix-webconsole-pom.patch, NONE, 1.1.2.1 felix.spec, 1.1, 1.1.2.1

jpackage jpackage at ryu.zarb.org
Sun Feb 1 22:40:47 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/felix
In directory ryu.zarb.org:/tmp/5DU42OAYIR/rpms/free/felix

Modified Files:
      Tag: JPACKAGE-5_0
	felix.spec 
Added Files:
      Tag: JPACKAGE-5_0
	felix-webconsole-pom.patch 
Log Message:
1.0.2-2.jpp5

--- NEW FILE: felix-webconsole-pom.patch ---
--- webconsole/pom.xml.sav	2008-06-19 16:27:07.000000000 +0200
+++ webconsole/pom.xml	2008-06-19 16:28:14.000000000 +0200
@@ -111,13 +111,19 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- This adds commons-io transitively -->
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+            <scope>compile</scope>
+        </dependency>
+
 
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -160,4 +166,4 @@
         </dependency>
 
     </dependencies>
-</project>
\ No newline at end of file
+</project>

Index: felix.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/felix/felix.spec,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** felix.spec	7 May 2008 22:36:47 -0000	1.1
--- felix.spec	1 Feb 2009 21:40:44 -0000	1.1.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 33,38 ****
  %define section     free
  
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
  %define bundleplugin_version 1.4.0
--- 33,38 ----
  %define section     free
  
! %define with_maven %{?_with_maven:1}%{!?_with_maven:0}
! %define without_maven %{!?_with_maven:1}%{?_with_maven:0}
  
  %define bundleplugin_version 1.4.0
***************
*** 68,82 ****
  %define upnp_samples_version 0.2.0-SNAPSHOT
  %define upnp_tester_version 0.2.0-SNAPSHOT
  %define wireadmin_version 0.9.0-SNAPSHOT
  
  Name:           felix
  Version:        1.0.2
! Release:        1jpp
  Epoch:          0
  Summary:        Felix OSGI
  License:        Apache Software License 2.0
  Group:          Development/Java
- Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  URL:            http://felix.apache.org/
  Source0:        felix-1.0.2.tar.gz
--- 68,81 ----
  %define upnp_samples_version 0.2.0-SNAPSHOT
  %define upnp_tester_version 0.2.0-SNAPSHOT
+ %define webconsole_version 1.0.0
  %define wireadmin_version 0.9.0-SNAPSHOT
  
  Name:           felix
  Version:        1.0.2
! Release:        2%{dist}
  Epoch:          0
  Summary:        Felix OSGI
  License:        Apache Software License 2.0
  Group:          Development/Java
  URL:            http://felix.apache.org/
  Source0:        felix-1.0.2.tar.gz
***************
*** 127,130 ****
--- 126,130 ----
  Source31:       felix-examples.tar.gz
  # svn export http://svn.apache.org/repos/asf/felix/trunk/examples
+ Source32:       http://www.apache.org/dist/felix/org.apache.felix.webconsole-1.0.0-project.tar.gz
  
  Source91:        %{name}-jpp-depmap.xml
***************
*** 142,145 ****
--- 142,146 ----
  Patch5:         felix-tools-osgi-archetype.patch
  Patch6:         felix-http.jetty-Activator.patch
+ Patch7:         felix-webconsole-pom.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
***************
*** 148,153 ****
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
--- 149,154 ----
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
***************
*** 176,179 ****
--- 177,181 ----
  BuildRequires:  maven2-plugin-surefire-report
  BuildRequires:  maven2-common-poms >= 1.0-2
+ BuildRequires:  felix-maven2
  %endif
  
***************
*** 183,188 ****
--- 185,192 ----
  BuildRequires:  easymock
  BuildRequires:  jakarta-commons-codec
+ BuildRequires:  jakarta-commons-fileupload
  BuildRequires:  jakarta-commons-io
  BuildRequires:  jetty6-core
+ BuildRequires:  json
  BuildRequires:  kxml2
  BuildRequires:  maven2-bootstrap
***************
*** 203,208 ****
  BuildRequires:  xpp3
  
! Requires(post):    jpackage-utils >= 0:1.7.4
! Requires(postun):  jpackage-utils >= 0:1.7.4
  Requires:       jakarta-commons-codec
  Requires:       kxml2
--- 207,212 ----
  BuildRequires:  xpp3
  
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  Requires:       jakarta-commons-codec
  Requires:       kxml2
***************
*** 323,328 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(pre):  /bin/rm,/bin/ls
- Requires(post): /bin/rm
  
  %description javadoc
--- 327,330 ----
***************
*** 394,397 ****
--- 396,401 ----
  gzip -dc %{SOURCE31} | tar xf -
  # this was from trunk
+ gzip -dc %{SOURCE32} | tar xf -
+ mv org.apache.felix.webconsole-1.0.0 webconsole
  
      gzip -dc %{SOURCE92} | tar xf -
***************
*** 427,430 ****
--- 431,435 ----
  %patch5 -b .sav5
  %patch6 -b .sav6
+ %patch7 -b .sav7
  
  %build
***************
*** 858,861 ****
--- 863,879 ----
  CLASSPATH=$CLASSPATH:$MAVEN_REPO_LOCAL/org.apache.felix/org.apache.felix.wireadmin.jar
  
+ #[INFO]   Apache Felix Web Management Console
+ CLASSPATH=$CLASSPATH:$(build-classpath \
+ commons-fileupload \
+ commons-io \
+ json \
+ )
+ CLASSPATH=$CLASSPATH:$MAVEN_REPO_LOCAL/org.apache.felix/org.apache.felix.bundlerepository.jar
+ pushd webconsole
+ ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only package javadoc
+ popd
+ cp webconsole/maven-build.jar $MAVEN_REPO_LOCAL/org.apache.felix/org.apache.felix.webconsole.jar
+ CLASSPATH=$CLASSPATH:$MAVEN_REPO_LOCAL/org.apache.felix/org.apache.felix.webconsole.jar
+ 
  #[INFO]   Apache Felix Prefrences Service
  CLASSPATH=$CLASSPATH:$(build-classpath \
***************
*** 2139,2142 ****
--- 2157,2173 ----
  %if %{with_maven}
  install -m 644 \
+     webconsole/target/org.apache.felix.webconsole-%{webconsole_version}.jar \
+     $RPM_BUILD_ROOT%{_javadir}/%{name}/
+ %else
+ install -m 644 \
+     $MAVEN_REPO_LOCAL/org.apache.felix/org.apache.felix.webconsole.jar \
+     $RPM_BUILD_ROOT%{_javadir}/%{name}/org.apache.felix.webconsole-%{webconsole_version}.jar
+ %endif
+ %add_to_maven_depmap org.apache.felix org.apache.felix.webconsole %{webconsole_version} JPP/%{name} org.apache.felix.webconsole
+ install -m 644 webconsole/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-org.apache.felix.webconsole.pom
+ (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in org.apache.felix.webconsole-%{webconsole_version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{webconsole_version}||g"`; done)
+ 
+ %if %{with_maven}
+ install -m 644 \
      wireadmin/target/org.apache.felix.wireadmin-%{wireadmin_version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/
***************
*** 2162,2166 ****
--- 2193,2201 ----
         $RPM_BUILD_ROOT%{_datadir}/%{name}/bundle
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/conf
+ %if %{with_maven}
  install -m 644 main/conf/config.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/conf
+ %else
+ install -m 644 main/target/classes/config.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/conf
+ %endif
  
  # javadoc
***************
*** 2193,2196 ****
--- 2228,2232 ----
           shell \
           shell.tui \
+          webconsole \
           wireadmin \
           ; do
***************
*** 2292,2296 ****
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
- 
  install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  install -m 644 main/LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
--- 2328,2331 ----
***************
*** 2305,2317 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %if %{gcj_support}
--- 2340,2343 ----
***************
*** 2350,2353 ****
--- 2376,2380 ----
  %{_javadir}/%{name}/org.apache.felix.shell.jar
  %{_javadir}/%{name}/org.apache.felix.shell-*.jar
+ %{_javadir}/%{name}/org.apache.felix.webconsole*.jar
  %{_javadir}/%{name}/org.apache.felix.wireadmin*.jar
  %{_javadir}/%{name}/org.apache.felix.framework*.jar
***************
*** 2402,2409 ****
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  
  %changelog
  * Thu May 08 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0.2-1jpp
  - Initial build
--- 2429,2439 ----
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  
  %changelog
+ * Fri Jan 23 2009 Ralph Apel <r.apel at r-apel.de> 0:1.0.2-2.jpp5
+ - Add webconsole module
+ 
  * Thu May 08 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0.2-1jpp
  - Initial build




More information about the JPackage-commits mailing list