[Jpackage-commits] dist/felix/devel .cvsignore, 1.1, 1.2 felix-http.jetty-Activator.patch, NONE, 1.1 felix-ipojo-manipulator-pom.patch, NONE, 1.1 felix-jpp-depmap.xml, NONE, 1.1 felix-pom.patch, NONE, 1.1 felix-scrplugin-pom.patch, NONE, 1.1 felix-settings.xml, NONE, 1.1 felix-tools-felix-archetype.patch, NONE, 1.1 felix-tools-osgi-archetype.patch, NONE, 1.1 felix-upnp-extra-pom.patch, NONE, 1.1 felix.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:09:57 CEST 2008


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

Modified Files:
	.cvsignore sources 
Added Files:
	felix-http.jetty-Activator.patch 
	felix-ipojo-manipulator-pom.patch felix-jpp-depmap.xml 
	felix-pom.patch felix-scrplugin-pom.patch felix-settings.xml 
	felix-tools-felix-archetype.patch 
	felix-tools-osgi-archetype.patch felix-upnp-extra-pom.patch 
	felix.spec 
Log Message:
Import from JPP 5.0

--- NEW FILE: felix-scrplugin-pom.patch ---
--- scrplugin/pom.xml.sav	2008-04-27 16:00:52.000000000 +0200
+++ scrplugin/pom.xml	2008-04-27 16:01:54.000000000 +0200
@@ -57,7 +57,7 @@
 		</dependency>
 		
 		<dependency>
-		   <groupId>asm</groupId>
+		   <groupId>org.objectweb.asm</groupId>
 		   <artifactId>asm-all</artifactId>
 		   <version>3.0</version>
 		</dependency>

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:08:57 -0000	1.1
--- .cvsignore	28 May 2008 18:09:55 -0000	1.2
***************
*** 0 ****
--- 1,33 ----
+ felix-1.0.2.tar.gz
+ felix-autogenerated-files.tar.gz
+ felix-dependencymanager.tar.gz
+ felix-examples.tar.gz
+ felix-http.jetty.tar.gz
+ felix-ipojo.tar.gz
+ felix-javax.servlet.tar.gz
+ felix-jmood.tar.gz
+ felix-log.tar.gz
+ felix-mosgi.tar.gz
+ felix-servicebinder.tar.gz
+ felix-shell.gui.plugin.tar.gz
+ felix-shell.gui.tar.gz
+ felix-tools.tar.gz
+ felix-upnp.tar.gz
+ felix-wireadmin.tar.gz
+ maven-bundle-plugin-1.4.0-project.tar.gz
+ maven-obr-plugin-1.2.0-project.tar.gz
+ maven-scr-plugin-1.0.4-project.tar.gz
+ org.apache.felix.bundlerepository-1.0.3-project.tar.gz
+ org.apache.felix.configadmin-1.0.1-project.tar.gz
+ org.apache.felix.eventadmin-1.0.0-project.tar.gz
+ org.apache.felix.framework-1.0.4-project.tar.gz
+ org.apache.felix.main-1.0.4-project.tar.gz
+ org.apache.felix.metatype-1.0.0-project.tar.gz
+ org.apache.felix.prefs-1.0.2-project.tar.gz
+ org.apache.felix.scr-1.0.0-project.tar.gz
+ org.apache.felix.shell-1.0.1-project.tar.gz
+ org.apache.felix.shell.tui-1.0.1-project.tar.gz
+ org.osgi.compendium-1.0.1-project.tar.gz
+ org.osgi.core-1.0.1-project.tar.gz
+ org.osgi.foundation-1.0.0-project.tar.gz
+ org.osgi.service.obr-1.0.2-project.tar.gz

--- NEW FILE: felix-tools-felix-archetype.patch ---
--- tools/maven2/felix-archetype/pom.xml.sav	2008-05-04 09:35:00.000000000 +0200
+++ tools/maven2/felix-archetype/pom.xml	2008-05-04 09:35:14.000000000 +0200
@@ -3,7 +3,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.felix.archetypes</groupId>
   <artifactId>felix-archetype</artifactId>
-  <packaging>maven-plugin</packaging>
   <version>0.9.0-SNAPSHOT</version>
   <name>Felix Archetype</name>
 </project>

--- NEW FILE: felix-jpp-depmap.xml ---
<dependencies>
<!--
-->
        <dependency>
                <maven>
                        <groupId>easymock</groupId>
                        <artifactId>easymock</artifactId>
                        <version>1.2_Java1.3</version>
                </maven>
                <jpp>
                        <groupId>JPP</groupId>
                        <artifactId>easymock</artifactId>
                        <version>1.2</version>
                </jpp>
        </dependency>

	<dependency>
	  <maven>
		<groupId>xmlpull</groupId>
		<artifactId>xmlpull</artifactId>
		<version>1.1.3.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>xpp3</artifactId>
		<version>1.1.3.8</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.6.3</version>
	  </jpp>
	</dependency>

	<dependency>
	  <maven>
		<groupId>mx4j</groupId>
		<artifactId>mx4j-jmx</artifactId>
		<version>3.0.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP/mx4j</groupId>
		<artifactId>mx4j-jmx</artifactId>
		<version>3.0.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>mx4j</groupId>
		<artifactId>mx4j-remote</artifactId>
		<version>3.0.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP/mx4j</groupId>
		<artifactId>mx4j-remote</artifactId>
		<version>3.0.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>mx4j</groupId>
		<artifactId>mx4j</artifactId>
		<version>3.0.2</version>
	  </maven>
	  <jpp>
		<groupId>JPP/mx4j</groupId>
		<artifactId>mx4j</artifactId>
		<version>3.0.1</version>
	  </jpp>
	</dependency>

</dependencies>

--- NEW FILE: felix-tools-osgi-archetype.patch ---
--- tools/maven2/osgi-archetype/pom.xml.sav	2008-05-04 09:55:52.000000000 +0200
+++ tools/maven2/osgi-archetype/pom.xml	2008-05-04 09:56:01.000000000 +0200
@@ -3,7 +3,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.felix.archetypes</groupId>
   <artifactId>osgi-archetype</artifactId>
-  <packaging>maven-plugin</packaging>
   <version>0.9.0-SNAPSHOT</version>
   <name>OSGi Archetype</name>
 </project>

--- NEW FILE: felix.spec ---
# Copyright (c) 2000-2008, 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
[...2372 lines suppressed...]
%files upnp
%defattr(-,root,root,-)
%{_javadir}/%{name}/org.apache.felix.upnp*.jar

%files demo
%defattr(-,root,root,-)
%{_javadir}/%{name}/org.apache.felix.examples*.jar
%{_javadir}/%{name}/servicebased*.jar

%files javadoc
%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
- Validate build in mock


Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/felix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:08:57 -0000	1.1
--- sources	28 May 2008 18:09:55 -0000	1.2
***************
*** 0 ****
--- 1,33 ----
+ dadc82e7662b08729dff0b40404a5a88  felix-1.0.2.tar.gz
+ 8873a00b3812354fed240f31e5ef4e16  felix-autogenerated-files.tar.gz
+ ba8c251e2e5ec9724b3db0a88d7e74ce  felix-dependencymanager.tar.gz
+ 2af4acfef7d24d2c045782a91f024ee4  felix-examples.tar.gz
+ 3cc6df43dcf9281d5e01f79856fddeeb  felix-http.jetty.tar.gz
+ 6751bf38770d8a845706596367f3f210  felix-ipojo.tar.gz
+ d0aa0b1ac456e0c227cfcc67759a1ae6  felix-javax.servlet.tar.gz
+ 2a6f854206f956b80798cff998edaed0  felix-jmood.tar.gz
+ 1061b331b7422e6a3055c337904127a5  felix-log.tar.gz
+ 6bdace89be87942e3970dc903986084c  felix-mosgi.tar.gz
+ 40ccdd06333628cdae266aea15dce1c6  felix-servicebinder.tar.gz
+ 1a404569a0f62c2789268ef28a0fc039  felix-shell.gui.plugin.tar.gz
+ 4433993830864b57c1935cd0515eea40  felix-shell.gui.tar.gz
+ ac1705238c524de9ed42a946126df54f  felix-tools.tar.gz
+ 91eaa10866d5cd1cbbd74ff091d836ea  felix-upnp.tar.gz
+ def51c18221e6f5945a7ce6f93087f35  felix-wireadmin.tar.gz
+ f575917aa10274024f4625871b3ae479  maven-bundle-plugin-1.4.0-project.tar.gz
+ 367a426b70ed082a3b345e05e6f1a951  maven-obr-plugin-1.2.0-project.tar.gz
+ 68506bfe7468e23b76fb84d6bd84b557  maven-scr-plugin-1.0.4-project.tar.gz
+ 85090d0c558b014e14d2fb8119e72cc3  org.apache.felix.bundlerepository-1.0.3-project.tar.gz
+ 87c8be34d7ce7887d089bd873b8a077b  org.apache.felix.configadmin-1.0.1-project.tar.gz
+ d34304760943a7ac38837603d6ff7b78  org.apache.felix.eventadmin-1.0.0-project.tar.gz
+ b8f85bf05cc250da6b650e456d9f399f  org.apache.felix.framework-1.0.4-project.tar.gz
+ 7f037e7cac91a5e719a64f31630de4f4  org.apache.felix.main-1.0.4-project.tar.gz
+ 58cbe0bc0e1309de4d55808f849911db  org.apache.felix.metatype-1.0.0-project.tar.gz
+ d5abb2f9a57f7f7ddb740bc1e42b2fad  org.apache.felix.prefs-1.0.2-project.tar.gz
+ a6a38c2be6a1362d1a7de4a1999ba0e1  org.apache.felix.scr-1.0.0-project.tar.gz
+ a36ff307cfc82bcb67f3cbb23bbaafff  org.apache.felix.shell-1.0.1-project.tar.gz
+ fd4de27a4a7d6de805a03d79e00b1ce1  org.apache.felix.shell.tui-1.0.1-project.tar.gz
+ edd73b4651c6fc7b7946ff4cba6c643a  org.osgi.compendium-1.0.1-project.tar.gz
+ 51d4580566fbefed1733afd8f3be8ce6  org.osgi.core-1.0.1-project.tar.gz
+ 374cd06675e4278d684fcde43a07c289  org.osgi.foundation-1.0.0-project.tar.gz
+ cda8d61716cf0d67887f3d5a2cac417b  org.osgi.service.obr-1.0.2-project.tar.gz

--- NEW FILE: felix-upnp-extra-pom.patch ---
--- upnp/extra/pom.xml.sav	2008-04-28 08:44:38.000000000 +0200
+++ upnp/extra/pom.xml	2008-04-28 08:45:55.000000000 +0200
@@ -38,6 +38,11 @@
       <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.apache.felix.framework</artifactId>
+      <version>1.0.4</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

--- NEW FILE: felix-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: felix-pom.patch ---
--- pom/pom.xml.sav0	2008-01-12 19:53:41.000000000 +0100
+++ pom/pom.xml	2008-05-03 11:03:00.000000000 +0200
@@ -96,7 +96,9 @@
       <modules>
         <module>../org.osgi.service.obr</module>
         <module>../maven-obr-plugin</module>
+<!--
         <module>../bundleplugin</module>
+-->
         <module>../scrplugin</module>
         <module>../tools/maven2/maven-osgi-plugin</module>
       </modules>
@@ -443,4 +445,4 @@
       </plugin-->
     </plugins>
   </reporting>
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: felix-ipojo-manipulator-pom.patch ---
--- ipojo/manipulator/pom.xml.sav	2008-04-28 13:36:07.000000000 +0200
+++ ipojo/manipulator/pom.xml	2008-04-28 13:36:32.000000000 +0200
@@ -34,7 +34,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>asm</groupId>
+			<groupId>org.objectweb.asm</groupId>
 			<artifactId>asm-all</artifactId>
 			<version>3.0</version>
 			<exclusions>

--- NEW FILE: felix-http.jetty-Activator.patch ---
--- http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java.sav	2008-05-07 14:30:36.000000000 +0200
+++ http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java	2008-05-07 14:30:57.000000000 +0200
@@ -156,7 +156,7 @@
         }
 
         // replace non-LogService logger for jetty
-        Log.setLog( new StdErrLog() );
+//      Log.setLog( new StdErrLog() );
         
         m_logTracker.close();
     }
@@ -316,4 +316,4 @@
         }
     }
 
-}
\ No newline at end of file
+}




More information about the JPackage-commits mailing list